fog 1.1.1 → 1.1.2

data/lib/fog/vcloud/models/compute/servers.rb

@@ -13,8 +13,9 @@ module Fog
         attribute :href, :aliases => :Href
 
         def all
-          check_href!(:parent => "Vdc")
-          load(_vapps)
+          check_href!("Vapp")
+          vapp.load_unless_loaded!
+          load(vapp.children||[])
         end
 
         def get(uri)
@@ -37,19 +38,16 @@ module Fog
 
         private
 
-        def _resource_entities
-          if Hash === resource_entities = connection.get_vdc(href).body[:ResourceEntities]
-            resource_entities[:ResourceEntity]
-          end
+        def vapp
+          @vapp ||= (attributes[:vapp] || init_vapp)
         end
 
-        def _vapps
-          resource_entities = _resource_entities
-          if resource_entities.nil?
-            []
-          else
-            resource_entities.select {|re| re[:type] == 'application/vnd.vmware.vcloud.vApp+xml' }
-          end
+        def init_vapp
+          Fog::Vcloud::Compute::Vapp.new(
+            :connection => connection,
+            :href => self.href,
+            :collection => Fog::Vcloud::Compute::Vapps.new(:connection => connection)
+          )
         end
 
       end

data/lib/fog/vcloud/models/compute/vapp.rb

@@ -0,0 +1,41 @@
+require 'fog/vcloud/models/compute/helpers/status'
+module Fog
+  module Vcloud
+    class Compute
+      class Vapp < Fog::Vcloud::Model
+
+        include Fog::Vcloud::Compute::Helpers::Status
+
+        identity :href
+
+        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+
+        attribute :name
+        attribute :type
+        attribute :status
+        attribute :description, :aliases => :Description
+        attribute :deployed, :type => :boolean
+
+        attribute :children, :aliases => :Children, :squash => :Vm
+        attribute :lease_settings, :aliases => :LeaseSettingsSection
+
+        attribute :other_links, :aliases => :Link
+
+        def servers
+          @servers ||= Fog::Vcloud::Compute::Servers.
+            new( :connection => connection,
+                 :href => href,
+                 :vapp => self
+            )
+        end
+
+        def networks
+          @networks ||= Fog::Vcloud::Compute::Networks.
+            new( :connection => connection,
+                 :href => href
+            )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/models/compute/vapps.rb

@@ -0,0 +1,32 @@
+require 'fog/vcloud/models/compute/vapp'
+
+module Fog
+  module Vcloud
+    class Compute
+
+      class Vapps < Collection
+
+        model Fog::Vcloud::Compute::Vapp
+
+        undef_method :create
+
+        attribute :href
+
+        def all
+          resource_entities = (re=connection.get_vdc(self.href).body[:ResourceEntities][:ResourceEntity]).is_a?(Array) ? re : [re].compact
+          data = resource_entities.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_vapp(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/vcloud/models/compute/vdc.rb

@@ -10,13 +10,17 @@ module Fog
         attribute :name
         attribute :type
         attribute :description, :aliases => :Description
-        attribute :other_links, :aliases => :Link
+        attribute :network_quota, :aliases => :NetworkQuota, :type => :integer
+        attribute :nic_quota, :aliases => :NicQuota, :type => :integer
+        attribute :vm_quota, :aliases => :VmQuota, :type => :integer
+        attribute :is_enabled, :aliases => :IsEnabled, :type => :boolean
         attribute :compute_capacity, :aliases => :ComputeCapacity
         attribute :storage_capacity, :aliases => :StorageCapacity
         attribute :available_networks, :aliases => :AvailableNetworks, :squash => :Network
+
+        attribute :other_links, :aliases => :Link
+
         attribute :resource_entities, :aliases => :ResourceEntities, :squash => :ResourceEntity
-        attribute :deployed_vm_quota
-        attribute :instantiated_vm_quota
 
         def networks
           @networks ||= Fog::Vcloud::Compute::Networks.
@@ -24,32 +28,13 @@ module Fog
                  :href => href )
         end
 
-        def servers
-          @servers ||= Fog::Vcloud::Compute::Servers.
+        def vapps
+          @vapps ||= Fog::Vcloud::Compute::Vapps.
             new( :connection => connection,
-                 :href => href )
+                 :href => href
+            )
         end
 
-        def tasks
-          @tasks ||= Fog::Vcloud::Compute::Tasks.
-            new( :connection => connection,
-                 :href => href + "/tasksList" )
-        end
-
-        private
-
-        def collection_based_on_type(type, klass = nil)
-          load_unless_loaded!
-          test_links = other_links.kind_of?(Array) ? other_links : [other_links]
-          if link = test_links.detect { |link| link[:type] == type }
-            case type
-            when "application/vnd.vmware.vcloud.catalog+xml"
-              Fog::Vcloud::Compute::Catalog
-            end.new( :connection => connection, :href => link[:href] )
-          else
-            [ ]
-          end
-        end
       end
     end
   end

data/lib/fog/vcloud/models/compute/vdcs.rb

@@ -10,8 +10,11 @@ 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" }
+          links = (l=connection.get_organization(org_uri).body[:Link]).is_a?(Array) ? l : [l].compact
+          data = 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
@@ -24,16 +27,11 @@ module Fog
           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/fog/vcloud/requests/compute/get_server.rb

@@ -0,0 +1,10 @@
+module Fog
+  module Vcloud
+    class Compute
+
+      class Real
+        basic_request :get_server
+      end
+    end
+  end
+end

data/lib/fog/vsphere/compute.rb

@@ -21,6 +21,7 @@ module Fog
       request :vm_reboot
       request :vm_clone
       request :vm_destroy
+      request :datacenters
 
       module Shared
 

data/lib/fog/vsphere/models/compute/server.rb

@@ -57,6 +57,24 @@ module Fog
           connection.vm_destroy('instance_uuid' => instance_uuid)
         end
 
+        def clone(options = {})
+          requires :name, :path
+          # Convert symbols to strings
+          req_options = options.inject({}) { |hsh, (k,v)| hsh[k.to_s] = v; hsh }
+          # Give our path to the request
+          req_options['path'] ="#{path}/#{name}"
+          # Perform the actual clone
+          clone_results = connection.vm_clone(req_options)
+          # Create the new VM model.
+          new_vm = self.class.new(clone_results['vm_attributes'])
+          # We need to assign the collection and the connection otherwise we
+          # cannot reload the model.
+          new_vm.collection = self.collection
+          new_vm.connection = self.connection
+          # Return the new VM model.
+          new_vm
+        end
+
       end
 
     end

data/lib/fog/vsphere/models/compute/servers.rb

@@ -9,8 +9,14 @@ module Fog
 
         model Fog::Compute::Vsphere::Server
 
-        def all
-          response = connection.list_virtual_machines
+        # 'path' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
+        # than simply listing everything.
+        def all(filters = {})
+          # REVISIT: I'm not sure if this is the best way to implement search
+          # filters on a collection but it does work.  I need to study the AWS
+          # code more to make sure this matches up.
+          filters['folder'] ||= attributes['folder']
+          response = connection.list_virtual_machines(filters)
           load(response['virtual_machines'])
         end
 

data/lib/fog/vsphere/requests/compute/datacenters.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def datacenters
+          @datacenters ||= datacenters_reload
+          # Hide the values which are the RbVmomi instances
+          @datacenters.keys
+        end
+
+        private
+
+        def datacenters_reload
+          @rootfolder  ||= @connection.rootFolder
+          inventory = @rootfolder.inventory(:Datacenter => [ 'name' ])[@rootfolder]
+          # Convert the inventory into a Hash of the form: We remove the
+          # property selectors.  { "<dc_name>" => #<RbVmomi::VIM::Datacenter> }
+          # The Datacenter instance itself is at index 0 and the properties we
+          # collected are at index 1.
+          inventory.inject({}) do |memo, (name,dc_ary)|
+            memo[name] = dc_ary[0]
+            memo
+          end
+        end
+      end
+
+      class Mock
+        def datacenters
+          [ "Solutions", "Solutions2", "Solutions3" ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb

@@ -1,13 +1,15 @@
 module Fog
   module Compute
     class Vsphere
-
       class Real
-
         def list_virtual_machines(options = {})
-          # First, determine if there's a search filter
+          # Listing all VM's can be quite slow and expensive.  Try and optimize
+          # based on the available options we have.  These conditions are in
+          # ascending order of  time to complete for large deployments.
           if options['instance_uuid'] then
             list_all_virtual_machines_by_instance_uuid(options)
+          elsif options['folder'] then
+            list_all_virtual_machines_in_folder(options)
           else
             list_all_virtual_machines
           end
@@ -15,6 +17,48 @@ module Fog
 
         private
 
+        def list_all_virtual_machines_in_folder(options = {})
+          # Tap gets rid of the leading empty string and "Datacenters" element
+          # and returns the array.
+          path_elements = options['folder'].split('/').tap { |ary| ary.shift 2 }
+          # The DC name itself.
+          dc_name = path_elements.shift
+          # 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'
+          # 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
+          dc = @datacenters[dc_name]
+
+          # Get the VM Folder (Group) efficiently
+          vm_folder = dc.vmFolder
+
+          # Walk the tree resetting the folder pointer as we go
+          folder = path_elements.inject(vm_folder) do |current_folder, sub_folder_name|
+            # JJM VIM::Folder#find appears to be quite efficient as it uses the
+            # searchIndex It certainly appears to be faster than
+            # VIM::Folder#inventory since that returns _all_ managed objects of
+            # a certain type _and_ their properties.
+            sub_folder = current_folder.find(sub_folder_name, RbVmomi::VIM::Folder)
+            raise ArgumentError, "Could not descend into #{sub_folder_name}.  Please check your path." unless sub_folder
+            sub_folder
+          end
+
+          # This should be efficient since we're not obtaining properties
+          virtual_machines = folder.children.inject([]) do |ary, child|
+            if child.is_a? RbVmomi::VIM::VirtualMachine then
+              ary << convert_vm_mob_ref_to_attr_hash(child)
+            end
+            ary
+          end
+
+          # Return the managed objects themselves as an array.  These may be converted
+          # to an attribute has using convert_vm_mob_ref_to_attr_hash
+          { 'virtual_machines' => virtual_machines }
+        end
+
         def list_all_virtual_machines_by_instance_uuid(options = {})
           uuid = options['instance_uuid']
           search_filter = { :uuid => uuid, 'vmSearch' => true, 'instanceUuid' => true }
@@ -94,102 +138,99 @@ 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' => [] }
           end
         end
-
       end
-
     end
   end
 end
-