vagrant-vcloud 0.4.4 → 0.4.6

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

@@ -37,7 +37,7 @@ module VagrantPlugins
           @username = username
           @password = password
           @org_name = org_name
-          @api_version = '5.1'
+          @api_version = '5.5'
           @id = nil
 
           @cached_vapp_edge_public_ips = {}
@@ -571,7 +571,7 @@ module VagrantPlugins
         end
 
         ##
-        # Shutdown a given VM
+        # Poweroff a given VM
         # Using undeploy as a REAL powerOff
         # Only poweroff will put the VM into a partially powered off state.
         def poweroff_vm(vm_id)
@@ -595,6 +595,31 @@ module VagrantPlugins
           task_id
         end
 
+        ##
+        # Shutdown a given VM
+        # Using undeploy with shutdown, without VMware Tools this WILL FAIL.
+        #
+        def shutdown_vm(vm_id)
+          builder = Nokogiri::XML::Builder.new do |xml|
+            xml.UndeployVAppParams(
+            'xmlns' => 'http://www.vmware.com/vcloud/v1.5'
+          ) { xml.UndeployPowerAction 'shutdown' }
+          end
+
+          params = {
+            'method'  => :post,
+            'command' => "/vApp/vm-#{vm_id}/action/undeploy"
+          }
+
+          _response, headers = send_request(
+            params,
+            builder.to_xml,
+            'application/vnd.vmware.vcloud.undeployVAppParams+xml'
+          )
+          task_id = URI(headers['Location']).path.gsub('/api/task/', '')
+          task_id
+        end
+
         ##
         # Suspend a given VM
         def suspend_vm(vm_id)
@@ -688,7 +713,7 @@ module VagrantPlugins
             ).first[:href]).path.gsub('/api/task/', '')
 
           catalog_id = URI(response.css(
-              "AdminCatalog Link [type='application/vnd.vmware.vcloud.catalog+xml']"
+              "AdminCatalog Link[type='application/vnd.vmware.vcloud.catalog+xml']"
             ).first[:href]).path.gsub('/api/catalog/', '')
 
           { :task_id => task_id, :catalog_id => catalog_id }
@@ -748,74 +773,120 @@ module VagrantPlugins
         # - vapp_description: description of the target vapp
         # - vm_list: hash with IDs of the VMs used in the composing process
         # - network_config: hash of the network configuration for the vapp
-        def compose_vapp_from_vm(vdc, vapp_name, vapp_description, vm_list = {}, network_config = {})
+        def compose_vapp_from_vm(vdc, vapp_name, vapp_description, vm_list = {}, network_config = [], _cfg)
           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.ComposeVAppParams('xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                                  'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
+                                  'deploy' => 'false',
+                                  'powerOn' => 'false',
+                                  'name' => vapp_name) {
               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]
+                  network_config.each do |network|
+                    xml.NetworkConfig('networkName' => network[:name]) {
+                      xml.Configuration {
+                        if network[:fence_mode] != 'bridged'
+                          xml.IpScopes {
+                          xml.IpScope {
+                            xml.IsInherited(network[:is_inherited] || 'false')
+                            xml.Gateway network[:gateway]
+                            xml.Netmask network[:netmask]
+                            xml.Dns1 network[:dns1] if network[:dns1]
+                            xml.Dns2 network[:dns2] if network[:dns2]
+                            xml.DnsSuffix network[:dns_suffix] if network[:dns_suffix]
+                            xml.IpRanges {
+                              xml.IpRange {
+                                xml.StartAddress network[:start_address]
+                                xml.EndAddress network[: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[:parent_network]}") if network[:parent_network]
+                        xml.FenceMode network[:fence_mode]
+                        if network[:fence_mode] != 'bridged'
+                          xml.Features {
+                            if network[:dhcp_enabled] == 'true'
+                              xml.DhcpService {
+                                xml.IsEnabled "true"
+                                xml.DefaultLeaseTime "3600"
+                                xml.MaxLeaseTime "7200"
+                                xml.IpRange {
+                                  xml.StartAddress network[:dhcp_start]
+                                  xml.EndAddress network[:dhcp_end]
+                                }
+                              }
+                            end
+                            xml.FirewallService {
+                              xml.IsEnabled(network[:enable_firewall] || "false")
+                            }
+                            xml.NatService {
+                              xml.IsEnabled "true"
+                              xml.NatType "portForwarding"
+                              xml.Policy(network[:nat_policy_type] || "allowTraffic")
+                            }
                           }
-                        }
-                      end
+                        end
+                      }
                     }
-                  }
+                  end #networks
                 }
               }
               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')
+                    if _cfg.enable_guest_customization.nil? || _cfg.enable_guest_customization
+                      xml.GuestCustomizationSection(
+                        'xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                        'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1') {
+                          xml['ovf'].Info 'VM Guest Customization configuration'
+                          xml.Enabled true
+                          if _cfg.guest_customization_change_sid == true
+                            xml.ChangeSid true
+                            if _cfg.guest_customization_join_domain == true
+                              xml.JoinDomainEnabled true
+                              xml.DomainName _cfg.guest_customization_domain_name
+                              xml.DomainUserName _cfg.guest_customization_domain_user_name
+                              xml.DomainUserPassword _cfg.guest_customization_domain_user_password
+                              xml.MachineObjectOU _cfg.guest_customization_domain_ou if !_cfg.guest_customization_domain_ou.nil?
+                            end
+                          end
+                          if _cfg.guest_customization_admin_password_enabled
+                            xml.AdminPasswordEnabled true
+                            xml.AdminPasswordAuto true if _cfg.guest_customization_admin_password_auto
+                            xml.AdminPassword _cfg.guest_customization_admin_password if !_cfg.guest_customization_admin_password.nil?
+                            if _cfg.guest_customization_admin_auto_login == true
+                              xml.AdminAutoLogonEnabled true
+                              xml.AdminAutoLogonCount _cfg.guest_customization_admin_auto_login_count
+                            end
+                          else
+                            xml.AdminPasswordEnabled false
+                          end
+                          xml.ResetPasswordRequired _cfg.guest_customization_admin_password_reset if !_cfg.guest_customization_admin_password_reset.nil?
+                          xml.CustomizationScript{ xml.cdata(_cfg.guest_customization_script) } if !_cfg.guest_customization_script.nil?
+                          xml.ComputerName vm_name
                       }
-                    }
+                    end
+                    if _cfg.nics.nil? && network_config.length == 1
+                      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[0][:name]) {
+                            xml.NetworkConnectionIndex '0'
+                            xml.IsConnected 'true'
+                            xml.IpAddressAllocationMode(network_config[0][:ip_allocation_mode] || 'POOL')
+                        }
+                      }
+                    end
                   }
-                  xml.NetworkAssignment('containerNetwork' => network_config[:name], 'innerNetwork' => network_config[:name])
+                  xml.NetworkAssignment('containerNetwork' => network_config[0][:name], 'innerNetwork' => network_config[0][:name]) if _cfg.nics.nil? && network_config.length == 1
                 }
               end
               xml.AllEULAsAccepted 'true'
@@ -851,7 +922,7 @@ module VagrantPlugins
         # - vm_list: hash with IDs of the VMs to be used in the composing process
         # - network_config: hash of the network configuration for the vapp
 
-        def recompose_vapp_from_vm(vapp_id, vm_list = {}, network_config = {})
+        def recompose_vapp_from_vm(vapp_id, vm_list = {}, network_config = [], _cfg)
           original_vapp = get_vapp(vapp_id)
 
           builder = Nokogiri::XML::Builder.new do |xml|
@@ -862,23 +933,57 @@ module VagrantPlugins
             xml.Description original_vapp[:description]
             xml.InstantiationParams {}
             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.SourcedItem {
+                  xml.Source('href' => "#{@api_url}/vAppTemplate/vm-#{vm_id}", 'name' => vm_name)
+                  xml.InstantiationParams {
+                    if _cfg.enable_guest_customization.nil? || _cfg.enable_guest_customization
+                      xml.GuestCustomizationSection(
+                        'xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                        'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1') {
+                          xml['ovf'].Info 'VM Guest Customization configuration'
+                          xml.Enabled true
+                          if _cfg.guest_customization_change_sid == true
+                            xml.ChangeSid true
+                            if _cfg.guest_customization_join_domain == true
+                              xml.JoinDomainEnabled true
+                              xml.DomainName _cfg.guest_customization_domain_name
+                              xml.DomainUserName _cfg.guest_customization_domain_user_name
+                              xml.DomainUserPassword _cfg.guest_customization_domain_user_password
+                              xml.MachineObjectOU _cfg.guest_customization_domain_ou if !_cfg.guest_customization_domain_ou.nil?
+                            end
+                          end
+                          if _cfg.guest_customization_admin_password_enabled
+                            xml.AdminPasswordEnabled true
+                            xml.AdminPasswordAuto true if _cfg.guest_customization_admin_password_auto
+                            xml.AdminPassword _cfg.guest_customization_admin_password if !_cfg.guest_customization_admin_password.nil?
+                            if _cfg.guest_customization_admin_auto_login == true
+                              xml.AdminAutoLogonEnabled true
+                              xml.AdminAutoLogonCount _cfg.guest_customization_admin_auto_login_count
+                            end
+                          else
+                            xml.AdminPasswordEnabled false
+                          end
+                          xml.ResetPasswordRequired _cfg.guest_customization_admin_password_reset if !_cfg.guest_customization_admin_password_reset.nil?
+                          xml.CustomizationScript{ xml.cdata(_cfg.guest_customization_script) } if !_cfg.guest_customization_script.nil?
+                          xml.ComputerName vm_name
+                      }
+                    end
+                    if _cfg.nics.nil? && network_config.length == 1
+                      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[0][:name]) {
+                            xml.NetworkConnectionIndex '0'
+                            xml.IsConnected 'true'
+                            xml.IpAddressAllocationMode(network_config[0][:ip_allocation_mode] || 'POOL')
+                        }
+                      }
+                    end
                   }
-                }
-                xml.NetworkAssignment('containerNetwork' => network_config[:name], 'innerNetwork' => network_config[:name])
+                  xml.NetworkAssignment('containerNetwork' => network_config[0][:name], 'innerNetwork' => network_config[0][:name]) if _cfg.nics.nil? && network_config.length == 1
               }
             end
             xml.AllEULAsAccepted 'true'
@@ -1011,42 +1116,27 @@ module VagrantPlugins
         #     :vm_scoped_local_id   => value[:vapp_scoped_local_id]
         #   }
 
-        def add_vapp_port_forwarding_rules(vapp_id, network_name, config = {})
-          builder = Nokogiri::XML::Builder.new do |xml|
-            xml.NetworkConfigSection(
-              'xmlns' => 'http://www.vmware.com/vcloud/v1.5',
-              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1') {
-              xml['ovf'].Info 'Network configuration'
-              xml.NetworkConfig('networkName' => network_name) {
-                xml.Configuration {
-                  xml.ParentNetwork('href' => "#{@api_url}/network/#{config[:parent_network]}")
-                  xml.FenceMode(config[:fence_mode] || 'isolated')
-                  xml.Features {
-                    xml.NatService {
-                      xml.IsEnabled 'true'
-                      xml.NatType 'portForwarding'
-                      xml.Policy(config[:nat_policy_type] || 'allowTraffic')
-
-                      pre_existing = get_vapp_port_forwarding_rules(vapp_id)
-
-                      config[:nat_rules].concat(pre_existing)
-
-                      config[:nat_rules].each do |nat_rule|
-                        xml.NatRule {
-                          xml.VmRule {
-                            xml.ExternalPort nat_rule[:nat_external_port]
-                            xml.VAppScopedVmId nat_rule[:vapp_scoped_local_id]
-                            xml.VmNicId(nat_rule[:nat_vmnic_id] || '0')
-                            xml.InternalPort nat_rule[:nat_internal_port]
-                            xml.Protocol(nat_rule[:nat_protocol] || 'TCP')
-                          }
-                        }
-                      end
-                    }
-                  }
-                }
-              }
-            }
+        def add_vapp_port_forwarding_rules(vapp_id, network_name, edge_network_name, config = {})
+          params = {
+            'method'  => :get,
+            'command' => "/vApp/vapp-#{vapp_id}/networkConfigSection"
+          }
+          response, _headers = send_request(params)
+
+          nat_svc = response.css("/NetworkConfigSection/NetworkConfig[networkName='#{network_name}']/Configuration/Features/NatService").first
+
+          config[:nat_rules].each do |nr|
+            nat_svc << (
+              "<NatRule>" +
+                "<VmRule>" +
+                  "<ExternalPort>#{nr[:nat_external_port]}</ExternalPort>" +
+                  "<VAppScopedVmId>#{nr[:vapp_scoped_local_id]}</VAppScopedVmId>" +
+                  "<VmNicId>#{nr[:nat_vmnic_id]}</VmNicId>" +
+                  "<InternalPort>#{nr[:nat_internal_port]}</InternalPort>" +
+                  "<Protocol>#{nr[:nat_protocol]}</Protocol>" +
+                "</VmRule>" +
+              "</NatRule>"
+            )
           end
 
           params = {
@@ -1056,7 +1146,7 @@ module VagrantPlugins
 
           _response, headers = send_request(
             params,
-            builder.to_xml,
+            response.to_xml,
             'application/vnd.vmware.vcloud.networkConfigSection+xml'
           )
 
@@ -1067,7 +1157,7 @@ module VagrantPlugins
         # Get vApp port forwarding rules
         #
         # - vapp_id: id of the vApp
-        def get_vapp_port_forwarding_rules(vapp_id)
+        def get_vapp_port_forwarding_rules(vapp_id, network_name=nil)
           params = {
             'method'  => :get,
             'command' => "/vApp/vapp-#{vapp_id}/networkConfigSection"
@@ -1077,9 +1167,22 @@ module VagrantPlugins
 
           # FIXME: this will return nil if the vApp uses multiple vApp Networks
           # with Edge devices in natRouted/portForwarding mode.
-          config = response.css(
-            'NetworkConfigSection/NetworkConfig/Configuration'
+          nconfig = response.css(
+            'NetworkConfigSection/NetworkConfig'
           )
+          config = nil
+          if nconfig.size > 1
+            nconfig.each {|c|
+              pn = c.css('/Configuration/ParentNetwork')
+              next if pn.size == 0
+              if pn.first['name'] == network_name
+                config = c.css('/Configuration')
+                break
+              end
+            }
+          else
+            config = nconfig.css('/Configuration')
+          end
           fence_mode = config.css('/FenceMode').text
           nat_type = config.css('/Features/NatService/NatType').text
 
@@ -1494,8 +1597,8 @@ module VagrantPlugins
         # - NatType" is set to "portForwarding
         # This will be required to know how to connect to VMs behind the Edge
         # device.
-        def get_vapp_edge_public_ip(vapp_id)
-          return @cached_vapp_edge_public_ips[vapp_id] unless @cached_vapp_edge_public_ips[vapp_id].nil?
+        def get_vapp_edge_public_ip(vapp_id, network_name=nil)
+          return @cached_vapp_edge_public_ips["#{vapp_id}#{network_name}"] unless @cached_vapp_edge_public_ips["#{vapp_id}#{network_name}"].nil?
 
           # Check the network configuration section
           params = {
@@ -1507,9 +1610,22 @@ module VagrantPlugins
 
           # FIXME: this will return nil if the vApp uses multiple vApp Networks
           # with Edge devices in natRouted/portForwarding mode.
-          config = response.css(
-            'NetworkConfigSection/NetworkConfig/Configuration'
+          nconfig = response.css(
+            'NetworkConfigSection/NetworkConfig'
           )
+          config = nil
+          if nconfig.size > 1
+            nconfig.each {|c|
+              pn = c.css('/Configuration/ParentNetwork')
+              next if pn.size == 0
+              if pn.first['name'] == network_name
+                config = c.css('/Configuration')
+                break
+              end
+            }
+          else
+            config = nconfig.css('/Configuration')
+          end
 
           fence_mode = config.css('/FenceMode').text
           nat_type = config.css('/Features/NatService/NatType').text
@@ -1530,7 +1646,7 @@ module VagrantPlugins
           if edge_ip == ''
             return nil
           else
-            @cached_vapp_edge_public_ips[vapp_id] = edge_ip
+            @cached_vapp_edge_public_ips["#{vapp_id}#{network_name}"] = edge_ip
             return edge_ip
           end
         end
@@ -1582,7 +1698,7 @@ module VagrantPlugins
 
           @logger.debug("Getting vAppTemplate ID: #{vapp_template}")
           descriptor_upload = URI(response.css(
-            "Files Link [rel='upload:default']"
+            "Files Link[rel='upload:default']"
           ).first[:href]).path.gsub('/transfer/', '')
           transfer_guid = descriptor_upload.gsub('/descriptor.ovf', '')
 
@@ -1623,7 +1739,7 @@ module VagrantPlugins
             while true
               response, _headers = send_request(params)
               @logger.debug('Request...')
-              break unless response.css("Files Link [rel='upload:default']").count == 1
+              break unless response.css("Files Link[rel='upload:default']").count == 1
               sleep 1
             end
 
@@ -1645,7 +1761,7 @@ module VagrantPlugins
             }
             response, _headers = send_request(params)
             response.css(
-              "Files File [bytesTransferred='0'] Link [rel='upload:default']"
+              "Files File[bytesTransferred='0'] Link[rel='upload:default']"
             ).each do |file|
               file_name = URI(file[:href]).path.gsub("/transfer/#{transfer_guid}/", '')
               upload_filename = "#{ovf_dir}/#{file_name}"
@@ -1700,7 +1816,7 @@ module VagrantPlugins
 
             # Cancel Task
             cancel_hook = URI(response.css(
-              "Tasks Task Link [rel='task:cancel']"
+              "Tasks Task Link[rel='task:cancel']"
             ).first[:href]).path.gsub('/api', '')
 
             params = {
@@ -1838,6 +1954,41 @@ module VagrantPlugins
           task_id
         end
 
+        ##
+        # Set VM Network Connection state
+        def set_vm_network_connected(vm_id)
+          params = {
+            'method'  => :get,
+            'command' => "/vApp/vm-#{vm_id}/networkConnectionSection"
+          }
+          response, _headers = send_request(params)
+
+          changed = false
+          response.css('NetworkConnection').each do |net|
+            ic = net.css('IsConnected')
+            if ic.text != 'true'
+              ic.first.content = 'true'
+              changed = true
+            end
+          end
+
+          if changed
+            params = {
+              'method'  => :put,
+              'command' => "/vApp/vm-#{vm_id}/networkConnectionSection"
+            }
+
+            _response, headers = send_request(
+              params,
+              response.to_xml,
+              'application/vnd.vmware.vcloud.networkConnectionSection+xml'
+            )
+
+            task_id = URI(headers['Location']).path.gsub('/api/task/', '')
+          end
+          task_id
+        end
+
         ##
         # Set VM Guest Customization Config
         def set_vm_guest_customization(vm_id, computer_name, config = {})
@@ -1869,6 +2020,13 @@ module VagrantPlugins
 
         # Enable VM Nested Hardware-Assisted Virtualization
         def set_vm_nested_hypervisor(vm_id, enable)
+          vm = get_vm(vm_id)
+          if enable && vm[:hypervisor_enabled] == 'true'
+            return nil
+          elsif !enable && vm[:hypervisor_enabled] == 'false'
+            return nil
+          end
+
           action = enable ? "enable" : "disable"
           params = {
             'method'  => :post,
@@ -1890,10 +2048,19 @@ module VagrantPlugins
           }
 
           changed = false
+          instance_id = -1
+          hdd_address_on_parent = -1
+          hdd_parent_id = nil
+          hdd_bus_type = nil
+          hdd_bus_sub_type = nil
+          hdd_count = 0
+          nic_count = 0
+          nic_address_on_parent = -1
           response, _headers = send_request(params)
 
           response.css('ovf|Item').each do |item|
             type = item.css('rasd|ResourceType').first
+            instance_id = [ instance_id, item.css('rasd|InstanceID').first.text.to_i ].max
             if type.content == '3'
               # cpus
               if cfg.cpus
@@ -1912,7 +2079,127 @@ module VagrantPlugins
                   changed = true
                 end
               end
-            end 
+            elsif type.content == '10'
+              # network card
+              nic_address_on_parent = nic_address_on_parent + 1
+              # nic_address_on_parent = [ nic_address_on_parent, item.css('rasd|AddressOnParent').first.text.to_i ].max
+              next if !cfg.nics || nic_count == cfg.nics.length
+              nic = cfg.nics[nic_count]
+
+              orig_mac = item.css('rasd|Address').first.text
+              orig_ip = item.css('rasd|Connection').first['vcloud:ipAddress']
+              orig_address_mode = item.css('rasd|Connection').first['vcloud:ipAddressingMode']
+              orig_primary = item.css('rasd|Connection').first['vcloud:primaryNetworkConnection']
+              orig_network = item.css('rasd|Connection').first.text
+              orig_parent = item.css('rasd|AddressOnParent').first.text
+              # resourceSubType cannot be changed for an existing network card
+
+              if !nic[:mac].nil?
+                changed = true if nic[:mac].upcase != orig_mac.upcase
+              end
+              if !nic[:ip].nil?
+                changed = true if orig_ip.nil? || nic[:ip].upcase != orig_ip.upcase
+              end
+              changed = true if nic[:ip_mode].upcase != orig_address_mode.upcase
+              changed = true if nic[:primary] != orig_primary
+              changed = true if nic[:network].upcase != orig_network.upcase
+              changed = true if nic_address_on_parent != orig_parent
+
+              if changed
+                item.css('rasd|Address').first.content = nic[:mac] if !nic[:mac].nil?
+                item.css('rasd|AddressOnParent').first.content = nic_address_on_parent if nic_address_on_parent != orig_parent
+                conn = item.css('rasd|Connection').first
+                conn.content = nic[:network]
+                if nic[:ip_mode].upcase == 'DHCP'
+                  conn['vcloud:ipAddressingMode'] = 'DHCP'
+                elsif nic[:ip_mode].upcase == 'STATIC'
+                  conn['vcloud:ipAddressingMode'] = 'MANUAL'
+                  conn['vcloud:ipAddress'] = nic[:ip]
+                elsif nic[:ip_mode].upcase == 'POOL'
+                  conn['vcloud:ipAddressingMode'] = 'POOL'
+                  conn['vcloud:ipAddress'] = nic[:ip] if !nic[:ip].nil?
+                end
+                conn['vcloud:primaryNetworkConnection'] = nic[:primary]
+              end
+              nic_count = nic_count + 1
+            elsif type.content == '17'
+              # hard disk
+              hdd_count = hdd_count + 1
+              if hdd_parent_id.nil?
+                hdd_parent_id = item.css('rasd|Parent').first.text
+                hdd_bus_type = item.css('rasd|HostResource').first[:busType]
+                hdd_bus_sub_type = item.css('rasd|HostResource').first[:busSubType]
+              end
+              if hdd_parent_id == item.css('rasd|Parent').first.text
+                hdd_address_on_parent = [ hdd_address_on_parent,  item.css('rasd|AddressOnParent').first.text.to_i ].max
+              end
+            end
+          end
+
+          if cfg.add_hdds
+            changed = true
+            cfg.add_hdds.each do |hdd_size|
+              hdd_address_on_parent = hdd_address_on_parent + 1
+              instance_id = instance_id + 1
+              newhdd = Nokogiri::XML::Builder.new do |xml|
+                xml.root('xmlns:rasd' => 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData',
+                         'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1') do
+                  xml['ovf'].Item {
+                    xml['rasd'].AddressOnParent(hdd_address_on_parent)
+                    xml['rasd'].Description("Hard disk")
+                    xml['rasd'].ElementName("Hard disk #{hdd_address_on_parent+1}")
+                    xml['rasd'].HostResource()
+                    xml['rasd'].InstanceID(instance_id)
+                    xml['rasd'].Parent(hdd_parent_id)
+                    xml['rasd'].ResourceType(17)
+                  }
+                end
+              end
+              hr = newhdd.doc.css('rasd|HostResource').first
+              hr['xmlns:vcloud'] = 'http://www.vmware.com/vcloud/v1.5'
+              hr['vcloud:busSubType'] = hdd_bus_sub_type
+              hr['vcloud:busType'] = hdd_bus_type
+              hr['vcloud:capacity'] = hdd_size
+              response.css('ovf|Item').last.add_next_sibling(newhdd.doc.css('ovf|Item'))
+            end
+          end
+
+          if cfg.nics
+            cfg.nics.each_with_index do |nic, i|
+              next if i < nic_count
+              changed = true
+              nic_address_on_parent = nic_address_on_parent + 1
+              instance_id = instance_id + 1
+              newnic = Nokogiri::XML::Builder.new do |xml|
+                xml.root('xmlns:rasd' => 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData',
+                         'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1') do
+                  xml['ovf'].Item {
+                    xml['rasd'].Address(nic[:mac]) if !nic[:mac].nil?
+                    xml['rasd'].AddressOnParent(nic_address_on_parent)
+                    xml['rasd'].AutomaticAllocation(true)
+                    xml['rasd'].Connection(nic[:network])
+                    xml['rasd'].Description("#{nic[:type] || :vmxnet3} ethernet adapter")
+                    xml['rasd'].ElementName("Network adapter #{nic_count}")
+                    xml['rasd'].InstanceID(instance_id)
+                    xml['rasd'].ResourceSubType(nic[:type] || :vmxnet3)
+                    xml['rasd'].ResourceType(10)
+                  }
+                end
+              end
+              conn = newnic.doc.css('rasd|Connection').first
+              conn['xmlns:vcloud'] = 'http://www.vmware.com/vcloud/v1.5'
+              if nic[:ip_mode].upcase == 'DHCP'
+                conn['vcloud:ipAddressingMode'] = 'DHCP'
+              elsif nic[:ip_mode].upcase == 'STATIC'
+                conn['vcloud:ipAddressingMode'] = 'MANUAL'
+                conn['vcloud:ipAddress'] = nic[:ip]
+              elsif nic[:ip_mode].upcase == 'POOL'
+                conn['vcloud:ipAddressingMode'] = 'POOL'
+                conn['vcloud:ipAddress'] = nic[:ip] if !nic[:ip].nil?
+              end
+              conn['vcloud:primaryNetworkConnection'] = nic[:primary]
+              response.css('ovf|Item').last.add_next_sibling(newnic.doc.css('ovf|Item'))
+            end
           end
 
           if changed
@@ -1935,6 +2222,63 @@ module VagrantPlugins
         end
 
 
+        ##
+        # Add metadata
+        def set_vapp_metadata(id, data)
+          task_id = set_metadata "vApp/vapp-#{id}", data
+          task_id
+        end
+
+
+        ##
+        # Add metadata
+        def set_vm_metadata(id, data)
+          task_id = set_metadata "vApp/vm-#{id}", data
+          task_id
+        end
+
+
+        ##
+        # Add metadata
+        def set_metadata(link, data)
+          params = {
+            'method'  => :post,
+            'command' => "/#{link}/metadata"
+          }
+
+          md = Nokogiri::XML::Builder.new do |xml|
+            xml.Metadata('xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                         'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                         'type' => 'application/vnd.vmware.vcloud.metadata+xml') do
+              data.each do |d|
+                xml.MetadataEntry('type' => 'application/vnd.vmware.vcloud.metadata.value+xml') {
+                  xml.Key(d[0])
+                  if d[1].kind_of?(Integer)
+                    typ = 'MetadataNumberValue'
+                  elsif !!d[1] == d[1] # boolean
+                    typ = 'MetadataBooleanValue'
+                  else
+                    typ = 'MetadataStringValue'
+                  end
+                  xml.TypedValue('xsi:type' => typ) {
+                    xml.Value(d[1])
+                  }
+                }
+              end
+            end
+          end
+
+          _response, headers = send_request(
+            params,
+            md.to_xml,
+            'application/vnd.vmware.vcloud.metadata+xml'
+          )
+
+          task_id = URI(headers['Location']).path.gsub('/api/task/', '')
+          task_id
+
+        end
+
         ##
         # Fetch details about a given VM
         def get_vm(vm_id)
@@ -1945,58 +2289,46 @@ module VagrantPlugins
 
           response, _headers = send_request(params)
 
-          os_desc = response.css(
-            'ovf|OperatingSystemSection ovf|Description'
-          ).first.text
+          hypervisor_enabled = response[:nestedHypervisorEnabled]
+          os_desc = response.css('ovf|OperatingSystemSection ovf|Description').first.text
 
           networks = {}
+          primary_network = response.css('PrimaryNetworkConnectionIndex').first.text.to_i
           response.css('NetworkConnection').each do |network|
             ip = network.css('IpAddress').first
             ip = ip.text if ip
+            primary = false
+            primary = true if network.css('NetworkConnectionIndex').first.text.to_i == primary_network
 
             networks[network['network']] = {
-              :index              => network.css(
-                                     'NetworkConnectionIndex'
-                                     ).first.text,
+              :primary            => primary,
+              :index              => network.css('NetworkConnectionIndex').first.text,
               :ip                 => ip,
-              :is_connected       => network.css(
-                                     'IsConnected'
-                                     ).first.text,
-              :mac_address        => network.css(
-                                     'MACAddress'
-                                     ).first.text,
-              :ip_allocation_mode => network.css(
-                                     'IpAddressAllocationMode'
-                                     ).first.text
+              :is_connected       => network.css('IsConnected').first.text,
+              :mac_address        => network.css('MACAddress').first.text,
+              :ip_allocation_mode => network.css('IpAddressAllocationMode').first.text
             }
           end
 
-          admin_password = response.css(
-            'GuestCustomizationSection AdminPassword'
-          ).first
+          admin_password = response.css('GuestCustomizationSection AdminPassword').first
           admin_password = admin_password.text if admin_password
 
           # make the lines shorter by adjusting the nokogiri css namespace
           guest_css = response.css('GuestCustomizationSection')
           guest_customizations = {
             :enabled                => guest_css.css('Enabled').first.text,
-            :admin_passwd_enabled   => guest_css.css(
-                                       'AdminPasswordEnabled'
-                                       ).first.text,
-            :admin_passwd_auto      => guest_css.css(
-                                       'AdminPasswordAuto'
-                                       ).first.text,
+            :admin_passwd_enabled   => guest_css.css('AdminPasswordEnabled').first.text,
+            :admin_passwd_auto      => guest_css.css('AdminPasswordAuto').first.text,
             :admin_passwd           => admin_password,
-            :reset_passwd_required  => guest_css.css(
-                                       'ResetPasswordRequired'
-                                       ).first.text,
+            :reset_passwd_required  => guest_css.css('ResetPasswordRequired').first.text,
             :computer_name          => guest_css.css('ComputerName').first.text
           }
 
           {
             :os_desc              => os_desc,
             :networks             => networks,
-            :guest_customizations => guest_customizations
+            :guest_customizations => guest_customizations,
+            :hypervisor_enabled   => hypervisor_enabled
           }
         end
       end # Class Version 5.1