vagrant-vcloud 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8a383b915dc8939efd48bde407f13c3be6d104
-  data.tar.gz: f5dd1be500a3399db255258d351e58c7c5d20c30
+  metadata.gz: c8427f350e6d164ba8d274b7423f2e24c5d5a6ee
+  data.tar.gz: 91b7763f8209990f9626e98b52a0696d04b37fc5
 SHA512:
-  metadata.gz: 44f686d7604fff5fb6ba410c0366c55a17464cb23bf30c84f22a697bbe5517e4c3c7e579015ded3cd11622e2b3212c18e5d19a216404031f0c7863d64e69d979
-  data.tar.gz: 40fe2aa6f7e68ef8756bf92c960d99e89ff6fee58bb80d8ade0e719afb82febd871fcf95a7abf54d869ccdd13fb4a53d83865f88919cf425412e9cd272b0b1fb
+  metadata.gz: 36107695a03114903e000f3bfdcb6062b4ba3d3d50287aff3dca5ee993fe8da6b5f1b30754d5060bacaa29498f19897f0a3e80e4bf0b6bd06aa47bbf58ed041c
+  data.tar.gz: e0c47dcb939dd7b9a22d9d9d2b971b0573881fed34fdba6114ad5462e58b5eadf2d9485caa841abf3a6ca8ad6521a4522826223d006155696749d23f0b1a064c

data/README.md

@@ -1,4 +1,4 @@
-[Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director® [![Gem Version](https://badge.fury.io/rb/vagrant-vcloud.svg)](http://badge.fury.io/rb/vagrant-vcloud) [![Code Climate](https://codeclimate.com/github/frapposelli/vagrant-vcloud/badges/gpa.svg)](https://codeclimate.com/github/frapposelli/vagrant-vcloud) [![Dependency Status](https://gemnasium.com/frapposelli/vagrant-vcloud.svg)](https://gemnasium.com/frapposelli/vagrant-vcloud) [![Join the chat at https://gitter.im/frapposelli/vagrant-vcloud](https://badges.gitter.im/frapposelli/vagrant-vcloud.svg)](https://gitter.im/frapposelli/vagrant-vcloud?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director® [![Gem Version](https://badge.fury.io/rb/vagrant-vcloud.svg)](http://badge.fury.io/rb/vagrant-vcloud) [![Code Climate](https://codeclimate.com/github/frapposelli/vagrant-vcloud/badges/gpa.svg)](https://codeclimate.com/github/frapposelli/vagrant-vcloud) [![Dependency Status](https://gemnasium.com/frapposelli/vagrant-vcloud.svg)](https://gemnasium.com/frapposelli/vagrant-vcloud)
 ========================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
@@ -52,6 +52,9 @@ vapp = {
         ip_subnet: '10.10.10.10/255.255.255.0'
       }
     ]
+  },
+  ovf_properties: {
+    'test-variable' => 'true'
   }
 }
 
@@ -132,6 +135,9 @@ Vagrant.configure('2') do |config|
           pro.nested_hypervisor = node[:nested_hypervisor]
           pro.enable_guest_customization = node[:enable_guest_customization]
           pro.guest_customization_script = node[:guest_customization_script]
+          if vapp[:ovf_properties]
+            pro.ovf_properties = vapp[:ovf_properties]
+          end
         end
         node_config.vm.network :public_network
       else

data/lib/vagrant-vcloud/action/power_on.rb

@@ -50,6 +50,18 @@ module VagrantPlugins
             end
           end
 
+          # set ovf properties
+          if !cfg.ovf_properties.nil?
+            env[:ui].info('Setting VM OVF Properties...')
+            set_ovf_properties = cnx.set_ovf_properties(env[:machine].id, cfg.ovf_properties)
+            if set_ovf_properties
+              wait = cnx.wait_task_completion(set_ovf_properties)
+              unless wait[:errormsg].nil?
+                fail Errors::SetOvfPropertyError, :message => wait[:errormsg]
+              end
+            end
+          end
+
           if cfg.power_on.nil? || cfg.power_on == true
             env[:ui].info('Powering on VM...')
             poweron_vm = cnx.poweron_vm(env[:machine].id)

data/lib/vagrant-vcloud/config.rb

@@ -262,6 +262,9 @@ module VagrantPlugins
       # guest customization admin require password reset (Bool = false)
       attr_accessor :guest_customization_admin_password_reset
 
+      # ovf properties object (Hash)
+      attr_accessor :ovf_properties
+
       def validate(machine)
         errors = _detected_errors
 

data/lib/vagrant-vcloud/driver/meta.rb

@@ -46,13 +46,6 @@ module VagrantPlugins
 
           # Instantiate the proper version driver for vCloud
           @logger.debug("Finding driver for vCloud version: #{@version}")
-          driver_map   = {
-            '5.1' => Version_5_1,
-            '5.5' => Version_5_1, # Binding vCloud 5.5 API on our current 5.1 implementation
-            '5.6' => Version_5_1, # Binding vCHS API on our current 5.1 implementation
-            '5.7' => Version_5_1, # Binding vCHS API on our current 5.1 implementation
-            '9.0' => Version_5_1  # Binding vCHS API on our current 5.1 implementation
-          }
 
           if @version.start_with?('0.9') ||
              @version.start_with?('1.0') ||
@@ -61,19 +54,7 @@ module VagrantPlugins
             raise Errors::VCloudOldVersion, :version => @version
           end
 
-          driver_klass = nil
-          driver_map.each do |key, klass|
-            if @version.start_with?(key)
-              driver_klass = klass
-              break
-            end
-          end
-
-          if !driver_klass
-            supported_versions = driver_map.keys.sort.join(', ')
-            raise Errors::VCloudInvalidVersion,
-                  :supported_versions => supported_versions
-          end
+          driver_klass = Version_5_1 # Binding any vCloud API on our current 5.1 implementation
 
           @logger.info("Using vCloud driver: #{driver_klass}")
           @driver = driver_klass.new(@hostname, @username, @password, @org_name)

data/lib/vagrant-vcloud/driver/version_5_1.rb

@@ -2278,6 +2278,43 @@ module VagrantPlugins
 
         end
 
+        ##
+        # Set OVF data
+        def set_ovf_properties(vm_id, properties)
+          params = {
+            'method'  => :get,
+            'command' => "/vApp/vm-#{vm_id}/productSections"
+          }
+          response, _headers = send_request(params)
+
+          changed = false
+          response.css('ovf|Property').each do |prop|
+            next if prop['ovf:userConfigurable'] == 'false'
+            key = prop['ovf:key']
+            next if !properties[ key ]
+            if properties[ key ] != prop['ovf:value']
+              changed = true
+              prop['ovf:value'] = properties[ key ]
+            end
+          end
+
+          if changed
+            params = {
+              'method'  => :put,
+              'command' => "/vApp/vm-#{vm_id}/productSections"
+            }
+            _response, headers = send_request(
+              params,
+              response.to_xml,
+              'application/vnd.vmware.vcloud.productSections+xml'
+            )
+
+            task_id = URI(headers['Location']).path.gsub('/api/task/', '')
+            return task_id
+          end
+          return nil
+        end
+
         ##
         # Fetch details about a given VM
         def get_vm(vm_id)

data/lib/vagrant-vcloud/errors.rb

@@ -72,6 +72,9 @@ module VagrantPlugins
       class SyncError < VCloudError
         error_key(:sync_error)
       end
+      class SetOvfPropertyError < VCloudError
+        error_key(:ovf_property_error)
+      end
     end
   end
 end

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = '0.4.7'
+    VERSION = '0.5.0'
   end
 end

data/locales/en.yml

@@ -62,6 +62,7 @@ en:
 
         Host path: %{hostpath}
         Error: %{err}
+      ovf_property_error: "Error setting OVF Properties: %{message}"
     gc:
       admin_password: "Guest customization must be enabled to generate/specify password"
       admin_password_gs: "Admin assword must be auto generated or secified"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar