vagrant-vcloud 0.4.4 → 0.4.6

data/lib/vagrant-vcloud/errors.rb

@@ -27,6 +27,12 @@ module VagrantPlugins
       class ComposeVAppError < VCloudError
         error_key(:compose_vapp_error)
       end
+      class ModifyVAppError < VCloudError
+        error_key(:modify_vapp_error)
+      end
+      class PoweronVAppError < VCloudError
+        error_key(:poweron_vapp_error)
+      end
       class InvalidNetSpecification < VCloudError
         error_key(:invalid_network_specification)
       end

data/lib/vagrant-vcloud/model/forwarded_port.rb

@@ -39,10 +39,33 @@ module VagrantPlugins
         # @return [Integer]
         attr_reader :host_port
 
-        def initialize(id, host_port, guest_port, options)
-          @id         = id
-          @guest_port = guest_port
-          @host_port  = host_port
+        # The network name to forward from.
+        #
+        # @return [String]
+        attr_reader :network_name
+
+        # The network name to forward to.
+        #
+        # @return [String]
+        attr_reader :edge_network_name
+
+        # The id of the parent network.
+        #
+        # @return [String]
+        attr_reader :edge_network_id
+
+        # The id of the vm nic.
+        #
+        # @return [Integer]
+        attr_reader :vmnic_id
+
+        def initialize(id, host_port, guest_port, network_name, edge_network_id, edge_network_name, options)
+          @id                = id
+          @guest_port        = guest_port
+          @host_port         = host_port
+          @network_name      = network_name
+          @edge_network_id    = edge_network_id
+          @edge_network_name = edge_network_name
 
           options ||= {}
           @auto_correct = false
@@ -52,6 +75,7 @@ module VagrantPlugins
           @guest_ip = options[:guest_ip] || nil
           @host_ip = options[:host_ip] || nil
           @protocol = options[:protocol] || 'tcp'
+          @vmnic_id = options[:vmnic_id] || 0
         end
 
         # This corrects the host port and changes it to the given new port.

data/lib/vagrant-vcloud/util/compile_forwarded_ports.rb

@@ -8,10 +8,10 @@ module VagrantPlugins
 
         # This method compiles the forwarded ports into {ForwardedPort}
         # models.
-        def compile_forwarded_ports(config)
+        def compile_forwarded_ports(machine)
           mappings = {}
 
-          config.vm.networks.each do |type, options|
+          machine.config.vm.networks.each do |type, options|
             if type == :forwarded_port
               guest_port = options[:guest]
               host_port  = options[:host]
@@ -21,8 +21,49 @@ module VagrantPlugins
               # skip forwarded rules already found in handle_nat_port_collisions
               next if options[:already_exists]
 
+              # skip forwarded rules if disabled
+              next if !options[:disabled].nil? && options[:disabled] == true
+
               mappings[host_port] =
-                Model::ForwardedPort.new(id, host_port, guest_port, options)
+                Model::ForwardedPort.new(id, host_port, guest_port, 'Vagrant-vApp-Net', machine.provider_config.vdc_network_id, machine.provider_config.vdc_network_name, options)
+            end
+          end
+          if !machine.provider_config.nics.nil?
+            machine.provider_config.nics.each do |nic|
+              next if nic[:forwarded_port].nil?
+              nic[:forwarded_port].each do |fp|
+                options = fp
+
+                guest_port = options[:guest]
+                host_port  = options[:host]
+                options    = scoped_hash_override(options, :vcloud)
+                id         = options[:id]
+
+                # skip forwarded rules already found in handle_nat_port_collisions
+                next if options[:already_exists]
+
+                # skip forwarded rules if disabled
+                next if !options[:disabled].nil? && options[:disabled] == true
+
+                # find matching network
+                edge_id = nil
+                edge_name = nil
+                if !machine.provider_config.networks.nil? && !machine.provider_config.networks[:vapp].nil?
+                  machine.provider_config.networks[:vapp].each do |net|
+                    next if net[:name] != nic[:network]
+                    edge_id = net[:parent_network]
+                    edge_name = net[:vdc_network_name]
+                    break
+                  end
+                end
+                if edge_id == nil || edge_name == nil
+                  edge_id = machine.provider_config.vdc_network_id
+                  edge_name = machine.provider_config.vdc_network_name
+                end
+
+                mappings[host_port] = Model::ForwardedPort.new(id, host_port, guest_port, nic[:network], edge_id, edge_name, options)
+
+              end
             end
           end
 

data/lib/vagrant-vcloud/version.rb

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

data/locales/en.yml

@@ -24,6 +24,7 @@ en:
       template: "Configuration must specify a template name"
       username: "Configuration must specify a vCloud Director username"
       vdc_name: "Configuration must specify a vCloud Director Virtual Datacenter (Target Organization VDC)"
+      vdc_network_name: "Configuration must specify a vCloud Director vDC network name"
     errors:
       missing_compute_resource: "Configured compute resource not found"
       missing_datacenter: "Configured data center not found"
@@ -35,6 +36,8 @@ en:
       invalid_network_specification: "Wrong Network specification in the Vagrantfile, make sure you have access to the specified network."
       stop_vapp_error: "Impossible to stop vApp, could be a transient error, please try again, error: %{message}"
       compose_vapp_error: "Impossible to compose a vApp, error: %{message}"
+      modify_vapp_error: "Unable to modify vApp, error: %{message}"
+      poweron_vapp_error: "Unable to power on vApp, error: %{message}"
       forward_port_collision: "Port collision detected, change it in the Vagrantfile or add auto_correct: true. %{guest_port} => %{host_port}"
       rest_errors:
         object_not_found: "Object not found in vCloud Director"
@@ -59,7 +62,17 @@ en:
 
         Host path: %{hostpath}
         Error: %{err}
-
+    gc:
+      admin_password: "Guest customization must be enabled to generate/specify password"
+      admin_password_gs: "Admin assword must be auto generated or secified"
+      admin_password_reset: "Guest customization must be enabled to require password reset"
+      auto_login: "Allow admin password is required to enable auto login"
+      auto_login_count: "Auto login count must be between 1 and 100"
+      auto_login_count_req: "Auto login count is required, if auto login is enabled"
+      change_sid: "Guest customization must be enabled to change the SID"
+      domain: "Change SID mst be enabled to join to a domain"
+      domain_join: "Joining a domain requires domain name, domain user, and domain password"
+      script: "Guest customization must be enabled to run a script"
     states:
       not_created: |-
         The environment has not yet been created. Run `vagrant up` to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -223,6 +223,7 @@ files:
 - lib/vagrant-vcloud/action/read_ssh_info.rb
 - lib/vagrant-vcloud/action/read_state.rb
 - lib/vagrant-vcloud/action/resume.rb
+- lib/vagrant-vcloud/action/shut_down.rb
 - lib/vagrant-vcloud/action/suspend.rb
 - lib/vagrant-vcloud/action/sync_folders.rb
 - lib/vagrant-vcloud/action/unmap_port_forwardings.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: VMware vCloud Director® provider