brightbox-cli 0.17.1 → 0.17.2

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

@@ -10,7 +10,7 @@ Shindo.tests('Fog::Compute[:glesys] | ip requests', ['glesys']) do
       Fog::Compute[:glesys].ip_list_own.body['response']
     end
     
-    tests("#ip_list_free(:datcenter => 'Falkenberg, :platform => 'Xen', :ipversion => 4)"
+    tests("#ip_list_free(:datacenter => 'Falkenberg, :platform => 'Xen', :ipversion => 4)"
     ).formats(Glesys::Compute::Formats::Ips::IPLIST_ALL) do
       pending if Fog.mocking?
       ips = Fog::Compute[:glesys].ip_list_free(

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

@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
-    
+
     @serverid = nil
     @hostname = "fog-#{Time.now.to_i}"
 
@@ -27,7 +27,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
               :cpucores   => "1",
               :transfer   => "500"
             )
-      
+
       @serverid = vm.body['response']['server']['serverid']
       vm.body['response']
     end
@@ -35,7 +35,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     unless Fog.mocking?
       Fog::Compute[:glesys].servers.get(@serverid).wait_for { ready? }
     end
-  
+
     tests("#server_details(#{@serverid})").formats(Glesys::Compute::Formats::Servers::DETAILS) do
       pending if Fog.mocking?
       Fog::Compute[:glesys].server_details(@serverid).body['response']
@@ -55,7 +55,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     unless Fog.mocking?
       pending if Fog.mocking?
       s = Fog::Compute[:glesys].servers.get(@serverid)
-      s.wait_for { s.state == 'stopped' }  
+      s.wait_for { s.state == 'stopped' }
     end
 
     tests("#start(:serverid => #{@serverid})").formats(Glesys::Compute::Formats::Servers::START) do

data/lib/brightbox-cli/vendor/fog/tests/helpers/formats_helper.rb

@@ -14,7 +14,7 @@ module Fog
   end
 end
 [FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
-[NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
+[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
 [NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
 [NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
 [Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}

data/lib/brightbox-cli/vendor/fog/tests/helpers/mock_helper.rb

@@ -15,6 +15,8 @@ if Fog.mock?
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
+    :clodo_api_key                    => 'clodo_api_key',
+    :clodo_username                   => 'clodo_username',
     :dnsimple_email                   => 'dnsimple_email',
     :dnsimple_password                => 'dnsimple_password',
     :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',

data/lib/brightbox-cli/vendor/fog/tests/rackspace/requests/dns/dns_tests.rb

@@ -101,8 +101,10 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do
 
   tests( 'failure') do
 
-    tests('create_domain(invalid)').raises(Fog::Rackspace::Errors::BadRequest) do
-      wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].create_domains([{:name => 'badtestdomain.com', :email => '', :records => [{:ttl => 300, :name => 'badtestdomain.com', :type => 'A', :data => '192.168.1.1'}]}])
+    tests('create_domain(invalid)').returns('ERROR') do
+      response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].create_domains([{:name => 'badtestdomain.com', :email => '', :records => [{:ttl => 300, :name => 'badtestdomain.com', :type => 'A', :data => '192.168.1.1'}]}])
+
+      response.body['status']
     end
 
     tests('list_domains :limit => 5, :offset => 8').raises(Fog::Rackspace::Errors::BadRequest) do

data/lib/brightbox-cli/vendor/fog/tests/rackspace/requests/load_balancers/helper.rb

@@ -3,6 +3,11 @@ NODE_FORMAT = {'node' => SINGLE_NODE_FORMAT}
 NODES_FORMAT = {'nodes' => [SINGLE_NODE_FORMAT]}
 VIRTUAL_IP_FORMAT = {'type' => String, 'id' => Integer, 'type' => String, 'ipVersion' => String, 'address' => String}
 VIRTUAL_IPS_FORMAT = { 'virtualIps' => [VIRTUAL_IP_FORMAT] }
+SOURCE_ADDRESSES = {
+  'ipv4Servicenet'  => String,
+  'ipv4Public'      => String,
+  'ipv6Public'      => String,
+}
 LOAD_BALANCER_USAGE_FORMAT = {
   'loadBalancerUsageRecords' => [
     {
@@ -87,11 +92,22 @@ LOAD_BALANCERS_FORMAT = {
       'port' => Integer,
       'protocol' => String,
       'algorithm' => String,
-      'sourceAddresses' => {
-        'ipv4Servicenet'  => String,
-        'ipv4Public'      => String,
-        'ipv6Public'      => String,
-      },
+      'status' => String,
+      'virtualIps' => [VIRTUAL_IP_FORMAT],
+      'created' => { 'time' => String },
+      'updated' => { 'time' => String }
+    }]
+}
+
+LOAD_BALANCERS_DETAIL_FORMAT = {
+  'loadBalancers' => [
+    {
+      'name' => String,
+      'id' => Integer,
+      'port' => Integer,
+      'protocol' => String,
+      'algorithm' => String,
+      'sourceAddresses' => SOURCE_ADDRESSES,
       'status' => String,
       'virtualIps' => [VIRTUAL_IP_FORMAT],
       'nodes' => [SINGLE_NODE_FORMAT],
@@ -106,11 +122,7 @@ LOAD_BALANCER_FORMAT = {
     'port' => Integer,
     'protocol' => String,
     'algorithm' => String,
-    'sourceAddresses' => {
-      'ipv4Servicenet'  => String,
-      'ipv4Public'      => String,
-      'ipv6Public'      => String,
-    },
+    'sourceAddresses' => SOURCE_ADDRESSES,
     'status' => String,
     'cluster' => { 'name' => String },
     'virtualIps' => [VIRTUAL_IP_FORMAT],
@@ -120,4 +132,8 @@ LOAD_BALANCER_FORMAT = {
   }.merge(CONNECTION_LOGGING_FORMAT)
 }
 
-
+ERROR_PAGE_FORMAT = {
+  'errorpage' => {
+    'content' => String
+  }
+}

data/lib/brightbox-cli/vendor/fog/tests/rackspace/requests/load_balancers/load_balancer_tests.rb

@@ -8,7 +8,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       @lb_id = nil
       @lb_name = 'fog' + Time.now.to_i.to_s
 
-      tests('#create_load_balancer(fog, )').formats(LOAD_BALANCER_FORMAT) do
+      tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...)").formats(LOAD_BALANCER_FORMAT) do
         data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]).body
         @lb_id = data['loadBalancer']['id']
         data
@@ -30,6 +30,9 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
         sleep 10
       end
 
+      tests("#list_load_balancers({:node_address => '10.0.0.1'})").formats(LOAD_BALANCERS_FORMAT) do
+        @service.list_load_balancers({:node_address => '10.0.0.1'}).body
+      end
 
       tests("#update_load_balancer(#{@lb_id}, { :port => 80 })").succeeds do
         @service.update_load_balancer(@lb_id, { :port => 80 }).body

data/lib/brightbox-cli/vendor/fog/tests/rackspace/requests/load_balancers/node_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace']) do
+Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
 
   pending if Fog.mocking?
 
@@ -9,7 +9,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       tests('success') do
 
         @lb.wait_for { ready? }
-        tests('#create_node').formats(NODES_FORMAT) do
+        tests("#create_node(#{@lb.id}, '10.10.10.10', 80, 'ENABLED')").formats(NODES_FORMAT) do
           data = @service.create_node(@lb.id, '10.10.10.10', 80, 'ENABLED').body
           @nodes_created << data['nodes'][0]['id']
           data
@@ -23,48 +23,48 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
         end
 
         @lb.wait_for { ready? }
-        tests("list_nodes").formats(NODES_FORMAT) do
+        tests("#list_nodes(#{@lb.id})").formats(NODES_FORMAT) do
           @service.list_nodes(@lb.id).body
         end
 
         @lb.wait_for { ready? }
-        tests("get_node(#{@lb_node_id})").formats(NODE_FORMAT) do
+        tests("#get_node(#{@lb.id})").formats(NODE_FORMAT) do
           @service.get_node(@lb.id, @nodes_created[0]).body
         end
 
-        tests("update_node(#{@lb.id}, #{@nodes_created[0]})").succeeds do
-
-          @lb.wait_for { ready? }
-          tests("condition").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED' })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :condition => 'DISABLED' })").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED' })
+        end
 
-          @lb.wait_for { ready? }
-          tests("weight").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :weight => 20 })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :weight => 20})").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :weight => 20 })
+        end
 
-          @lb.wait_for { ready? }
-          tests("condition and weight").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED', :weight => 20 })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :condition => 'DISABLED', :weight => 20 })").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED', :weight => 20 })
         end
       end
 
       tests('failure') do
-        tests('create_node(invalid ip)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
+        tests('#create_node(invalid ip)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
           @service.create_node(@lb.id, '', 80, 'ENABLED')
         end
-        tests('create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
+        tests('#create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
           @service.create_node(@lb.id, '10.10.10.10', 80, 'EABLED')
         end
-        tests('get_node(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do
+        tests("#get_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do
           @service.get_node(@lb.id, 0)
         end
-        tests('delete_nodes(0)').raises(Fog::Rackspace::LoadBalancers::ServiceError) do
-          @service.delete_nodes(@lb.id, 0)
+        tests("#delete_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do
+          @service.delete_node(@lb.id, 0)
+        end
+        tests("#delete_nodes('a', 'b')").raises(Fog::Rackspace::LoadBalancers::NotFound) do
+          @service.delete_nodes(@lb.id, 'a', 'b')
         end
-        tests('update_node(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do
+        tests("#update_node(#{@lb.id}, 0, { :weight => 20 })").raises(Fog::Rackspace::LoadBalancers::NotFound) do
           @service.update_node(@lb.id, 0, { :weight => 20 })
         end
       end
@@ -72,7 +72,6 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       tests('success') do
         @lb.wait_for { ready? }
         tests("#delete_nodes(multiple node)").succeeds do
-          pending
           @service.delete_nodes(@lb.id, *@nodes_created)
         end
         @lb.wait_for { ready? }

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

@@ -16,9 +16,9 @@ Shindo.tests('Fog::Compute[:slicehost] | slice requests', ['slicehost']) do
 
     @slice_id = nil
 
-    tests("#create_slice(1, 19, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do
+    tests("#create_slice(1, 305, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do
       pending if Fog.mocking?
-      data = Fog::Compute[:slicehost].create_slice(1, 19, 'fogcreateslice').body
+      data = Fog::Compute[:slicehost].create_slice(1, 305, 'fogcreateslice').body
       @slice_id = data['id']
       data
     end

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

@@ -14,16 +14,16 @@ Shindo.tests('Fog::Compute[:stormondemand] | server requests', ['stormondemand']
       'ip'     => String,
       'ip_count'     => String,
       'subaccnt'     => String,
-      'template'     => NilClass,
+      'template'     => String,
       'template_description'     => String,
-      'manage_level'     => NilClass,
+      'manage_level'     => String,
       'zone'     => Hash,
       'active' => Integer,
       'create_date' => String
   }
   
   @servers_format = {
-    'servers' => [@server_format]
+    'items' => [@server_format]
   }
     
   tests('success') do

data/lib/brightbox-cli/vendor/fog/tests/vcloud/models/compute/servers_tests.rb

@@ -1,95 +1,23 @@
-Shindo.tests("Vcloud::Compute | servers", ['vcloud']) do
-
-  tests("#server.new('#{Vcloud::Compute::TestSupport::template}')").returns(true) do
-    pending if Fog.mocking?
-    @svr = Vcloud.servers.create :catalog_item_uri => Vcloud::Compute::TestSupport::template, :name => 'fog_test_run', :password => 'password'
-    print "Waiting for server to be ready"
-    @svr.wait_for(1200) { print '.' ; ready? }
-    puts ""
-    @svr.ready?
-  end
-
-  tests("#svr.power_on()").returns(true) do
-    pending if Fog.mocking?
-    @svr.power_on
-    @svr.wait_for { on? }
-    @svr.wait_for { ready? }
-    @svr.on?
-  end
+require 'fog/vcloud/models/compute/servers'
 
-  tests("#svr.description(\"testing\")").returns("testing") do
-    pending if Fog.mocking?
-    @svr.wait_for { ready? }
-    @svr.description = "testing"
-    @svr.save
-    @svr.wait_for { ready? }
-    @svr.description
-  end
-
-  # Power off only stops the OS, doesn't free up resources. #undeploy is for this.
-  tests("#svr.undeploy()").returns(true) do
-    pending if Fog.mocking?
-    @svr.undeploy
-    @svr.wait_for { off? }
-    @svr.wait_for { ready? }
-    @svr.off?
-  end
-
-  tests("#svr.memory(384)").returns(384) do
-    pending if Fog.mocking?
-    raise 'Server template memory already 384m - change to something different' if @svr.memory[:amount] == 384
-    @svr.wait_for { ready? }
-    @svr.memory = 384
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.memory[:amount] == '384'
-      sleep 1
-    end
-    @svr.reload.memory[:amount]
-  end
-
-  tests("#svr.add_disk(4096)").returns([2, "4096"]) do
-    pending if Fog.mocking?
-    raise 'Server template already has two disks' if @svr.disks.size == 2
-    @svr.wait_for { ready? }
-    @svr.add_disk(4096)
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.disks.size == 2
-      sleep 1
-    end
-    [
-     @svr.disks.size,
-     @svr.disks[1][:resource][:vcloud_capacity]
-    ]
-  end
+Shindo.tests("Vcloud::Compute | servers", ['vcloud']) do
 
-  tests("#svr.delete_disk(1)").returns(1) do
-    pending if Fog.mocking?
-    raise "Server doesn't have two disks - did previous step fail? " if @svr.disks.size != 2
-    @svr.wait_for { ready? }
-    sleep 5 # otherwise complains about being busy
-    @svr.delete_disk 1
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.disks.size == 1
-      sleep 1
+  Fog::Vcloud::Compute::SUPPORTED_VERSIONS.each do |version|
+    tests("api version #{version}") do
+      pending if Fog.mocking?
+      instance = Fog::Vcloud::Compute::Servers.new(
+        :connection => Fog::Vcloud::Compute.new(
+          :vcloud_host => 'vcloud.example.com',
+          :vcloud_username => 'username',
+          :vcloud_password => 'password',
+          :vcloud_version => version),
+        :href       =>  "https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/vApp/vapp-1"
+      )
+    
+      tests("collection") do
+        returns(2) { instance.size }
+        returns("https://vcloud.example.com/api#{(version == '1.0') ? '/v1.0' : ''}/vApp/vm-2") { instance.first.href }
+      end
     end
-    @svr.disks.size
   end
-
-  tests("#svr.destroy").raises(Excon::Errors::Forbidden) do
-    pending if Fog.mocking?
-    @svr.destroy
-    sleep 5 # allow cleanup..
-    Vcloud.servers.get(@svr.href) == nil
-  end
-
-
 end

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

@@ -1,15 +1,27 @@
 Shindo.tests("Fog::Compute[:vsphere] | vm_clone request", 'vsphere') do
-  #require 'guid'
-  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
+  # require 'guid'
   compute = Fog::Compute[:vsphere]
+  response = nil
+  response_linked = nil
+
+  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
+  tests("Standard Clone | The return value should") do
+    response = compute.vm_clone('path' => template, 'name' => 'cloning_vm', 'wait' => 1)
+    test("be a kind of Hash") { response.kind_of? Hash }
+    %w{ vm_ref task_ref }.each do |key|
+      test("have a #{key} key") { response.has_key? key }
+    end
+  end
 
-  tests("The return value should") do
-    response = compute.vm_clone('path' => template, 'name' => 'cloning_vm')
+  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
+  tests("Linked Clone | The return value should") do
+    response = compute.vm_clone('path' => template, 'name' => 'cloning_vm_linked', 'wait' => 1, 'linked_clone' => true)
     test("be a kind of Hash") { response.kind_of? Hash }
     %w{ vm_ref task_ref }.each do |key|
       test("have a #{key} key") { response.has_key? key }
     end
   end
+
   tests("When invalid input is presented") do
     raises(ArgumentError, 'it should raise ArgumentError') { compute.vm_clone(:foo => 1) }
     raises(Fog::Compute::Vsphere::NotFound, 'it should raise Fog::Compute::Vsphere::NotFound when the UUID is not a string') do

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

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_power_on request', ['vsphere']) do
   powered_off_vm = nil
 
   tests('The response should') do
-    response = compute.vm_power_off('instance_uuid' => powered_off_vm)
+    response = compute.vm_power_on('instance_uuid' => powered_off_vm)
     test('be a kind of Hash') { response.kind_of? Hash }
     test('should have a task_state key') { response.has_key? 'task_state' }
   end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "0.17.1" unless defined?(Brightbox::VERSION)
+  VERSION = "0.17.2" unless defined?(Brightbox::VERSION)
 end