fog-vsphere 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4991c02472ff132b2a1edef665c3dee7ee98ecec1a98bbad65947e574a9d6957
-  data.tar.gz: e484ae1b367e65fd7d799d1f50673a6584221da5e52ad610cd525e1d32e7de42
+  metadata.gz: f79b2fda04ea3983ad8eb745f642e7b94d10790dfe23d63348aba52dceb1e5bc
+  data.tar.gz: aa888887668bf44fec6f238629592174d94d979fa8c986af17adf70a0ce14667
 SHA512:
-  metadata.gz: 0aed9e163c96fadd05853581565a520e841b4df4ff2509b5c8952ee9421f65ebd35d03cd4f94366708d866e97c9b068221818cc02c1e9848fec2041217122d23
-  data.tar.gz: d22e96a6ccaa8bdfd0a1c6ae564ba50317e08b6ab718ce78e1ace8c0422a05ea56fc9590e2ecc341b86ef6d5808b6289874f4b3312542f00c126187c108c3a4f
+  metadata.gz: db0e26ac2e3417ce2a8c39369c8f01aba9474200684f07d3392d79a9a589a938daf673fcb54d1f7f710aec8043db856459ebe57d5de96c5232d627b467c5d767
+  data.tar.gz: d7304c9307b5eb405e21195c56cbf35c8106be6cfdd00cc91bc2bcaa941f3097867d1b14757420b37a5a81d6b6acf1643263cd492b5e1b78d099e081e40e5957

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v2.1.0
+* fixes two issues that broke vm cloning (#134, #135)
+* performance of host listing was improved (#131)
+* networks have a vlan property (#129)
+
 ## v2.0.1
 
 * Ensure views are destroyed after use (#122)

data/lib/fog/vsphere/compute.rb

@@ -268,6 +268,12 @@ module Fog
                       "filename"  => "[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk",
                       "size_gb"   => 8
                      }],
+                 "scsi_controllers" =>
+                    [{"shared_bus"  => "noSharing",
+                      "type"        => "VirtualLsiLogicController",
+                      "unit_number" => 7,
+                      "key"         => 1000
+                    }],
                  "interfaces"       =>
                     [{"mac"     => "00:50:56:a9:00:28",
                       "network" => "dvportgroup-123456",
@@ -320,6 +326,12 @@ module Fog
                       "name"      => "Hard disk 1",
                       "mode"      => "persistent",
                       "id"        => "6000C29b-f364-d073-8316-8e98ac0a0eae" }],
+                 "scsi_controllers" =>
+                    [{"shared_bus"  => "noSharing",
+                      "type"        => "VirtualLsiLogicController",
+                      "unit_number" => 7,
+                      "key"         => 1000
+                    }],
                  "interfaces"       =>
                     [{ "summary" => "VM Network",
                       "mac"     => "00:50:56:a9:00:00",

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

@@ -6,13 +6,19 @@ module Fog
 
         attribute :datacenter
         attribute :cluster
-        attribute :name
-        attribute :vm_ids
         attribute :cpu_cores
         attribute :cpu_sockets
         attribute :cpu_threads
         attribute :memory
         attribute :uuid
+        attribute :ipaddress
+        attribute :ipaddress6
+        attribute :model
+        attribute :vendor
+        attribute :product_name
+        attribute :product_version
+        attribute :hostname
+        attribute :domainname
 
         # Lazy Loaded Attributes
         [:vm_ids].each do |attr|

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

@@ -8,6 +8,7 @@ module Fog
         attribute :datacenter
         attribute :accessible # reachable by at least one hypervisor
         attribute :virtualswitch
+        attribute :vlanid
 
         def to_s
           name

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

@@ -4,30 +4,71 @@ module Fog
       class Real
         def list_hosts(filters = {})
           cluster = get_raw_cluster(filters[:cluster], filters[:datacenter])
-          cluster.host.map {|host| host_attributes(host, filters)}
+
+          results = property_collector_results(host_system_filter_spec(cluster))
+
+          results.map do |host|
+            hsh = map_attrs_to_hash(host, host_system_attribute_mapping)
+            hsh.merge(
+              datacenter: filters[:datacenter],
+              cluster: filters[:cluster],
+              ipaddress: (host['config.network.vnic'].first.spec.ip.ipAddress rescue nil),
+              ipaddress6: (host['config.network.vnic'].first.spec.ip.ipV6Config.ipV6Address.first.ipAddress rescue nil),
+              vm_ids: Proc.new { host['vm'].map {|vm| vm.config.instanceUuid rescue nil} }
+            )
+          end
         end
 
         protected
 
-        def host_attributes(host, filters)
+        def map_attrs_to_hash(obj, attribute_mapping)
+          attribute_mapping.each_with_object({}) do |(k, v), hsh|
+            hsh[k] = obj[v]
+          end
+        end
+
+        def property_collector_results(filter_spec)
+          property_collector = connection.serviceContent.propertyCollector
+          property_collector.RetrieveProperties(:specSet => [filter_spec])
+        end
+
+        def compute_resource_host_traversal_spec
+          RbVmomi::VIM.TraversalSpec(
+            :name => 'computeResourceHostTraversalSpec',
+            :type => 'ComputeResource',
+            :path => 'host',
+            :skip => false
+          )
+        end
+
+        def host_system_filter_spec(obj)
+          RbVmomi::VIM.PropertyFilterSpec(
+            :objectSet => [
+              :obj => obj,
+              :selectSet => [
+                compute_resource_host_traversal_spec
+              ]
+            ],
+            :propSet => [
+              { :type => 'HostSystem', :pathSet => host_system_attribute_mapping.values + ['config.network.vnic', 'vm'] }
+            ]
+          )
+        end
+
+        def host_system_attribute_mapping
           {
-            datacenter:      filters[:datacenter],
-            cluster:         filters[:cluster],
-            name:            host[:name],
-            cpu_cores:       host.hardware.cpuInfo.numCpuCores,
-            cpu_sockets:     host.hardware.cpuInfo.numCpuPackages,
-            cpu_threads:     host.hardware.cpuInfo.numCpuThreads,
-            memory:          host.hardware.memorySize,
-            uuid:            host.hardware.systemInfo.uuid,
-            model:           host.hardware.systemInfo.model,
-            vendor:          host.hardware.systemInfo.vendor,
-            ipaddress:       (host.config.network.vnic.first.spec.ip.ipAddress rescue nil),
-            ipaddress6:      (host.config.network.vnic.first.spec.ip.ipV6Config.ipV6Address.first.ipAddress rescue nil),
-            product_name:    host.summary.config.product.name,
-            product_version: host.summary.config.product.version,
-            hostname:        (host.config.network.dnsConfig.hostName rescue nil),
-            domainname:      (host.config.network.dnsConfig.domainName rescue nil),
-            vm_ids:          Proc.new { host[:vm].map {|vm| vm.config.instanceUuid rescue nil} }
+            name:            'name',
+            cpu_cores:       'hardware.cpuInfo.numCpuCores',
+            cpu_sockets:     'hardware.cpuInfo.numCpuPackages',
+            cpu_threads:     'hardware.cpuInfo.numCpuThreads',
+            memory:          'hardware.memorySize',
+            uuid:            'hardware.systemInfo.uuid',
+            model:           'hardware.systemInfo.model',
+            vendor:          'hardware.systemInfo.vendor',
+            product_name:    'summary.config.product.name',
+            product_version: 'summary.config.product.version',
+            hostname:        'config.network.dnsConfig.hostName',
+            domainname:      'config.network.dnsConfig.domainName'
           }
         end
       end

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

@@ -8,7 +8,7 @@ module Fog
           # default to show all networks
           only_active = filters[:accessible] || false
           raw_networks(datacenter_name, cluster_name).map do |network|
-            next if only_active and !network.summary.accessible
+            next if only_active && !network.summary.accessible
             network_attributes(network, datacenter_name)
           end.compact
         end
@@ -23,21 +23,36 @@ module Fog
 
         protected
 
-        def network_attributes network, datacenter
-          raw_network = get_raw_network(network.name, datacenter)
-          if raw_network.kind_of? RbVmomi::VIM::DistributedVirtualPortgroup
-            id = raw_network.key
+        def network_attributes(network, datacenter)
+          if network.kind_of?(RbVmomi::VIM::DistributedVirtualPortgroup)
+            id = network.key
+            virtualswitch = network.config.distributedVirtualSwitch.name
+            vlanid = raw_network_vlan_id(network.config.defaultPortConfig.vlan)
           else
             id = managed_obj_id(network)
+            virtualswitch = nil
+            vlanid = nil
           end
           {
             :id            => id,
             :name          => network.name,
             :accessible    => network.summary.accessible,
             :datacenter    => datacenter,
-            :virtualswitch => network.class.name == "DistributedVirtualPortgroup" ? network.config.distributedVirtualSwitch.name : nil
+            :virtualswitch => virtualswitch,
+            :vlanid        => vlanid
           }
         end
+
+        private
+
+        def raw_network_vlan_id(vlan)
+          case vlan
+          when RbVmomi::VIM::VmwareDistributedVirtualSwitchVlanIdSpec
+            vlan.vlanId
+          else
+            nil
+          end
+        end
       end
       class Mock
         def list_networks(filters)

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

@@ -19,6 +19,13 @@ module Fog
           end
         end
       end
+      class Mock
+        def list_vm_scsi_controllers(vm_id)
+          raise Fog::Compute::Vsphere::NotFound, 'VM not Found' unless self.data[:servers].key?(vm_id)
+          return [] unless self.data[:servers][vm_id].key?('scsi_controllers')
+          self.data[:servers][vm_id]['scsi_controllers'].map {|h| h.merge(:server_id => vm_id) }
+        end
+      end
     end
   end
 end

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

@@ -629,7 +629,10 @@ module Fog
               relocation_spec[:datastore] = datastore_obj
             end
           end
-          relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
+          # relocate templates is not supported by fog-vsphere when vm is cloned on a storage pod
+          unless options.key?('storage_pod')
+            relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
+          end
           # And the clone specification
           clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => relocation_spec,
                                                             :config => virtual_machine_config_spec,
@@ -751,7 +754,7 @@ module Fog
 
           template_nics.zip(modified_nics).each do |template_nic, new_nic|
             if new_nic
-              backing = create_nic_backing(new_nic, {})
+              backing = create_nic_backing(new_nic, {datacenter: datacenter})
               template_nic.backing = backing
               template_nic.addressType = 'generated'
               template_nic.macAddress = nil
@@ -801,7 +804,7 @@ module Fog
             end
           end
           specs.concat(new_volumes.map { |volume| create_disk(volume) })
-          return specs
+          specs
         end
 
         def relocate_template_volumes_specs(vm_mob_ref, volumes, datacenter)
@@ -810,11 +813,11 @@ module Fog
 
           specs = []
           template_volumes.zip(modified_volumes).each do |template_volume, new_volume|
-            if new_volume && new_volume.datastore != template_volume.backing.datastore.name
-              specs << { :diskId => new_volume.key, :datastore => get_raw_datastore(new_volume.datastore, datacenter) }
+            if new_volume && new_volume.datastore && new_volume.datastore != template_volume.backing.datastore.name
+              specs << { :diskId => template_volume.key, :datastore => get_raw_datastore(new_volume.datastore, datacenter) }
             end
           end
-          return specs
+          specs
         end
       end
 

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

data/tests/models/compute/server_tests.rb

@@ -5,10 +5,12 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
   tests('The server model should') do
     tests('have the action') do
       test('reload') { server.respond_to? 'reload' }
-      %w(stop start suspend destroy reboot).each do |action|
+      %w(stop suspend destroy reboot).each do |action|
         test(action) { server.respond_to? action }
         test("#{action} returns successfully") { server.send(action.to_sym) ? true : false }
       end
+      test('start') { server.respond_to?('start') }
+      test("start returns false, because it is already poweredOn") { server.start ? true : false }
       test('guest_processes') { server.respond_to? 'guest_processes' }
       test('take_snapshot') do
         test('responds') { server.respond_to? 'take_snapshot'}

data/tests/models/compute/ticket_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('Fog::Compute[:vsphere] | hosts collection', ['vsphere']) do
   tests('A ticket') do
     test('should have a ticket') { not ticket.ticket.empty? }
     test('should have a host') { not ticket.host.empty? }
-    test('should have a port') { ticket.port.kind_of? Fixnum }
+    test('should have a port') { ticket.port.kind_of?(Integer) }
     test('should have a ssl ssl_thumbprint') { not ticket.ssl_thumbprint.empty? }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core