vagrant-vcloud 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c823549c9a5883f1ba315cf1e799aec3b4b868c2
-  data.tar.gz: 7db0d41e4b5afe847fa8fcb9e3acc844eb58440c
+  metadata.gz: c063c6be550a2cc4edc377537aa3131e5151b7be
+  data.tar.gz: 6dc78ac5e15f8a82dd04cc096e309fa82f20665e
 SHA512:
-  metadata.gz: 9b5267f95b81b9cd28087eafbe39ec6da5a7b727cafe1e681435538f521165f91830f307571996c8ea768af08d5e305c5798c7636339346cf6eb3532368706e4
-  data.tar.gz: fd1f791069bf9a7680decc08df235acd61a5218b031d9c686a9e379d661b0680ce6c0e656820216f02424fe0a694768e2c73652c2ec117eac1845f985231b13b
+  metadata.gz: fa89f867841f3aa6c3db196be9ba3731bef0387958c5c1de89f6bfc0dcb3bd657d351199deb70a7ed2ed93a1ab828d2b3bc5f36428767d2c327c7e704cb20f6a
+  data.tar.gz: 045e357b328c4ec61015865353009d2fec8fc4cc4b1f54b489fe9fc402510a0d2a64d1bc8af5973d93f94ccc94f57aa840d91785f7f9981750b14e31241055a2

data/README.md

@@ -1,9 +1,6 @@
-[Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
+[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)
 =============
 
-[Version 0.4.3](../../releases/tag/v0.4.3) has been released!
--------------
-
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
 We have a wide array of boxes available at [Vagrant Cloud](https://vagrantcloud.com/gosddc) you can use them directly or you can roll your own as you please, make sure to install VMware tools in it.

data/lib/vagrant-vcloud/action.rb

@@ -120,6 +120,7 @@ module VagrantPlugins
                     b4.use DestroyVM
                   end
                 end
+                b3.use ProvisionerCleanup
               end
             else
               b2.use MessageWillNotDestroy

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

@@ -17,7 +17,7 @@ module VagrantPlugins
 
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vm_name = env[:machine].name
+          vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
 
           if cfg.ip_dns.nil?
             dns_address1 = '8.8.8.8'

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

@@ -29,7 +29,7 @@ module VagrantPlugins
           cfg = @env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
           vapp_id = @env[:machine].get_vapp_id
-          vm_name = @env[:machine].name
+          vm_name = cfg.name ? cfg.name.to_sym : @env[:machine].name
 
           # FIXME: why are we overriding this here ?
           #        It's already been taken care during the initial

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

@@ -43,7 +43,7 @@ module VagrantPlugins
           vapp_id = env[:machine].get_vapp_id
 
           @logger.debug('Getting VM info...')
-          vm_name = env[:machine].name
+          vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
           vm = cnx.get_vapp(vapp_id)
           vm_info = vm[:vms_hash][vm_name.to_sym]
 

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

@@ -42,7 +42,7 @@ module VagrantPlugins
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
           vapp_id = env[:machine].get_vapp_id
-          vm_name = env[:machine].name
+          vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
 
           @logger.debug('Getting vApp information...')
           vm = cnx.get_vapp(vapp_id)

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

@@ -19,7 +19,7 @@ module VagrantPlugins
             cfg = env[:machine].provider_config
             cnx = cfg.vcloud_cnx.driver
             vapp_id = env[:machine].get_vapp_id
-            vm_name = env[:machine].name
+            vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
 
             if env[:machine].id.nil?
               @logger.info("VM [#{vm_name}] is not created yet")

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

@@ -31,7 +31,7 @@ module VagrantPlugins
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
           vapp_id = env[:machine].get_vapp_id
-          vm_name = env[:machine].name
+          vm_name = cfg.name ? cfg.name.to_sym : env[:machine].name
 
           cfg.org = cnx.get_organization_by_name(cfg.org_name)
           cfg.vdc_network_id = cfg.org[:networks][cfg.vdc_network_name]

data/lib/vagrant-vcloud/config.rb

@@ -98,6 +98,10 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :vapp_prefix
 
+      # Name of the VM [optional]
+      #
+      # @return [String]
+      attr_accessor :name
 
       ##
       ## vCloud Director config runtime values

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

@@ -288,6 +288,9 @@ module VagrantPlugins
             # Create a new HTTP client
             clnt = HTTPClient.new
 
+            # Set SSL proto to TLSv1
+            clnt.ssl_config.ssl_version = :TLSv1
+
             # Disable SSL cert verification
             clnt.ssl_config.verify_mode = (OpenSSL::SSL::VERIFY_NONE)
 
@@ -401,6 +404,9 @@ module VagrantPlugins
             # Create a new HTTP client
             clnt = HTTPClient.new
 
+            # Set SSL proto to TLSv1
+            clnt.ssl_config.ssl_version = :TLSv1
+
             # Disable SSL cert verification
             clnt.ssl_config.verify_mode = (OpenSSL::SSL::VERIFY_NONE)
 

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

@@ -123,6 +123,9 @@ module VagrantPlugins
           # Create a new HTTP client
           clnt = HTTPClient.new
 
+          # Set SSL proto to TLSv1
+          clnt.ssl_config.ssl_version = :TLSv1
+
           # Disable SSL cert verification
           clnt.ssl_config.verify_mode = (OpenSSL::SSL::VERIFY_NONE)
 

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

@@ -734,7 +734,7 @@ module VagrantPlugins
             "VApp Task[operationName='vdcInstantiateVapp']"
           ).first
 
-          task_id = URI(task['href']).path.gsub("/api/task/", '')
+          task_id = URI(task['href']).path.gsub('/api/task/', '')
 
           { :vapp_id => vapp_id, :task_id => task_id }
         end
@@ -750,76 +750,76 @@ module VagrantPlugins
         # - network_config: hash of the network configuration for the vapp
         def compose_vapp_from_vm(vdc, vapp_name, vapp_description, vm_list = {}, network_config = {})
           builder = Nokogiri::XML::Builder.new do |xml|
-          xml.ComposeVAppParams(
-            'xmlns' => 'http://www.vmware.com/vcloud/v1.5',
-            'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
-            'name' => vapp_name,
-            'deploy' => 'false',
-            'powerOn' => 'false') {
-            xml.Description vapp_description
-            xml.InstantiationParams {
-              xml.NetworkConfigSection {
-                xml['ovf'].Info 'Configuration parameters for logical networks'
-                xml.NetworkConfig('networkName' => network_config[:name]) {
-                  xml.Configuration {
-                    if network_config[:fence_mode] != 'bridged'
-                      xml.IpScopes {
-                      xml.IpScope {
-                        xml.IsInherited(network_config[:is_inherited] || 'false')
-                        xml.Gateway network_config[:gateway]
-                        xml.Netmask network_config[:netmask]
-                        xml.Dns1 network_config[:dns1] if network_config[:dns1]
-                        xml.Dns2 network_config[:dns2] if network_config[:dns2]
-                        xml.DnsSuffix network_config[:dns_suffix] if network_config[:dns_suffix]
-                        xml.IpRanges {
-                          xml.IpRange {
-                            xml.StartAddress network_config[:start_address]
-                            xml.EndAddress network_config[:end_address]
+            xml.ComposeVAppParams(
+              'xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
+              'name' => vapp_name,
+              'deploy' => 'false',
+              'powerOn' => 'false') {
+              xml.Description vapp_description
+              xml.InstantiationParams {
+                xml.NetworkConfigSection {
+                  xml['ovf'].Info 'Configuration parameters for logical networks'
+                  xml.NetworkConfig('networkName' => network_config[:name]) {
+                    xml.Configuration {
+                      if network_config[:fence_mode] != 'bridged'
+                        xml.IpScopes {
+                        xml.IpScope {
+                          xml.IsInherited(network_config[:is_inherited] || 'false')
+                          xml.Gateway network_config[:gateway]
+                          xml.Netmask network_config[:netmask]
+                          xml.Dns1 network_config[:dns1] if network_config[:dns1]
+                          xml.Dns2 network_config[:dns2] if network_config[:dns2]
+                          xml.DnsSuffix network_config[:dns_suffix] if network_config[:dns_suffix]
+                          xml.IpRanges {
+                            xml.IpRange {
+                              xml.StartAddress network_config[:start_address]
+                              xml.EndAddress network_config[:end_address]
+                              }
                             }
                           }
                         }
-                      }
-                    end
-                    xml.ParentNetwork("href" => "#{@api_url}/network/#{network_config[:parent_network]}")
-                    xml.FenceMode network_config[:fence_mode]
-                    if network_config[:fence_mode] != 'bridged'
-                      xml.Features {
-                        xml.FirewallService {
-                          xml.IsEnabled(network_config[:enable_firewall] || "false")
-                        }
-                        xml.NatService {
-                          xml.IsEnabled "true"
-                          xml.NatType "portForwarding"
-                          xml.Policy(network_config[:nat_policy_type] || "allowTraffic")
+                      end
+                      xml.ParentNetwork("href" => "#{@api_url}/network/#{network_config[:parent_network]}")
+                      xml.FenceMode network_config[:fence_mode]
+                      if network_config[:fence_mode] != 'bridged'
+                        xml.Features {
+                          xml.FirewallService {
+                            xml.IsEnabled(network_config[:enable_firewall] || "false")
+                          }
+                          xml.NatService {
+                            xml.IsEnabled "true"
+                            xml.NatType "portForwarding"
+                            xml.Policy(network_config[:nat_policy_type] || "allowTraffic")
+                          }
                         }
-                      }
-                    end
+                      end
+                    }
                   }
                 }
               }
-            }
-            vm_list.each do |vm_name, vm_id|
-              xml.SourcedItem {
-                xml.Source('href' => "#{@api_url}/vAppTemplate/vm-#{vm_id}", 'name' => vm_name)
-                xml.InstantiationParams {
-                  xml.NetworkConnectionSection(
-                    'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
-                    'type' => 'application/vnd.vmware.vcloud.networkConnectionSection+xml',
-                    'href' => "#{@api_url}/vAppTemplate/vm-#{vm_id}/networkConnectionSection/") {
-                      xml['ovf'].Info 'Network config for sourced item'
-                      xml.PrimaryNetworkConnectionIndex '0'
-                      xml.NetworkConnection('network' => network_config[:name]) {
-                        xml.NetworkConnectionIndex '0'
-                        xml.IsConnected 'true'
-                        xml.IpAddressAllocationMode(network_config[:ip_allocation_mode] || 'POOL')
+              vm_list.each do |vm_name, vm_id|
+                xml.SourcedItem {
+                  xml.Source('href' => "#{@api_url}/vAppTemplate/vm-#{vm_id}", 'name' => vm_name)
+                  xml.InstantiationParams {
+                    xml.NetworkConnectionSection(
+                      'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
+                      'type' => 'application/vnd.vmware.vcloud.networkConnectionSection+xml',
+                      'href' => "#{@api_url}/vAppTemplate/vm-#{vm_id}/networkConnectionSection/") {
+                        xml['ovf'].Info 'Network config for sourced item'
+                        xml.PrimaryNetworkConnectionIndex '0'
+                        xml.NetworkConnection('network' => network_config[:name]) {
+                          xml.NetworkConnectionIndex '0'
+                          xml.IsConnected 'true'
+                          xml.IpAddressAllocationMode(network_config[:ip_allocation_mode] || 'POOL')
+                      }
                     }
                   }
+                  xml.NetworkAssignment('containerNetwork' => network_config[:name], 'innerNetwork' => network_config[:name])
                 }
-                xml.NetworkAssignment('containerNetwork' => network_config[:name], 'innerNetwork' => network_config[:name])
-              }
-            end
-            xml.AllEULAsAccepted 'true'
-          }
+              end
+              xml.AllEULAsAccepted 'true'
+            }
           end
 
           params = {

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,174 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.4.1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 description: Enables Vagrant to manage machines with VMware vCloud Director®.
@@ -187,8 +187,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -253,19 +253,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: VMware vCloud Director® provider
 test_files: []
-has_rdoc: