fog-vsphere 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7885912d59e38376666aabf47b11855a457e99
-  data.tar.gz: 1a84d71a6d17751e49a1ccb64fcbe5b6564efae6
+  metadata.gz: 259e868ec79a58fd97457645401a8771432781d2
+  data.tar.gz: 5e4890489b7f412b31af88069c3fae0f2b32bf68
 SHA512:
-  metadata.gz: 466b2ca1d744fac648e5abe6183ca89583e3398abe78d1c99669452025d38a2d52e6229abcddf4843099d45519020edf82549ecba0345c32d6e64b9dde479076
-  data.tar.gz: f0b2c3e5a7cf517b8a95bcd12537b381e83bed40626185c04c393276e4ac771d195bbb87a1a6025d43a2b1d2526f8c2a4b59df937e012d23edd0304876c5cb24
+  metadata.gz: cf035226cec5df7395df07c46707af0369ed277dddc60ef41bf2bb8c737a01092db58b614b22ffd9285f5158b713711b078f37fa7858341243792b940c416734
+  data.tar.gz: 91398f19bfd736f7e14a1f91c5178a49b18a888baf4f6d225b440a9b3ac56865f4de54ef0fa450fb0acff76357f852fc5c553cc0622bb2a9eec860db0dbc80f8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.11.3
+
+* Fix issue when cloning and interface is in boot order
+* Add connected attribute to interface
+
 ## v1.11.2
 
 * Prevent failing when cloning from template to different cluster

data/CONTRIBUTORS.md

@@ -61,6 +61,7 @@
 * Shlomi Zadok <shlomi@ben-hanna.com>
 * Simon Josi <me@yokto.net>
 * Tejas Ravindra Mandke <tejas@identified.com>
+* Timo Goebel <mail@timogoebel.name>
 * Timo Goebel <timo.goebel@dm.de>
 * Timur Alperovich <timur@maginatics.com>
 * Tyler Gregory <01100010011001010110010101110000@users.noreply.github.com>

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

@@ -10,6 +10,7 @@ module Fog
         attribute :network
         attribute :name
         attribute :status
+        attribute :connected
         attribute :summary
         attribute :type
         attribute :key

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

@@ -67,6 +67,7 @@ module Fog
             :mac     => nic.macAddress,
             :network => nic.backing.respond_to?("network") ? nic.backing.network.name : nic.backing.port.portgroupKey,
             :status  => nic.connectable.status,
+            :connected => nic.connectable.connected,
             :summary => nic.deviceInfo.summary,
             :type    => nic.class,
             :key     => nic.key,

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

@@ -155,7 +155,7 @@ module Fog
             if options.key?('network_label')
               raise ArgumentError, "interfaces option can't be specified together with network_label"
             end
-            device_change.concat(modify_template_nics_specs(template_path, options['interfaces'], options['datacenter']))
+            device_change.concat(modify_template_nics_specs(vm_mob_ref, options['interfaces'], options['datacenter']))
           elsif options.key?('network_label')
             device_change << modify_template_nics_simple_spec(options['network_label'], options['nic_type'], options['network_adapter_device_key'], options['datacenter'])
           end
@@ -711,21 +711,36 @@ module Fog
         end
 
 
-        def modify_template_nics_specs(template_path, new_nics, datacenter)
-          template_nics = list_vm_interfaces(template_path, datacenter).map do |old_attributes|
-            Fog::Compute::Vsphere::Interface.new(old_attributes)
-          end
+        def modify_template_nics_specs(vm_mob_ref, nics, datacenter)
           specs = []
+          template_nics = vm_mob_ref.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard)
+          modified_nics = nics.take(template_nics.size)
+          new_nics      = nics.drop(template_nics.size)
 
-          template_nics.each do |interface|
-            specs << create_interface(interface, interface.key, :remove, :datacenter => datacenter)
+          template_nics.zip(modified_nics).each do |template_nic, new_nic|
+            if new_nic
+              backing = create_nic_backing(new_nic, {})
+              template_nic.backing = backing
+              connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
+                :allowGuestControl => true,
+                :connected => true,
+                :startConnected => true
+              )
+              template_nic.connectable = connectable
+              specs << {
+                operation: :edit,
+                device: template_nic
+              }
+            else
+              specs << create_interface(interface, interface.key, :remove, :datacenter => datacenter)
+            end
           end
 
           new_nics.each do |interface|
             specs << create_interface(interface, 0, :add, :datacenter => datacenter)
           end
 
-          return specs
+          specs
         end
 
         def modify_template_volumes_specs(vm_mob_ref, volumes)

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.11.2'.freeze
+    VERSION = '1.11.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core