fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customfield < Fog::Model
+
+        identity :key
+
+        attribute :name
+        attribute :type
+
+        def to_s
+          name
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/vsphere/models/compute/customfield'
+
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customfields < Fog::Collection
+
+        model Fog::Compute::Vsphere::Customfield
+
+        attr_accessor :vm
+
+        def all(filters = {})
+          load service.list_customfields()
+        end
+
+        def get(key)
+          load(service.list_customfields()).find do | cv | 
+            cv.key == ((key.is_a? String) ? key.to_i : key)
+          end
+        end
+
+     end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customvalue < Fog::Model
+
+        attribute :value
+        attribute :key
+
+        def to_s
+          value
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'fog/core/collection'
+require 'fog/vsphere/models/compute/customvalue'
+
+module Fog
+  module Compute
+    class Vsphere
+
+      class Customvalues < Fog::Collection
+
+        model Fog::Compute::Vsphere::Customvalue
+
+        attr_accessor :vm
+
+        def all(filters = {})
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              load service.list_vm_customvalues(vm.id)
+            else
+            raise 'customvalues should have vm'
+          end
+        end
+
+        def get(key)
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              load service.list_vm_customvalues(vm.id)
+            else
+            raise 'customvalues should have vm'
+          end.find { | cv | cv.key == key }
+        end
+
+     end
+    end
+  end
+end

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

@@ -27,6 +27,10 @@ module Fog
         def virtual_machines filters = {}
           service.servers({ :datacenter => name }.merge(filters))
         end
+        
+        def customfields filters = {}
+          service.customfields({ :datacenter => name}.merge(filters))
+        end
 
         def to_s
           name

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

@@ -5,12 +5,14 @@ module Fog
       class Interface < Fog::Model
 
         identity :mac
+        alias :id :mac
 
         attribute :network
         attribute :name
         attribute :status
         attribute :summary
         attribute :type
+        attribute :key
 
         def initialize(attributes={} )
           super defaults.merge(attributes)

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

@@ -24,9 +24,21 @@ module Fog
         end
 
         def get(id)
-          new service.get_interface(id)
+          requires :vm
+          case vm
+            when Fog::Compute::Vsphere::Server
+              interface=service.get_vm_interface(vm.id, :key => id, :mac=> id, :name => id)
+            when Fog::Compute::Vsphere::Template
+              interface=service.get_template_interfaces(vm.id, :key => id, :mac=> id, :name => id)
+            else
+            raise 'interfaces should have vm or template'
+          end
+          if interface 
+            Fog::Compute::Vsphere::Interface.new(interface) 
+          else
+            nil         
+          end
         end
-
      end
     end
   end

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

@@ -11,14 +11,14 @@ module Fog
         attr_accessor :datacenter
 
         def all(filters = {})
-          load service.list_networks(filters.merge(:datacenter => datacenter))
+          f = { :datacenter => datacenter }.merge(filters)
+          load service.list_networks(f)
         end
 
         def get(id)
           requires :datacenter
           new service.get_network(id, datacenter)
         end
-
       end
     end
   end

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

@@ -24,8 +24,7 @@ module Fog
         attribute :uuid
         attribute :hostname
         attribute :operatingsystem
-        attribute :ipaddress, :aliases => 'public_ip_address'
-        # attribute :public_ip_address, :aliases => 'ipaddress'
+        attribute :public_ip_address, :aliases => 'ipaddress'
         attribute :power_state,   :aliases => 'power'
         attribute :tools_state,   :aliases => 'tools'
         attribute :tools_version
@@ -39,6 +38,7 @@ module Fog
         attribute :cpus
         attribute :interfaces
         attribute :volumes
+        attribute :customvalues
         attribute :overall_status, :aliases => 'status'
         attribute :cluster
         attribute :datacenter
@@ -51,8 +51,19 @@ module Fog
           self.instance_uuid ||= id # TODO: remvoe instance_uuid as it can be replaced with simple id
           initialize_interfaces
           initialize_volumes
+          initialize_customvalues
         end
 
+        # Lazy Loaded Attributes
+        [:datacenter, :cluster, :hypervisor, :resource_pool, :mac_addresses].each do |attr|
+          define_method attr do
+            attributes[attr] = attributes[attr].call if attributes[attr].is_a?(Proc)
+            attributes[attr]
+          end
+        end
+        # End Lazy Loaded Attributes
+
+
         def vm_reconfig_memory(options = {})
           requires :instance_uuid, :memory
           service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)
@@ -63,8 +74,8 @@ module Fog
           service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
         end
 
-        def vm_reconfig_hardware(options = {})
-          requires :instance_uuid, :hardware_spec
+        def vm_reconfig_hardware(hardware_spec, options = {})
+          requires :instance_uuid
           service.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
         end
 
@@ -131,10 +142,6 @@ module Fog
           power_state == "poweredOn"
         end
 
-        def public_ip_address
-          ipaddress
-        end
-
         def tools_installed?
           tools_state != "toolsNotInstalled"
         end
@@ -162,10 +169,33 @@ module Fog
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : service.interfaces( :vm => self )
         end
+        
+        def interface_ready? attrs
+          (attrs.is_a? Hash and attrs[:blocking]) or attrs.is_a? Fog::Compute::Vsphere::Interface
+        end
+
+        def add_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.add_vm_interface(id, attrs)
+        end
+
+        def update_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.update_vm_interface(id, attrs)
+        end
+
+        def destroy_interface attrs
+          wait_for { not ready? } if interface_ready? attrs
+          service.destroy_vm_interface(id, attrs)
+        end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : service.volumes( :vm => self )
         end
+        
+        def customvalues
+          attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
+        end
 
         def folder
           return nil unless datacenter and path
@@ -217,6 +247,12 @@ module Fog
             self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
           end
         end
+        
+        def initialize_customvalues
+          if attributes[:customvalues] and attributes[:customvalues].is_a?(Array)
+            self.attributes[:customvalues].map { |cfield| cfield.is_a?(Hash) ? service.customvalue.new(cfield) : cfield}
+          end
+        end
       end
 
     end

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

@@ -17,13 +17,15 @@ module Fog
         # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
         # than simply listing everything.
         def all(filters = { })
-          load service.list_virtual_machines(filters.merge(
-                                                  :datacenter    => datacenter,
-                                                  :cluster       => cluster,
-                                                  :network       => network,
-                                                  :resource_pool => resource_pool,
-                                                  :folder        => folder
-                                                ))
+          f = {
+            :datacenter    => datacenter,
+            :cluster       => cluster,
+            :network       => network,
+            :resource_pool => resource_pool,
+            :folder        => folder
+          }.merge(filters)
+
+          load service.list_virtual_machines(f)
         end
 
         def get(id, datacenter = nil)
@@ -31,9 +33,7 @@ module Fog
         rescue Fog::Compute::Vsphere::NotFound
           nil
         end
-
       end
-
     end
   end
 end

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

@@ -39,7 +39,7 @@ module Fog
         def device_change attributes
           devices = []
           if (nics = attributes[:interfaces])
-            devices << nics.map { |nic| create_interface(nic, nics.index(nic)) }
+            devices << nics.map { |nic| create_interface(nic, nics.index(nic), :add, attributes) }
           end
 
           if (disks = attributes[:volumes])
@@ -49,7 +49,22 @@ module Fog
           devices.flatten
         end
 
-        def create_interface nic, index = 0, operation = :add
+        def create_nic_backing nic, attributes
+          raw_network = get_raw_network(nic.network, attributes[:datacenter])
+
+          if raw_network.kind_of? RbVmomi::VIM::DistributedVirtualPortgroup
+            RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(
+              :port => RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+                :portgroupKey => raw_network.key,
+                :switchUuid   => raw_network.config.distributedVirtualSwitch.uuid
+              )
+            )
+          else
+            RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(:deviceName => nic.network)
+          end
+        end
+
+        def create_interface nic, index = 0, operation = :add, attributes = {}
           {
             :operation => operation,
             :device    => nic.type.new(
@@ -59,7 +74,7 @@ module Fog
                   :label   => nic.name,
                   :summary => nic.summary,
                 },
-              :backing     => RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(:deviceName => nic.network),
+              :backing     => create_nic_backing(nic, attributes),
               :addressType => 'generated')
           }
         end

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

@@ -21,7 +21,9 @@ module Fog
 
       class Mock
         def get_datacenter name
-          {:name => "Solutions", :status => "grey"}
+          dc = self.data[:datacenters][name]
+          raise(Fog::Compute::Vsphere::NotFound) unless dc
+          dc
         end
       end
     end

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

@@ -12,7 +12,12 @@ module Fog
 
         def get_raw_datastore(name, datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
-          dc.find_datastore(name)
+
+          @connection.serviceContent.viewManager.CreateContainerView({
+            :container  => dc.datastoreFolder,
+            :type       =>  ["Datastore"],
+            :recursive  => true
+          }).view.select{|ds| ds.name == name}.first
         end
       end
 

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

@@ -27,9 +27,11 @@ module Fog
           # The required path syntax - 'topfolder/subfolder
 
           # Clean up path to be relative since we're providing datacenter name
-          paths          = path.sub(/^\/?Datacenters\/#{datacenter_name}\/vm\/?/, '').split('/')
           dc             = find_raw_datacenter(datacenter_name)
           dc_root_folder = dc.vmFolder
+          # Filter the root path for this datacenter not to be used."
+          dc_root_folder_path=dc_root_folder.path.map { | id, name | name }.join("/")
+          paths          = path.sub(/^\/?#{Regexp.quote(dc_root_folder_path)}\/?/, '').split('/')
 
           return dc_root_folder if paths.empty?
           # Walk the tree resetting the folder pointer as we go

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

@@ -12,7 +12,12 @@ module Fog
 
         def get_raw_network(name, datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
-          dc.networkFolder.find(name)
+
+          @connection.serviceContent.viewManager.CreateContainerView({
+            :container  => dc.networkFolder,
+            :type       =>  ["Network"],
+            :recursive  => true
+          }).view.select{|n| n.name == name}.first
         end
       end
 

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

@@ -0,0 +1,16 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def get_template(id, datacenter_name = nil)
+          convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name))
+        end
+      end
+
+      class Mock
+        def get_template(id, datacenter_name = nil)
+        end
+      end
+    end
+  end
+end

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

@@ -10,15 +10,19 @@ module Fog
 
         def get_vm_ref(id, dc = nil)
           raw_datacenter = find_raw_datacenter(dc) if dc
-          vm = case id
+          vm = case is_uuid?(id)
             # UUID based
-            when /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/
+            when true
               params = {:uuid => id, :vmSearch => true, :instanceUuid => true}
               params[:datacenter] = raw_datacenter if dc
               @connection.searchIndex.FindByUuid(params)
             else
               # try to find based on VM name
-              dc ? raw_datacenter.find_vm(id) : raw_datacenters.map{ |d| d.find_vm(id) }.compact.first
+              if dc
+                raw_datacenter.find_vm(id)
+              else
+                raw_datacenters.map { |d| d.find_vm(id) }.compact.first
+              end
           end
           vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
@@ -26,32 +30,13 @@ module Fog
 
       class Mock
         def get_virtual_machine(id, datacenter_name = nil)
-          case id
-          when "5032c8a5-9c5e-ba7a-3804-832a03e16381", 'vm-715'
-            { :resource_pool    => "Resources",
-              :memory_mb        => 2196,
-              :power_state      => "poweredOn",
-              :mac_addresses    => { "Network adapter 1" => "00:50:56:b2:00:af" },
-              :hostname         => "centos56gm.localdomain",
-              :cpus             => 1,
-              :connection_state => "connected",
-              :mo_ref           => "vm-715",
-              :overall_status   => "green",
-              :datacenter       => "Solutions",
-              :instance_uuid    => "5029c440-85ee-c2a1-e9dd-b63e39364603",
-              :hypervisor       => "gunab.puppetlabs.lan",
-              :guest_id         => "rhel6_64Guest",
-              :cluster          => "virtlabcluster",
-              :tools_state      => "toolsOk",
-              :name             => "jefftest",
-              :operatingsystem  => "Red Hat Enterprise Linux 6 (64-bit)",
-              :path             => "/",
-              :tools_version    => "guestToolsUnmanaged",
-              :ipaddress        => "192.168.100.187",
-              :id               => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
-              :uuid             => "42329da7-e8ab-29ec-1892-d6a4a964912a"
-            }
+          if is_uuid?(id)
+            vm = list_virtual_machines({ 'instance_uuid' => id, 'datacenter' => datacenter_name }).first
+          else
+            # try to find based on VM name. May need to handle the path of the VM
+            vm = list_virtual_machines({ 'name' => id, 'datacenter' => datacenter_name }).first
           end
+          vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
 
       end