fog-vsphere 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50674c6fa7d5ee252ada84a587b3321aa1eea6fcfdc39b6a7d4024f6aca1ff2b
-  data.tar.gz: 8ff973afd99e08033368d76e7907d5944c5cecaa5c221dcb6d967616ea30e5af
+  metadata.gz: 2802cab39cda0d34fbf317a0ef39e79b53a7ce20fd736e2f41ac86e0d95f494b
+  data.tar.gz: d173548894fdfed4a4c517e1e6b30b513420b2bf59be77ce1147350ba695a15f
 SHA512:
-  metadata.gz: a463bfaf886fadb3e0944aefdc7b5a93e2345d7183ccd0862a52ff735be9251e29d323d9baab700f86c9815452d66e8052149f577177d4bd6b253871480e746c
-  data.tar.gz: bb5a1ec93db10d8f59424cf0deb625a3add86471a5eecec6b81be885d738003617fd54386c5dd423c876b2afaae7f30fdb48fe11e7096fad8f47c2f2dc265aa8
+  metadata.gz: 62ec056eb0f333a9a80eb1d4ec523cb2e5f8893d8b0cdd9f5243210a920b2acfeeaa74dd5fe00770b5eb77bd5a255167dde730b8f89b257e1d8891133803e1e6
+  data.tar.gz: 4ac64f5bca359eb6e6290d137e1975644929f4eee39e0ad5f48d6c7fb2f58d8f6a235d557efe5bb26f1e0bfc98f88321a199b78bbf6b195aa92c3459e7b9bfd9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v2.3.0
+* set volume unit_number when cloning a vm (#151)
+* add unclustered esxi hosts back to cluster selection (#149)
+* reduce the time required to list networks (#145)
+
 ## v2.2.0
 * vm interface updating needs a datacenter as option (#140)
 * improve vm saving to use a single api call and support network changes (#142)

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

@@ -8,9 +8,7 @@ module Fog
             list_datacenters.map { |dc| list_clusters(datacenter: dc[:name]) }.flatten
           else
             raw_clusters(datacenter_name).map do |cluster|
-              if cluster.instance_of? RbVmomi::VIM::ClusterComputeResource
-                cluster_attributes(cluster, datacenter_name)
-              end
+              cluster_attributes(cluster, datacenter_name)
             end.compact
           end
         end

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

@@ -7,42 +7,83 @@ module Fog
           cluster_name = filters.fetch(:cluster, nil)
           # default to show all networks
           only_active = filters[:accessible] || false
-          raw_networks(datacenter_name, cluster_name).map do |network|
-            next if only_active && !network.summary.accessible
-            network_attributes(network, datacenter_name)
-          end.compact
-        end
 
-        def raw_networks(datacenter_name, cluster = nil)
-          if cluster.nil?
-            find_raw_datacenter(datacenter_name).network
-          else
-            get_raw_cluster(cluster, datacenter_name).network
+          dc = find_raw_datacenter(datacenter_name)
+
+          results = property_collector_results(network_filter_spec(dc))
+
+          dvswitches = results.select { |result| result.obj.is_a?(RbVmomi::VIM::DistributedVirtualSwitch) }.each_with_object({}) do |dvswitch, obj|
+            obj[dvswitch.obj._ref] = dvswitch['summary.name']
           end
+
+          if cluster_name
+            cluster = get_raw_cluster(cluster_name, datacenter_name)
+            cluster_networks = cluster.network.map(&:_ref)
+          end
+
+          results.select { |result| result.obj.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) || result.obj.is_a?(RbVmomi::VIM::Network) }.map do |network|
+            next if cluster_name && !cluster_networks.include?(network.obj._ref)
+            next if only_active && !network['summary.accessible']
+            if network.obj.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup)
+              map_attrs_to_hash(network, network_dvportgroup_attribute_mapping).merge(
+                vlanid: raw_network_vlan(network['config.defaultPortConfig']),
+                virtualswitch: dvswitches[network['config.distributedVirtualSwitch']._ref]
+              )
+            else
+              map_attrs_to_hash(network, network_attribute_mapping).merge(
+                id: managed_obj_id(network.obj)
+              )
+            end.merge(
+              datacenter: datacenter_name,
+              _ref: network.obj._ref
+            )
+          end.compact
         end
 
         protected
 
-        def network_attributes(network, datacenter)
-          if network.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup)
-            id = network.key
-            virtualswitch = network.config.distributedVirtualSwitch.name
-            vlanid = raw_network_vlan(network.config.defaultPortConfig)
-          else
-            id = managed_obj_id(network)
-            virtualswitch = nil
-            vlanid = nil
-          end
+        def network_attribute_mapping
           {
-            id: id,
-            name: network.name,
-            accessible: network.summary.accessible,
-            datacenter: datacenter,
-            virtualswitch: virtualswitch,
-            vlanid: vlanid
+            name: 'name',
+            accessible: 'summary.accessible'
           }
         end
 
+        def network_dvportgroup_attribute_mapping
+          network_attribute_mapping.merge(
+            id: 'config.key'
+          )
+        end
+
+        def folder_traversal_spec
+          RbVmomi::VIM.TraversalSpec(
+            name: 'FolderTraversalSpec',
+            type: 'Folder',
+            path: 'childEntity',
+            skip: false,
+            selectSet: [
+              RbVmomi::VIM.SelectionSpec(name: 'FolderTraversalSpec')
+            ]
+          )
+        end
+
+        def network_filter_spec(obj)
+          RbVmomi::VIM.PropertyFilterSpec(
+            objectSet: [
+              obj: obj.networkFolder,
+              skip: true,
+              selectSet: [
+                folder_traversal_spec
+              ]
+            ],
+            propSet: [
+              { type: 'DistributedVirtualSwitch', pathSet: ['summary.name'] },
+              { type: 'Network', pathSet: network_attribute_mapping.values },
+              { type: 'DistributedVirtualPortgroup', pathSet: network_dvportgroup_attribute_mapping.values + ['config.defaultPortConfig', 'config.distributedVirtualSwitch'] }
+            ]
+          )
+        end
+
         private
 
         def raw_network_vlan(network)
@@ -59,6 +100,7 @@ module Fog
           end
         end
       end
+
       class Mock
         def list_networks(filters)
           datacenter_name = filters[:datacenter]

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

@@ -28,6 +28,7 @@ module Fog
         end
       end
 
+      # rubocop:disable ClassLength
       class Real
         include Shared
 
@@ -803,6 +804,7 @@ module Fog
                          device: template_volume }
             end
           end
+          new_volumes.map { |volume| volume.unit_number = volumes.index(volume) < 7 ? volumes.index(volume) : volumes.index(volume) + 1 }
           specs.concat(new_volumes.map { |volume| create_disk(volume) })
           specs
         end
@@ -821,6 +823,7 @@ module Fog
         end
       end
 
+      # rubocop:enable ClassLength
       class Mock
         include Shared
         def vm_clone(options = {})

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '2.2.0'.freeze
+    VERSION = '2.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core