brightbox-cli 0.17.1 → 0.17.2

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

@@ -10,30 +10,25 @@ module Fog
 
         undef_method :create
 
+        attribute :href
+
         def all
-          data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
+          data = connection.get_organization(org_uri).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.vdc+xml" }
           data.each { |link| link.delete_if { |key, value| [:rel].include?(key) } }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_vdc(uri)
-            new(data.body)
-          end
+          connection.get_vdc(uri)
         rescue Fog::Errors::NotFound
           nil
         end
 
-        def organization_uri
-          @organization_uri ||= connection.default_organization_uri
-        end
-
         private
 
-        def organization_uri=(new_organization_uri)
-          @organization_uri = new_organization_uri
+        def org_uri
+          self.href ||= connection.default_organization_uri
         end
-
       end
     end
   end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/configure_network_ip.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/configure_vapp.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/configure_vm.rb

@@ -138,7 +138,7 @@ module Fog
 
         def validate_vm_data(vm_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vm_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vm_data.has_key?(opt) }
             raise ArgumentError.new("Required vm data missing: #{(valid_opts - vm_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/instantiate_vapp_template.rb

@@ -7,7 +7,7 @@ module Fog
         def validate_instantiate_vapp_template_options options
           # :network_uri removed, if not specified will use template network config.
           valid_opts = [:catalog_item_uri, :name, :vdc_uri]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
           

data/lib/brightbox-cli/vendor/fog/lib/fog/vcloud/requests/compute/login.rb

@@ -6,14 +6,18 @@ module Fog
 
 
         def login
+          headers = { 'Authorization' => authorization_header }
+          uri = if version == '1.0'
+            "#{base_url}/login"
+          else
+            "#{base_path_url}/sessions"
+          end
           unauthenticated_request({
             :expects  => 200,
-            :headers  => {
-              'Authorization' => authorization_header
-            },
+            :headers  => headers,
             :method   => 'POST',
             :parse    => true,
-            :uri      => "#{base_url}/login"
+            :uri      => uri
           })
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/virtual_box/compute.rb

@@ -34,6 +34,10 @@ module Fog
           @connection = ::VirtualBox::Global.global.lib.virtualbox
         end
 
+        def respond_to?(method, *)
+          super or @connection.respond_to? method
+        end
+
         # hack to provide 'requests'
         def method_missing(method_sym, *arguments, &block)
           if @connection.respond_to?(method_sym)

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

@@ -20,6 +20,7 @@ module Fog
       request :vm_power_on
       request :vm_reboot
       request :vm_clone
+      request :vm_create
       request :vm_destroy
       request :datacenters
 

data/lib/brightbox-cli/vendor/fog/lib/fog/vsphere/models/compute/server.rb

@@ -56,7 +56,13 @@ module Fog
           requires :instance_uuid
           connection.vm_destroy('instance_uuid' => instance_uuid)
         end
-
+        def create(options ={})
+          requires :name, :path
+          new_vm = self.class.new(create_results['vm_attributes'])
+          new_vm.collection = self.collection
+          new_vm.connection = self.connection
+          new_vm
+        end
         def clone(options = {})
           requires :name, :path
           # Convert symbols to strings

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

@@ -26,7 +26,7 @@ module Fog
           # If the first path element contains "vm" this denotes the vmFolder
           # and needs to be shifted out since each DC contains only one
           # vmFolder
-          path_elements.shift if path_elements[0] = 'vm'
+          path_elements.shift if path_elements[0] == 'vm'
           # Make sure @datacenters is populated (the keys are DataCenter instances)
           self.datacenters.include? dc_name or raise ArgumentError, "Could not find a Datacenter named #{dc_name}"
           # Get the datacenter managed object
@@ -138,93 +138,93 @@ module Fog
           case options['instance_uuid']
           when nil
             rval = YAML.load <<-'ENDvmLISTING'
-              --- 
-              virtual_machines: 
-              - name: centos56gm
-                hypervisor: gunab.puppetlabs.lan
-                tools_version: guestToolsCurrent
-                ipaddress: 
-                mo_ref: vm-698
-                power_state: poweredOff
-                uuid: 42322347-d791-cd34-80b9-e25fe28ad37c
-                is_a_template: true
-                id: 50323f93-6835-1178-8b8f-9e2109890e1a
-                tools_state: toolsNotRunning
-                connection_state: connected
-                instance_uuid: 50323f93-6835-1178-8b8f-9e2109890e1a
-                hostname: 
-                mac_addresses: 
-                  Network adapter 1: 00:50:56:b2:00:a1
-                operatingsystem: 
-              - name: centos56gm2
-                hypervisor: gunab.puppetlabs.lan
-                tools_version: guestToolsCurrent
-                ipaddress: 
-                mo_ref: vm-640
-                power_state: poweredOff
-                uuid: 564ddcbe-853a-d29a-b329-a0a3693a004d
-                is_a_template: true
-                id: 5257dee8-050c-cbcd-ae25-db0e582ab530
-                tools_state: toolsNotRunning
-                connection_state: connected
-                instance_uuid: 5257dee8-050c-cbcd-ae25-db0e582ab530
-                hostname: 
-                mac_addresses: 
-                  Network adapter 1: 00:0c:29:3a:00:4d
-                operatingsystem: 
-              - name: dashboard_gm
-                hypervisor: gunab.puppetlabs.lan
-                tools_version: guestToolsCurrent
-                ipaddress: 192.168.100.184
-                mo_ref: vm-669
-                power_state: poweredOn
-                uuid: 564d3f91-3452-a509-a678-1246f7897979
-                is_a_template: false
-                id: 5032739c-c871-c0d2-034f-9700a0b5383e
-                tools_state: toolsOk
-                connection_state: connected
-                instance_uuid: 5032739c-c871-c0d2-034f-9700a0b5383e
-                hostname: compliance.puppetlabs.vm
-                mac_addresses: 
-                  Network adapter 1: 00:50:56:b2:00:96
-                operatingsystem: Red Hat Enterprise Linux 6 (64-bit)
-              - name: jefftest
-                hypervisor: gunab.puppetlabs.lan
-                tools_version: guestToolsCurrent
-                ipaddress: 192.168.100.187
-                mo_ref: vm-715
-                power_state: poweredOn
-                uuid: 42329da7-e8ab-29ec-1892-d6a4a964912a
-                is_a_template: false
-                id: 5032c8a5-9c5e-ba7a-3804-832a03e16381
-                tools_state: toolsOk
-                connection_state: connected
-                instance_uuid: 5032c8a5-9c5e-ba7a-3804-832a03e16381
-                hostname: centos56gm.localdomain
-                mac_addresses: 
-                  Network adapter 1: 00:50:56:b2:00:af
-                operatingsystem: CentOS 4/5 (32-bit)
-            ENDvmLISTING
+---
+virtual_machines:
+- name: centos56gm
+  hypervisor: gunab.puppetlabs.lan
+  tools_version: guestToolsCurrent
+  ipaddress:
+  mo_ref: vm-698
+  power_state: poweredOff
+  uuid: 42322347-d791-cd34-80b9-e25fe28ad37c
+  is_a_template: true
+  id: 50323f93-6835-1178-8b8f-9e2109890e1a
+  tools_state: toolsNotRunning
+  connection_state: connected
+  instance_uuid: 50323f93-6835-1178-8b8f-9e2109890e1a
+  hostname:
+  mac_addresses:
+    Network adapter 1: 00:50:56:b2:00:a1
+  operatingsystem:
+- name: centos56gm2
+  hypervisor: gunab.puppetlabs.lan
+  tools_version: guestToolsCurrent
+  ipaddress:
+  mo_ref: vm-640
+  power_state: poweredOff
+  uuid: 564ddcbe-853a-d29a-b329-a0a3693a004d
+  is_a_template: true
+  id: 5257dee8-050c-cbcd-ae25-db0e582ab530
+  tools_state: toolsNotRunning
+  connection_state: connected
+  instance_uuid: 5257dee8-050c-cbcd-ae25-db0e582ab530
+  hostname:
+  mac_addresses:
+    Network adapter 1: 00:0c:29:3a:00:4d
+  operatingsystem:
+- name: dashboard_gm
+  hypervisor: gunab.puppetlabs.lan
+  tools_version: guestToolsCurrent
+  ipaddress: 192.168.100.184
+  mo_ref: vm-669
+  power_state: poweredOn
+  uuid: 564d3f91-3452-a509-a678-1246f7897979
+  is_a_template: false
+  id: 5032739c-c871-c0d2-034f-9700a0b5383e
+  tools_state: toolsOk
+  connection_state: connected
+  instance_uuid: 5032739c-c871-c0d2-034f-9700a0b5383e
+  hostname: compliance.puppetlabs.vm
+  mac_addresses:
+    Network adapter 1: 00:50:56:b2:00:96
+  operatingsystem: Red Hat Enterprise Linux 6 (64-bit)
+- name: jefftest
+  hypervisor: gunab.puppetlabs.lan
+  tools_version: guestToolsCurrent
+  ipaddress: 192.168.100.187
+  mo_ref: vm-715
+  power_state: poweredOn
+  uuid: 42329da7-e8ab-29ec-1892-d6a4a964912a
+  is_a_template: false
+  id: 5032c8a5-9c5e-ba7a-3804-832a03e16381
+  tools_state: toolsOk
+  connection_state: connected
+  instance_uuid: 5032c8a5-9c5e-ba7a-3804-832a03e16381
+  hostname: centos56gm.localdomain
+  mac_addresses:
+    Network adapter 1: 00:50:56:b2:00:af
+  operatingsystem: CentOS 4/5 (32-bit)
+ENDvmLISTING
           when '5032c8a5-9c5e-ba7a-3804-832a03e16381'
             YAML.load <<-'5032c8a5-9c5e-ba7a-3804-832a03e16381'
-              --- 
-              virtual_machines: 
-              - name: jefftest
-                hypervisor: gunab.puppetlabs.lan
-                tools_version: guestToolsCurrent
-                ipaddress: 192.168.100.187
-                mo_ref: vm-715
-                power_state: poweredOn
-                uuid: 42329da7-e8ab-29ec-1892-d6a4a964912a
-                is_a_template: false
-                id: 5032c8a5-9c5e-ba7a-3804-832a03e16381
-                tools_state: toolsOk
-                connection_state: connected
-                instance_uuid: 5032c8a5-9c5e-ba7a-3804-832a03e16381
-                hostname: centos56gm.localdomain
-                mac_addresses: 
-                  Network adapter 1: 00:50:56:b2:00:af
-                operatingsystem: CentOS 4/5 (32-bit)
+---
+virtual_machines:
+- name: jefftest
+  hypervisor: gunab.puppetlabs.lan
+  tools_version: guestToolsCurrent
+  ipaddress: 192.168.100.187
+  mo_ref: vm-715
+  power_state: poweredOn
+  uuid: 42329da7-e8ab-29ec-1892-d6a4a964912a
+  is_a_template: false
+  id: 5032c8a5-9c5e-ba7a-3804-832a03e16381
+  tools_state: toolsOk
+  connection_state: connected
+  instance_uuid: 5032c8a5-9c5e-ba7a-3804-832a03e16381
+  hostname: centos56gm.localdomain
+  mac_addresses:
+    Network adapter 1: 00:50:56:b2:00:af
+  operatingsystem: CentOS 4/5 (32-bit)
             5032c8a5-9c5e-ba7a-3804-832a03e16381
           when 'does-not-exist-and-is-not-a-uuid', '50323f93-6835-1178-8b8f-9e2109890e1a'
             { 'virtual_machines' => [] }

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

@@ -5,7 +5,11 @@ module Fog
       module Shared
         private
         def vm_clone_check_options(options)
-          options = { 'force' => false }.merge(options)
+          default_options = {
+            'force'        => false,
+            'linked_clone' => false,
+          }
+          options = default_options.merge(options)
           required_options = %w{ path name }
           required_options.each do |param|
             raise ArgumentError, "#{required_options.join(', ')} are required" unless options.has_key? param
@@ -41,7 +45,7 @@ module Fog
           template_dc = path_elements.shift
           # If the first path element contains "vm" this denotes the vmFolder
           # and needs to be shifted out
-          path_elements.shift if path_elements[0] = 'vm'
+          path_elements.shift if path_elements[0] == 'vm'
           # The template name.  The remaining elements are the folders in the
           # datacenter.
           template_name = path_elements.pop
@@ -70,16 +74,47 @@ module Fog
           esx_host = vm_mob_ref.collect!('runtime.host')['runtime.host']
           # The parent of the ESX host itself is a ComputeResource which has a resourcePool
           resource_pool = esx_host.parent.resourcePool
-
-          # Next, create a Relocation Spec instance
-          relocation_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => resource_pool,
-                                                                    :transform => options['transform'] || 'sparse')
+          relocation_spec=nil
+          if ( options['linked_clone'] )
+            # cribbed heavily from the rbvmomi clone_vm.rb
+            # this chunk of code reconfigures the disk of the clone source to be read only,
+            # and then creates a delta disk on top of that, this is required by the API in order to create
+            # linked clondes
+            disks = vm_mob_ref.config.hardware.device.select do |vm_device|
+              vm_device.class == RbVmomi::VIM::VirtualDisk
+            end
+            disks.select{|vm_device| vm_device.backing.parent == nil}.each do |disk|
+              disk_spec = {
+                :deviceChange => [
+                  {
+                    :operation => :remove,
+                    :device => disk
+                  },
+                  {
+                    :operation => :add,
+                    :fileOperation => :create,
+                    :device => disk.dup.tap{|disk_backing|
+                      disk_backing.backing = disk_backing.backing.dup;
+                      disk_backing.backing.fileName = "[#{disk.backing.datastore.name}]";
+                      disk_backing.backing.parent = disk.backing
+                    }
+                  },
+                ]
+              }
+              vm_mob_ref.ReconfigVM_Task(:spec => disk_spec).wait_for_completion
+            end
+            # Next, create a Relocation Spec instance
+            relocation_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => resource_pool,
+                                                                      :diskMoveType => :moveChildMostDiskBacking)
+          else
+            relocation_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => resource_pool,
+                                                                      :transform => options['transform'] || 'sparse')
+          end
           # And the clone specification
           clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => relocation_spec,
                                                             :powerOn  => options['power_on'] || true,
                                                             :template => false)
           task = vm_mob_ref.CloneVM_Task(:folder => vm_mob_ref.parent, :name => options['name'], :spec => clone_spec)
-
           # Waiting for the VM to complete allows us to get the VirtulMachine
           # object of the new machine when it's done.  It is HIGHLY recommended
           # to set 'wait' => true if your app wants to wait.  Otherwise, you're
@@ -126,7 +161,7 @@ module Fog
           end
           {
             'vm_ref'   => 'vm-123',
-            'task_ref' => 'task-1234'
+            'task_ref' => 'task-1234',
           }
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/models/dns/record.rb

@@ -44,19 +44,21 @@ module Fog
           options[:notes]     = description if description
           options[:priority]  = priority if priority
           options[:ttl]       = ttl if ttl
-          data = unless identity
-            connection.create_host(@zone.id, type, value, options)
-          else
+
+          if identity
             options[:host_type] = type
             options[:data]      = value
             connection.update_host(identity, options)
+          else
+            data = connection.create_host(@zone.id, type, value, options)
+            merge_attributes(data.body)
           end
-          merge_attributes(data.body)
+
           true
         end
 
         private
-        
+
         def zone=(new_zone)
           @zone = new_zone
         end