brightbox-cli 0.17.1 → 0.17.2

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/server_group_tests.rb

@@ -18,55 +18,55 @@ Shindo.tests('Fog::Compute[:brightbox] | server group requests', ['brightbox'])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_server_group(create_options)
       @server_group_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     tests("#list_server_groups") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_groups
-      formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS) { result }
+      formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, false) { result }
       @default_group_id = result.select {|grp| grp["default"] == true }.first["id"]
     end
 
     tests("#get_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_group(@server_group_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_server_group('#{@server_group_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     remove_options = {:servers => [{:server => server_id}]}
     tests("#remove_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     add_options = {:servers => [{:server => server_id}]}
     tests("#add_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     move_options = {:destination => @default_group_id, :servers => [{:server => server_id}]}
     tests("#move_servers_server_group('#{@server_group_id}', #{move_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].move_servers_server_group(@server_group_id, move_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
       test("group is emptied") { result["servers"].empty? }
     end
 
     tests("#destroy_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
     end
 
     unless Fog.mocking?

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/server_tests.rb

@@ -2,14 +2,16 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
 
   tests('success') do
 
-    image_id = Brightbox::Compute::TestSupport.image_id
-    server_id = nil
+    unless Fog.mocking?
+      image_id = Brightbox::Compute::TestSupport.image_id
+      server_id = nil
+    end
 
     tests("#create_server(:image => '#{image_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_server(:image => image_id)
       server_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     unless Fog.mocking?
@@ -19,58 +21,60 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
     tests("#list_servers") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_servers
-      formats(Brightbox::Compute::Formats::Collection::SERVERS) { result }
+      formats(Brightbox::Compute::Formats::Collection::SERVERS, false) { result }
     end
 
     tests("#get_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#update_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}")
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#activate_console_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].activate_console_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#stop_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].stop_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#start_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].start_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#shutdown_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].shutdown_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
     tests("#snapshot_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].snapshot_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
-      snapshot_id = result["id"]
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      # Server should be exclusively for our test so assume we can delete the snapshot
+      snapshot_id = result["snapshots"].first["id"]
       @snapshot = Fog::Compute[:brightbox].images.get(snapshot_id)
+      @snapshot.wait_for { ready? }
       @snapshot.destroy
     end
 
     tests("#destroy_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/server_type_tests.rb

@@ -6,13 +6,13 @@ Shindo.tests('Fog::Compute[:brightbox] | server type requests', ['brightbox']) d
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_types
       @server_type_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) { result }
+      formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES, false) { result }
     end
 
     tests("#get_server_type('#{@server_type_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_type(@server_type_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) { result }
+      formats(Brightbox::Compute::Formats::Full::SERVER_TYPE, false) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/user_tests.rb

@@ -6,20 +6,20 @@ Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_users
       @user_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::USERS) { result }
+      formats(Brightbox::Compute::Formats::Collection::USERS, false) { result }
     end
 
     tests("#get_user('#{@user_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_user(@user_id)
-      formats(Brightbox::Compute::Formats::Full::USER) { result }
+      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
     end
 
     update_options = { :name => "Example User" }
     tests("#update_user('#{@user_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_user(@user_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::USER) { result }
+      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/zone_tests.rb

@@ -6,13 +6,13 @@ Shindo.tests('Fog::Compute[:brightbox] | zone requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_zones
       @zone_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::ZONES) { result }
+      formats(Brightbox::Compute::Formats::Collection::ZONES, false) { result }
     end
 
     tests("#get_zone('#{@zone_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_zone(@zone_id)
-      formats(Brightbox::Compute::Formats::Full::ZONE) { result }
+      formats(Brightbox::Compute::Formats::Full::ZONE, false) { result }
     end
 
   end

data/lib/brightbox-cli/vendor/fog/tests/glesys/requests/compute/helper.rb

@@ -4,7 +4,9 @@ class Glesys
       module Servers
 
         LIST = {
-          'arguments' => [],
+          'debug' => {
+            'input' => []
+          },
           'servers' => [{
             'serverid' => String,
             'hostname' => String,
@@ -18,17 +20,19 @@ class Glesys
         }
 
         CREATE = {
-          'arguments' => {
-            "rootpw"        => String, 
-            "disksize"      => String, 
-            "memorysize"    => String, 
-            "datacenter"    => String, 
-            "cpucores"      => String,
-            "transfer"      => String,
-            "template"      => String,
-            "description"   => String,
-            "hostname"      => String,
-            "platform"      => String
+          'debug' => {
+            'input' => {
+              "rootpw"        => String,
+              "disksize"      => String,
+              "memorysize"    => String,
+              "datacenter"    => String,
+              "cpucores"      => String,
+              "transfer"      => String,
+              "template"      => String,
+              "description"   => String,
+              "hostname"      => String,
+              "platform"      => String
+            }
           },
           'server' => {
             'serverid' => String,
@@ -46,9 +50,11 @@ class Glesys
         }
 
         DESTROY = {
-          'arguments' => {
-            'serverid' => String,
-            'keepip'   => String,
+          'debug' => {
+            'input' => {
+              'serverid' => String,
+              'keepip'   => String,
+            }
           },
           'status' => {
             'code' => String,
@@ -57,61 +63,68 @@ class Glesys
         }
 
         DETAILS = {
-          'arguments' =>  {
-            'serverid'  =>  String
-          }, 
+          'debug' => {
+            'input' =>  {
+              'serverid'  =>  String
+            }
+          },
           'server' => {
             'managedhosting'  => String,
             'cost'            => {
               'amount'      =>  Float,
-              'timeperiod'  => String, 
+              'timeperiod'  => String,
               'currency'    => String
             }, 
-            'datacenter'  => String, 
+            'serverid'    => String,
+            'datacenter'  => String,
             'memory'      => String,
-            'cpucores'    => String, 
-            'transfer'    => String, 
-            'template'    => String, 
+            'cpucores'    => String,
+            'transfer'    => String,
+            'template'    => String,
             'iplist'      =>  [{
-              'cost'    => String, 
-              'version' => String, 
+              'cost'    => String,
+              'version' => String,
               'ip'      => String
             }], 
             'description' => String,
-            'hostname'    => String, 
-            'disk'        => String, 
+            'hostname'    => String,
+            'disk'        => String,
             'platform'    => String
-          }, 
+          },
           'status' => {
-            'code' => String, 
+            'code' => String,
             'text' => String
           }
         }
 
         STATUS = {
-          'arguments' => {
-            'serverid' => String
-          }, 
+          'debug' => {
+            'input' => {
+              'serverid' => String
+            }
+          },
           'server' => {
-            'memory'    => String, 
+            'memory'    => String,
             'bandwidth' => {
-              'last30days'  => Integer, 
+              'last30days'  => Integer,
               'today'       => Integer,
               'max'         => String
-            }, 
-            'cpu'     => String, 
-            'disk'    => String, 
+            },
+            'cpu'     => String,
+            'disk'    => String,
             'state'   => String
-          }, 
-          'status' => { 
+          },
+          'status' => {
             'code' => String,
             'text' => String
           }
        }
-        
+
         START = {
-          'arguments' => {
-            'serverid' => String
+          'debug' => {
+            'input' => {
+              'serverid' => String
+            }
           },
           'status' => {
             'code' => String,
@@ -120,9 +133,11 @@ class Glesys
         }
 
         STOP = {
-          'arguments' => {
-            'serverid'  => String,
-            'type'      => String
+          'debug' => {
+            'input' => {
+              'serverid'  => String,
+              'type'      => String
+            }
           },
           'status' => {
             'code' => String,
@@ -132,9 +147,11 @@ class Glesys
 
       end
       module Ips
-    
+
         IPLIST = {
-          'arguments' => [],
+          'debug' => {
+            'input' => []
+          },
           'iplist' => [{
             'price' => {
               'amount' => String,
@@ -153,12 +170,14 @@ class Glesys
             'text' => String
           }
         }
-    
+
         IPLIST_ALL = {
-          'arguments' => {
-            'datacenter'  => String,
-            'ipversion'   => String,
-            'platform'    => String
+          'debug' => {
+            'input' => {
+              'datacenter'  => String,
+              'ipversion'   => String,
+              'platform'    => String
+            }
           },
           'iplist' => [],
           'status' => {
@@ -173,11 +192,13 @@ class Glesys
         }
 
         IPLIST_CATCH_RELEASE = {
-          'arguments' => {
-            'ipaddress' => String, 
-          }, 
+          'debug' => {
+            'input' => {
+              'ipaddress' => String,
+            }
+          },
           'status' => {
-            'code' => String, 
+            'code' => String,
             'text' => String
           }
         }
@@ -186,20 +207,22 @@ class Glesys
       module Templates
 
         LIST = {
-          'arguments' => [],
-          'templates' =>  { 
+          'debug' => {
+            'input' => []
+          },
+          'templates' =>  {
             'Xen' => [{
               'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
+              'os'            => String,
+              'min_mem_size'  => String,
+              'min_disk_size' => String,
               'platform'      => String
             }],
             'OpenVZ' => [{
               'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
+              'os'            => String,
+              'min_mem_size'  => String,
+              'min_disk_size' => String,
               'platform'      => String
             }]
           },