vagrant-vcloud 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9481686204d161ed6766034bed50ba9e5591dbca
-  data.tar.gz: 19946c9cd8111f6e375c61b15b68ca38fdb7187f
+  metadata.gz: ffdaef92decaf313b306add8bc6f4809fd96aa10
+  data.tar.gz: 7a92c5b464e12b4c1a00b0d61288eb1967f23e61
 SHA512:
-  metadata.gz: ce9057ebddf373a0df383f07cba284c2cd67ec4943eb858f7a583c5cbbd39ccc0005905647b80c6e2aae8f1255db71ebf99774b553a9a6f7c4b35a83df9bd547
-  data.tar.gz: 284e9b7bd5a7f095d2aeaec1ddf78e3a933a8ad39f5b993c8dd89ce69d368fe0a437aaa393b637346b01ac6f3e59c419c34b34e1ba25ecbc73bbb954017e9de5
+  metadata.gz: 8823a60a23a6426b230abc79d99e2765f29a1bb173a135aa7a85a684288c4b91c844d2db340cfedb0c9913723972c86719610098af67985b631e8cf0f3771b4b
+  data.tar.gz: cf31bea829c6972bfcf5ef88b50333cec048bf9b50931f8576306b31fed4fd1ab320a2c482c54771332042e7856fdcca16c6d692fa90d5a3455b5316b97e7b4d

data/README.md

@@ -1,13 +1,24 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
 =============
 
-[Version 0.2.2](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.2.2) has been released!
+[Version 0.3.0](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.3.0) has been released!
 -------------
 
 Please note that this software is still Alpha/Beta quality and is not recommended for production usage.
 
 Right now a [Precise32](http://vagrant.tsugliani.fr/precise32.box) is available for use, or you can roll your own as you please, make sure to install VMware tools in it.
 
+Features of Version 0.3.0 are:
+
+A substantial release, major kudos to Stefan Scherer who submitted some substantious PRs!
+
+- Added support for port mapping at the Organization Edge Gateway.
+- Added a new configuration options ```vapp_prefix``` to change vApp prefix (defaults to Vagrant).
+- Improved vcloud-status command.
+- Fixed cygdrive path for rsync on Windows.
+- Fixed Issue #33 - Error removing/creating NAT rules on second vagrant up.
+- Fixed Issue #43 - Destroy fails if VMs are halted.
+
 Features of Version 0.2.2 are:
 
 - Fixed Issue #32 - Port Forwarding rules are deleted when Halting a VM.
@@ -94,6 +105,8 @@ Vagrant.configure("2") do |config|
 
   # vCloud Director provider settings
   config.vm.provider :vcloud do |vcloud|
+    vcloud.vapp_prefix = "multibox-sample"
+
     vcloud.hostname = "https://my.cloudprovider.com"
     vcloud.username = "MyUserName"
     vcloud.password = "MySup3rS3cr3tPassw0rd!"

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

@@ -111,9 +111,14 @@ module VagrantPlugins
           if env[:machine].get_vapp_id.nil?
             env[:ui].info('Building vApp...')
 
+            vapp_prefix = cfg.vapp_prefix
+            if vapp_prefix.nil?
+              vapp_prefix = "Vagrant"
+            end
+
             compose = cnx.compose_vapp_from_vm(
               cfg.vdc_id,
-              "Vagrant-#{Etc.getlogin}-#{Socket.gethostname.downcase}-" +
+              "#{vapp_prefix}-#{Etc.getlogin}-#{Socket.gethostname.downcase}-" +
               "#{SecureRandom.hex(4)}",
               "vApp created by #{Etc.getlogin} running on " +
               "#{Socket.gethostname.downcase} using vagrant-vcloud on " +

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

@@ -0,0 +1,54 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class DestroyVApp
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::destroy_vapp')
+        end
+
+        def call(env)
+          cfg = env[:machine].provider_config
+          cnx = cfg.vcloud_cnx.driver
+          vapp_id = env[:machine].get_vapp_id
+
+          cfg.org = cnx.get_organization_by_name(cfg.org_name)
+          cfg.vdc_id = cnx.get_vdc_id_by_name(cfg.org, cfg.vdc_name)
+
+          test_vapp = cnx.get_vapp(vapp_id)
+
+          @logger.debug(
+            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
+          )
+
+          if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
+            env[:ui].info(
+              "Removing NAT rules on [#{cfg.vdc_edge_gateway}] " +
+              "for IP [#{cfg.vdc_edge_gateway_ip}]."
+            )
+            @logger.debug(
+              "Deleting Edge Gateway rules - vdc id: #{cfg.vdc_id}"
+            )
+            edge_remove = cnx.remove_edge_gateway_rules(
+              cfg.vdc_edge_gateway,
+              cfg.vdc_id,
+              cfg.vdc_edge_gateway_ip,
+              vapp_id
+            )
+            cnx.wait_task_completion(edge_remove)
+          end
+
+          env[:ui].info('Destroying vApp...')
+          vapp_delete_task = cnx.delete_vapp(vapp_id)
+          @logger.debug("vApp Delete task id #{vapp_delete_task}")
+          cnx.wait_task_completion(vapp_delete_task)
+
+          env[:machine].id = nil
+          env[:machine].vappid = nil
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class DestroyVM
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::destroy_vm')
+        end
+
+        def call(env)
+          cfg = env[:machine].provider_config
+          cnx = cfg.vcloud_cnx.driver
+          vapp_id = env[:machine].get_vapp_id
+          vm_id = env[:machine].id
+
+          cfg.org = cnx.get_organization_by_name(cfg.org_name)
+          cfg.vdc_id = cnx.get_vdc_id_by_name(cfg.org, cfg.vdc_name)
+
+          test_vapp = cnx.get_vapp(vapp_id)
+
+          @logger.debug(
+            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
+          )
+
+          env[:ui].info('Destroying VM...')
+          vm_delete_task = cnx.delete_vm(vm_id)
+          @logger.debug("VM Delete task id #{vm_delete_task}")
+          cnx.wait_task_completion(vm_delete_task)
+
+          env[:machine].id = nil
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,7 @@ module VagrantPlugins
 
         def forward_ports
           ports = []
+          edge_ports = []
 
           cfg = @env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
@@ -42,12 +43,6 @@ module VagrantPlugins
           vm_info = vm[:vms_hash][vm_name.to_sym]
 
           @env[:forwarded_ports].each do |fp|
-            # FIXME: Useless variable assignement 'message_attributes'
-            # (tsugliani)
-            message_attributes = {
-              :guest_port   => fp.guest_port,
-              :host_port    => fp.host_port
-            }
 
             @env[:ui].info(
               "Forwarding Ports: VM port #{fp.guest_port} -> " +
@@ -64,6 +59,8 @@ module VagrantPlugins
               :nat_protocol           => fp.protocol.upcase,
               :vapp_scoped_local_id   => vm_info[:vapp_scoped_local_id]
             }
+
+            edge_ports << fp.host_port
           end
 
           if !ports.empty?
@@ -89,8 +86,36 @@ module VagrantPlugins
               raise Errors::ComposeVAppError, :message => wait[:errormsg]
             end
 
-          end
 
+            if cfg.vdc_edge_gateway_ip && \
+               cfg.vdc_edge_gateway && \
+               cfg.network_bridge.nil?
+
+
+              edge_ports.each do |port|
+                @env[:ui].info(
+                  "Creating NAT rules on [#{cfg.vdc_edge_gateway}] " +
+                  "for IP [#{cfg.vdc_edge_gateway_ip}] port #{port}."
+                )
+              end
+
+              # Add the vShield Edge Gateway rules
+              add_ports = cnx.add_edge_gateway_rules(
+                cfg.vdc_edge_gateway,
+                cfg.vdc_id,
+                cfg.vdc_edge_gateway_ip,
+                vapp_id,
+                edge_ports
+              )
+
+              wait = cnx.wait_task_completion(add_ports)
+
+              if !wait[:errormsg].nil?
+                raise Errors::ComposeVAppError, :message => wait[:errormsg]
+              end
+
+            end
+          end
         end
       end
     end

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

@@ -42,67 +42,103 @@ module VagrantPlugins
           cnx = cfg.vcloud_cnx.driver
           vapp_id = env[:machine].get_vapp_id
 
+          @logger.debug('Getting VM info...')
+          vm_name = env[:machine].name
+          vm = cnx.get_vapp(vapp_id)
+          vm_info = vm[:vms_hash][vm_name.to_sym]
+
+          @logger.debug('Getting edge gateway port forwarding rules...')
+          edge_gateway_rules = cnx.get_edge_gateway_rules(cfg.vdc_edge_gateway,
+                                                          cfg.vdc_id)
+          edge_dnat_rules = edge_gateway_rules.select {|r| (r[:rule_type] == 'DNAT')}
+          edge_ports_in_use = edge_dnat_rules.map{|r| r[:original_port].to_i}.to_set
+
           @logger.debug('Getting port forwarding rules...')
-          rules = cnx.get_vapp_port_forwarding_external_ports(vapp_id)
+          vapp_nat_rules = cnx.get_vapp_port_forwarding_rules(vapp_id)
+          ports_in_use = vapp_nat_rules.map{|r| r[:nat_external_port].to_i}.to_set
+
+          # merge the vapp ports and the edge gateway ports together, all are in use
+          ports_in_use = ports_in_use | edge_ports_in_use
 
           # Pass two, detect/handle any collisions
           with_forwarded_ports(env) do |options|
             guest_port = options[:guest]
             host_port  = options[:host]
 
-            # If the port is open (listening for TCP connections)
-            if rules.include?(host_port)
-              if !options[:auto_correct]
-                raise Errors::ForwardPortCollision,
-                  :guest_port => guest_port.to_s,
-                  :host_port  => host_port.to_s
-              end
-
-              @logger.info("Attempting to repair FP collision: #{host_port}")
+            # Find if there already is a DNAT rule to this vApp
+            if r = edge_dnat_rules.find { |rule| (rule[:translated_ip] == vm_info[:ip] &&
+                                                  rule[:translated_port] == guest_port.to_s) }
 
-              repaired_port = nil
-              while !usable_ports.empty?
-                # Attempt to repair the forwarded port
-                repaired_port = usable_ports.to_a.sort[0]
-                usable_ports.delete(repaired_port)
+              @logger.info(
+                "Found existing edge gateway port forwarding rule #r[:original_port] to #{guest_port}"
+              )
+              options[:already_exists_on_edge] = true
+            end
 
-                # If the port is in use, then we can't use this either...
-                if rules.include?(repaired_port)
-                  @logger.info(
-                    "Repaired port also in use: #{repaired_port}." +
-                    'Trying another...'
-                  )
-                  next
+            # Find if there already is a NAT rule to guest_port of this VM
+            if r = vapp_nat_rules.find { |rule| (rule[:vapp_scoped_local_id] == vm_info[:vapp_scoped_local_id] &&
+                                                 rule[:nat_internal_port] == guest_port.to_s) }
+              host_port = r[:nat_external_port].to_i
+              @logger.info(
+                "Found existing port forwarding rule #{host_port} to #{guest_port}"
+              )
+              options[:host] = host_port
+              options[:already_exists] = true
+            else
+              # If the port is open (listening for TCP connections)
+              if ports_in_use.include?(host_port)
+                if !options[:auto_correct]
+                  raise Errors::ForwardPortCollision,
+                    :guest_port => guest_port.to_s,
+                    :host_port  => host_port.to_s
                 end
 
-                # We have a port so break out
-                break
-              end
+                @logger.info("Attempting to repair FP collision: #{host_port}")
+
+                repaired_port = nil
+                while !usable_ports.empty?
+                  # Attempt to repair the forwarded port
+                  repaired_port = usable_ports.to_a.sort[0]
+                  usable_ports.delete(repaired_port)
+
+                  # If the port is in use, then we can't use this either...
+                  if ports_in_use.include?(repaired_port)
+                    @logger.info(
+                      "Repaired port also in use: #{repaired_port}." +
+                      'Trying another...'
+                    )
+                    next
+                  end
+
+                  # We have a port so break out
+                  break
+                end
 
-              # If we have no usable ports then we can't repair
-              if !repaired_port && usable_ports.empty?
-                raise Errors::ForwardPortAutolistEmpty,
-                      :vm_name    => env[:machine].name,
-                      :guest_port => guest_port.to_s,
-                      :host_port  => host_port.to_s
-              end
+                # If we have no usable ports then we can't repair
+                if !repaired_port && usable_ports.empty?
+                  raise Errors::ForwardPortAutolistEmpty,
+                        :vm_name    => env[:machine].name,
+                        :guest_port => guest_port.to_s,
+                        :host_port  => host_port.to_s
+                end
 
-              # Modify the args in place
-              options[:host] = repaired_port
+                # Modify the args in place
+                options[:host] = repaired_port
 
-              @logger.info(
-                "Repaired FP collision: #{host_port} to #{repaired_port}"
-              )
+                @logger.info(
+                  "Repaired FP collision: #{host_port} to #{repaired_port}"
+                )
 
-              # Notify the user
-              env[:ui].info(
-                I18n.t(
-                  'vagrant.actions.vm.forward_ports.fixed_collision',
-                  :host_port  => host_port.to_s,
-                  :guest_port => guest_port.to_s,
-                  :new_port   => repaired_port.to_s
+                # Notify the user
+                env[:ui].info(
+                  I18n.t(
+                    'vagrant.actions.vm.forward_ports.fixed_collision',
+                    :host_port  => host_port.to_s,
+                    :guest_port => guest_port.to_s,
+                    :new_port   => repaired_port.to_s
+                  )
                 )
-              )
+              end
             end
           end
 

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

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class IsLastVM
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          cfg = env[:machine].provider_config
+          cnx = cfg.vcloud_cnx.driver
+
+          vapp_id = env[:machine].get_vapp_id
+
+          test_vapp = cnx.get_vapp(vapp_id)
+
+          if test_vapp[:vms_hash].count == 1
+          # Set the result to be true if the machine is running.
+            env[:result] = true
+          else
+            env[:result] = false
+          end
+
+          # Call the next if we have one (but we shouldn't, since this
+          # middleware is built to run with the Call-type middlewares)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -20,23 +20,10 @@ module VagrantPlugins
             "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
           )
 
-          if test_vapp[:vms_hash].count == 1
-
-            # Poweroff vApp
-            env[:ui].info('Powering off vApp...')
-            vapp_stop_task = cnx.poweroff_vapp(vapp_id)
-            vapp_stop_wait = cnx.wait_task_completion(vapp_stop_task)
-
-            unless vapp_stop_wait[:errormsg].nil?
-              fail Errors::StopVAppError, :message => vapp_stop_wait[:errormsg]
-            end
-
-          else
-            # Poweroff VM
-            env[:ui].info('Powering off VM...')
-            task_id = cnx.poweroff_vm(vm_id)
-            cnx.wait_task_completion(task_id)
-          end
+          # Poweroff VM
+          env[:ui].info('Powering off VM...')
+          task_id = cnx.poweroff_vm(vm_id)
+          cnx.wait_task_completion(task_id)
 
           @app.call env
         end

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

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class PowerOffVApp
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::poweroff_vapp')
+        end
+
+        def call(env)
+          cfg = env[:machine].provider_config
+          cnx = cfg.vcloud_cnx.driver
+
+          vapp_id = env[:machine].get_vapp_id
+
+          test_vapp = cnx.get_vapp(vapp_id)
+
+          @logger.debug(
+            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
+          )
+
+          # this is a helper to get vapp_edge_ip into cache for later destroy
+          # of edge gateway rules
+          vapp_edge_ip = cnx.get_vapp_edge_public_ip(vapp_id)
+
+          # Poweroff vApp
+          env[:ui].info('Single VM left in the vApp, Powering off vApp...')
+          vapp_stop_task = cnx.poweroff_vapp(vapp_id)
+          vapp_stop_wait = cnx.wait_task_completion(vapp_stop_task)
+
+          unless vapp_stop_wait[:errormsg].nil?
+            fail Errors::StopVAppError, :message => vapp_stop_wait[:errormsg]
+          end
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -12,70 +12,12 @@ module VagrantPlugins
 
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vapp_id = env[:machine].get_vapp_id
 
-          env[:ui].info('Booting VM...')
-
-          if cfg.network_bridge.nil?
-            test_ip = cnx.get_vapp_edge_public_ip(vapp_id)
-          end
+          env[:ui].info('Powering on VM...')
 
           poweron_vm = cnx.poweron_vm(env[:machine].id)
           cnx.wait_task_completion(poweron_vm)
 
-          if test_ip.nil? && \
-             cfg.vdc_edge_gateway_ip && \
-             cfg.vdc_edge_gateway && \
-             cfg.network_bridge.nil?
-
-            @logger.debug(
-              'This is our first boot, we should map ports on the ' \
-              'Organization vDC vShield Edge Gateway!'
-            )
-
-            ### TMP FIX: tsugliani
-            ### We need to verify the vShield Edge Gateway rules don't already
-            ### exist.
-            ### Removing any rule previously set for that same source IP
-
-            # ----
-            if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-              env[:ui].info(
-                "Removing NAT rules on [#{cfg.vdc_edge_gateway}] " +
-                "for IP [#{cfg.vdc_edge_gateway_ip}]."
-              )
-              @logger.debug(
-                'Cleaning possible conflicting Edge Gateway rules - ' +
-                "Organization vDC id: #{cfg.vdc_id}"
-              )
-
-              edge_remove = cnx.remove_edge_gateway_rules(
-                cfg.vdc_edge_gateway,
-                cfg.vdc_id,
-                cfg.vdc_edge_gateway_ip,
-                vapp_id
-              )
-              cnx.wait_task_completion(edge_remove)
-            end
-            # ----
-
-            env[:ui].info(
-              "Creating NAT rules on [#{cfg.vdc_edge_gateway}] " +
-              "for IP [#{cfg.vdc_edge_gateway_ip}]."
-            )
-
-            # Set the vShield Edge Gateway rules
-            edge_map = cnx.set_edge_gateway_rules(
-              cfg.vdc_edge_gateway,
-              cfg.vdc_id,
-              cfg.vdc_edge_gateway_ip,
-              vapp_id
-            )
-
-            # Wait for task to complete.
-            cnx.wait_task_completion(edge_map)
-          end
-
           @app.call(env)
         end
       end

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

@@ -77,7 +77,7 @@ module VagrantPlugins
 
             # on windows rsync.exe requires cygdrive-style paths
             if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/\1" }
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
             end
 
             env[:ui].info(

data/lib/vagrant-vcloud/action.rb

@@ -53,14 +53,14 @@ module VagrantPlugins
               b2.use MessageAlreadyRunning
               next
             end
-            b2.use Call, IsPaused do |env2, b3|
-              if env2[:result]
-                b3.use Resume
-                next
-              end
-              b3.use action_boot
+          end
+          b.use Call, IsPaused do |env, b2|
+            if env[:result]
+              b3.use Resume
+              next
             end
           end
+          b.use PowerOn
         end
       end
 
@@ -105,12 +105,19 @@ module VagrantPlugins
               b2.use Call, IsRunning do |env2, b3|
               # If the VM is running, must power off
                 b3.use action_halt if env2[:result]
-                # Check if the network is bridged
-                b3.use Call, IsBridged do |env3, b4|
-                  # if it's not, delete port forwardings.
-                  b4.use UnmapPortForwardings unless env3[:bridged_network]
+              end
+              b2.use Call, IsLastVM do |env2, b3|
+                if env2[:result]
+                  # Check if the network is bridged
+                  b3.use Call, IsBridged do |env3, b4|
+                    # if it's not, delete port forwardings.
+                    b4.use UnmapPortForwardings unless env3[:bridged_network]
+                  end
+                  b3.use PowerOffVApp
+                  b3.use DestroyVApp
+                else
+                  b3.use DestroyVM
                 end
-                b3.use Destroy
               end
             else
               b2.use MessageWillNotDestroy
@@ -191,13 +198,15 @@ module VagrantPlugins
             b2.use HandleBox unless env[:result]
           end
           b.use ConnectVCloud
+          b.use InventoryCheck
           b.use Call, IsCreated do |env, b2|
-            unless env[:result]
-              b2.use InventoryCheck
+            if env[:result]
+              b2.use action_start
+            else
               b2.use BuildVApp
+              b2.use action_boot
             end
           end
-          b.use action_start
           b.use DisconnectVCloud
         end
       end
@@ -210,8 +219,10 @@ module VagrantPlugins
                action_root.join('build_vapp')
       autoload :ConnectVCloud,
                action_root.join('connect_vcloud')
-      autoload :Destroy,
-               action_root.join('destroy')
+      autoload :DestroyVM,
+               action_root.join('destroy_vm')
+      autoload :DestroyVApp,
+               action_root.join('destroy_vapp')
       autoload :DisconnectVCloud,
                action_root.join('disconnect_vcloud')
       autoload :ForwardPorts,
@@ -228,6 +239,8 @@ module VagrantPlugins
                action_root.join('is_paused')
       autoload :IsRunning,
                action_root.join('is_running')
+      autoload :IsLastVM,
+               action_root.join('is_last_vm')
       autoload :MessageAlreadyRunning,
                action_root.join('message_already_running')
       autoload :MessageCannotSuspend,
@@ -238,6 +251,8 @@ module VagrantPlugins
                action_root.join('message_will_not_destroy')
       autoload :PowerOff,
                action_root.join('power_off')
+      autoload :PowerOffVApp,
+               action_root.join('power_off_vapp')
       autoload :PowerOn,
                action_root.join('power_on')
       autoload :ReadSSHInfo,

data/lib/vagrant-vcloud/command.rb

@@ -118,35 +118,44 @@ module VagrantPlugins
             network_table << :separator
 
             # Fetching Destination NAT Rules for each vApp/Edge/VM/Mapping
-            edge_gateway_rules.each do |edge_gateway_rule|
-              vapp_edge_rules.each do |vapp_edge_rule|
-
-                # Only check DNAT and src/dst
-                if edge_gateway_rule[:rule_type] == 'DNAT' &&
-                   edge_gateway_rule[:original_ip] == cfg.vdc_edge_gateway_ip &&
-                   edge_gateway_rule[:translated_ip] == vapp_edge_ip
-
-                   # Loop on every VM in the vApp
-                  vapp[:vms_hash].each do |vm|
-                    # Only Map valid vAppEdge scope to VM scope
-                    vm_scope = vm[1][:vapp_scoped_local_id]
-                    vapp_edge_scope = vapp_edge_rule[:vapp_scoped_local_id]
-
-                    if vm_scope == vapp_edge_scope
-
-                      # Generate DNAT Mappings for the valid machines
-                      # If rules don't match, you will not see them !
-                      network_table << [
-                        "#{vm[0]}",
-                        "#{cfg.vdc_edge_gateway_ip}:" +
-                        "#{vapp_edge_rule[:nat_external_port]}" +
-                        " -> #{vapp_edge_ip}:" +
-                        "#{vapp_edge_rule[:nat_external_port]}" +
-                        " -> #{vm[1][:addresses][0]}:" +
-                        "#{vapp_edge_rule[:nat_internal_port]}",
-                        edge_gateway_rule[:is_enabled]
-                      ]
-                    end
+            vapp_edge_rules.each do |vapp_edge_rule|
+              edge_gateway_rule = edge_gateway_rules.find {|r|
+                      (r[:rule_type] == 'DNAT' &&
+                       r[:original_ip] == cfg.vdc_edge_gateway_ip &&
+                       r[:translated_ip] == vapp_edge_ip)}
+
+              # Loop on every VM in the vApp
+              vapp[:vms_hash].each do |vm|
+                # Only Map valid vAppEdge scope to VM scope
+                vm_scope = vm[1][:vapp_scoped_local_id]
+                vapp_edge_scope = vapp_edge_rule[:vapp_scoped_local_id]
+
+                if vm_scope == vapp_edge_scope
+
+                  # Generate DNAT Mappings for the valid machines
+                  # If rules don't match, you will not see them !
+                  if edge_gateway_rule
+                    # DNAT rule from edge to vapp to vm
+                    network_table << [
+                      "#{vm[0]}",
+                      "#{cfg.vdc_edge_gateway_ip}:" +
+                      "#{vapp_edge_rule[:nat_external_port]}" +
+                      " -> #{vapp_edge_ip}:" +
+                      "#{vapp_edge_rule[:nat_external_port]}" +
+                      " -> #{vm[1][:addresses][0]}:" +
+                      "#{vapp_edge_rule[:nat_internal_port]}",
+                      edge_gateway_rule[:is_enabled]
+                    ]
+                  else
+                    # DNAT rule only from vapp to vm
+                    network_table << [
+                      "#{vm[0]}",
+                      "#{vapp_edge_ip}:" +
+                      "#{vapp_edge_rule[:nat_external_port]}" +
+                      " -> #{vm[1][:addresses][0]}:" +
+                      "#{vapp_edge_rule[:nat_internal_port]}",
+                      true
+                    ]
                   end
                 end
               end

data/lib/vagrant-vcloud/config.rb

@@ -93,6 +93,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :vdc_edge_gateway_ip
 
+      # Name of the vApp prefix [optional, defaults to 'Vagrant' ]
+      #
+      # @return [String]
+      attr_accessor :vapp_prefix
+
+
       ##
       ## vCloud Director config runtime values
       ##

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

@@ -309,7 +309,7 @@ module VagrantPlugins
             # Massive debug when LOG=DEBUG
             # Using awesome_print to get nice XML output for better readability
             if @logger.level == 1
-              ap "SEND #{url}"
+              ap "SEND #{params['method'].upcase} #{url}"
               if payload
                 payload_xml = Nokogiri.XML(payload)
                 ap payload_xml

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

@@ -39,6 +39,7 @@ module VagrantPlugins
           @org_name = org_name
           @api_version = '5.1'
           @id = nil
+          @cached_vapp_edge_public_ips = {}
         end
 
         ##
@@ -630,19 +631,6 @@ module VagrantPlugins
           task_id
         end
 
-        ##
-        # Boot a given vm
-        def poweron_vm(vm_id)
-          params = {
-            'method'  => :post,
-            'command' => "/vApp/vm-#{vm_id}/power/action/powerOn"
-          }
-
-          _response, headers = send_request(params)
-          task_id = headers['Location'].gsub("#{@api_url}/task/", '')
-          task_id
-        end
-
         ##
         # Create a catalog in an organization
         def create_catalog(org_id, catalog_name, catalog_description)
@@ -1091,46 +1079,6 @@ module VagrantPlugins
           nat_rules
         end
 
-        ##
-        # Get vApp port forwarding rules external ports used and returns a set
-        # instead of an HASH.
-        #
-        # - vapp_id: id of the vApp
-        def get_vapp_port_forwarding_external_ports(vapp_id)
-          params = {
-            'method'  => :get,
-            'command' => "/vApp/vapp-#{vapp_id}/networkConfigSection"
-          }
-
-          response, _headers = send_request(params)
-
-          # 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'
-          )
-          fence_mode = config.css('/FenceMode').text
-          nat_type = config.css('/Features/NatService/NatType').text
-
-          unless fence_mode == 'natRouted'
-            raise InvalidStateError,
-                  'Invalid request because FenceMode must be natRouted.'
-          end
-
-          unless nat_type == 'portForwarding'
-            raise InvalidStateError,
-                  'Invalid request because NatType must be portForwarding.'
-          end
-
-          nat_rules = Set.new
-          config.css('/Features/NatService/NatRule').each do |rule|
-            # portforwarding rules information
-            vm_rule = rule.css('VmRule')
-            nat_rules.add(vm_rule.css('ExternalPort').text.to_i)
-          end
-          nat_rules
-        end
-
         ##
         # Find an edge gateway id from the edge name and vdc_id
         #
@@ -1217,195 +1165,6 @@ module VagrantPlugins
           end
         end
 
-        ##
-        # Set Org Edge port forwarding and firewall rules
-        #
-        # - vapp_id: id of the vapp to be modified
-        # - network_name: name of the vapp network to be modified
-        # - config: hash with network configuration specifications,
-        #           must contain an array inside :nat_rules with the nat rules
-        #           to be applied.
-        def set_edge_gateway_rules(edge_gateway_name, vdc_id, edge_gateway_ip, vapp_id)
-          edge_vapp_ip = get_vapp_edge_public_ip(vapp_id)
-          edge_network_id = find_edge_gateway_network(
-            edge_gateway_name,
-            vdc_id,
-            edge_gateway_ip
-          )
-          edge_gateway_id = find_edge_gateway_id(edge_gateway_name, vdc_id)
-
-          ### FIXME: tsugliani
-          # We need to check the previous variables, especially (edge_*)
-          # which can fail in some *weird* situations.
-          params = {
-             'method'   => :get,
-             'command'  => "/admin/edgeGateway/#{edge_gateway_id}"
-           }
-
-          response, _headers = send_request(params)
-
-          interesting = response.css(
-            'EdgeGateway Configuration EdgeGatewayServiceConfiguration'
-          )
-
-          nat_rule_1 = Nokogiri::XML::Node.new 'NatRule', response
-          rule_type = Nokogiri::XML::Node.new 'RuleType', response
-          rule_type.content = 'DNAT'
-          nat_rule_1.add_child rule_type
-
-          is_enabled = Nokogiri::XML::Node.new 'IsEnabled', response
-          is_enabled.content = 'true'
-          nat_rule_1.add_child is_enabled
-
-          gateway_nat_rule = Nokogiri::XML::Node.new 'GatewayNatRule',
-                                                     response
-          nat_rule_1.add_child gateway_nat_rule
-
-          interface = Nokogiri::XML::Node.new 'Interface', response
-          interface['href'] = edge_network_id
-
-          gateway_nat_rule.add_child interface
-
-          original_ip = Nokogiri::XML::Node.new 'OriginalIp', response
-          original_ip.content = edge_gateway_ip
-          gateway_nat_rule.add_child original_ip
-
-          original_port = Nokogiri::XML::Node.new 'OriginalPort', response
-          original_port.content = 'any'
-          gateway_nat_rule.add_child original_port
-
-          translated_ip = Nokogiri::XML::Node.new 'TranslatedIp', response
-          translated_ip.content = edge_vapp_ip
-          gateway_nat_rule.add_child translated_ip
-
-          translated_port = Nokogiri::XML::Node.new 'TranslatedPort',
-                                                    response
-          translated_port.content = 'any'
-          gateway_nat_rule.add_child translated_port
-
-          protocol = Nokogiri::XML::Node.new 'Protocol', response
-          protocol.content = 'any'
-          gateway_nat_rule.add_child protocol
-
-          # FIXME: frapposelli/tsugliani we should be able to remove this
-          # FIXME: test this against a vCloud Director 5.1.x installation
-          # icmpSubType = Nokogiri::XML::Node.new 'IcmpSubType', response
-          # icmpSubType.content = "any"
-          # gatewayNatRule.add_child icmpSubType
-
-          nat_rule_2 = Nokogiri::XML::Node.new 'NatRule', response
-
-          rule_type = Nokogiri::XML::Node.new 'RuleType', response
-          rule_type.content = 'SNAT'
-          nat_rule_2.add_child rule_type
-
-          is_enabled = Nokogiri::XML::Node.new 'IsEnabled', response
-          is_enabled.content = 'true'
-          nat_rule_2.add_child is_enabled
-
-          gateway_nat_rule = Nokogiri::XML::Node.new 'GatewayNatRule',
-                                                     response
-          nat_rule_2.add_child gateway_nat_rule
-
-          interface = Nokogiri::XML::Node.new 'Interface', response
-          interface['href'] = edge_network_id
-
-          gateway_nat_rule.add_child interface
-
-          original_ip = Nokogiri::XML::Node.new 'OriginalIp', response
-          original_ip.content = edge_vapp_ip
-          gateway_nat_rule.add_child original_ip
-
-          translated_ip = Nokogiri::XML::Node.new 'TranslatedIp', response
-          translated_ip.content = edge_gateway_ip
-          gateway_nat_rule.add_child translated_ip
-
-          protocol = Nokogiri::XML::Node.new 'Protocol', response
-          protocol.content = 'any'
-          gateway_nat_rule.add_child protocol
-
-          firewall_rule_1 = Nokogiri::XML::Node.new 'FirewallRule', response
-
-          is_enabled = Nokogiri::XML::Node.new 'IsEnabled', response
-          is_enabled.content = 'true'
-          firewall_rule_1.add_child is_enabled
-
-          description = Nokogiri::XML::Node.new 'Description', response
-          description.content = 'Allow Vagrant Communications'
-          firewall_rule_1.add_child description
-
-          policy = Nokogiri::XML::Node.new 'Policy', response
-          policy.content = 'allow'
-          firewall_rule_1.add_child policy
-
-          protocols = Nokogiri::XML::Node.new 'Protocols', response
-          firewall_rule_1.add_child protocols
-
-          any = Nokogiri::XML::Node.new 'Any', response
-          any.content = 'true'
-          protocols.add_child any
-
-          destination_port_range =
-          Nokogiri::XML::Node.new 'DestinationPortRange', response
-          destination_port_range.content = 'Any'
-          firewall_rule_1.add_child destination_port_range
-
-          destination_ip = Nokogiri::XML::Node.new 'DestinationIp', response
-          destination_ip.content = edge_gateway_ip
-          firewall_rule_1.add_child destination_ip
-          source_port_range = Nokogiri::XML::Node.new 'SourcePortRange',
-
-                                                      response
-          source_port_range.content = 'Any'
-          firewall_rule_1.add_child source_port_range
-
-          source_ip = Nokogiri::XML::Node.new 'SourceIp', response
-          source_ip.content = 'Any'
-          firewall_rule_1.add_child source_ip
-
-          enable_logging = Nokogiri::XML::Node.new 'EnableLogging', response
-          enable_logging.content = 'false'
-          firewall_rule_1.add_child enable_logging
-
-          # FIXME: Think about adding an outgoing rule
-          #        (which could not be available)
-          #        by default in all cases vapp_edge_ip -> any
-          #        Especially for provisionners using apt-get, internet, etc...
-          #        (tsugliani)
-
-          builder = Nokogiri::XML::Builder.new
-          builder << interesting
-
-          set_edge_rules = Nokogiri::XML(builder.to_xml) do |config|
-            config.default_xml.noblanks
-          end
-
-          nat_rules = set_edge_rules.at_css('NatService')
-          nat_rules << nat_rule_1
-          nat_rules << nat_rule_2
-
-          fw_rules = set_edge_rules.at_css('FirewallService')
-          fw_rules << firewall_rule_1
-
-          xml = set_edge_rules.at_css 'EdgeGatewayServiceConfiguration'
-          xml['xmlns'] = 'http://www.vmware.com/vcloud/v1.5'
-
-          params = {
-            'method'  => :post,
-            'command' => "/admin/edgeGateway/#{edge_gateway_id}/action/" +
-                         'configureServices'
-          }
-
-          _response, headers = send_request(
-            params,
-            set_edge_rules.to_xml,
-            'application/vnd.vmware.admin.edgeGatewayServiceConfiguration+xml'
-          )
-
-          task_id = headers['Location'].gsub("#{@api_url}/task/", '')
-          task_id
-        end
-
         ##
         # Get Org Edge port forwarding and firewall rules
         #
@@ -1541,6 +1300,145 @@ module VagrantPlugins
           task_id
         end
 
+        #
+        # Add Org Edge port forwarding and firewall rules
+        #
+        # - vapp_id: id of the vapp to be modified
+        # - network_name: name of the vapp network to be modified
+        # - ports: array with port numbers to forward 1:1 to vApp.
+        def add_edge_gateway_rules(edge_gateway_name, vdc_id, edge_gateway_ip, vapp_id, ports)
+          edge_vapp_ip = get_vapp_edge_public_ip(vapp_id)
+          edge_network_id = find_edge_gateway_network(
+            edge_gateway_name,
+            vdc_id,
+            edge_gateway_ip
+          )
+          edge_gateway_id = find_edge_gateway_id(edge_gateway_name, vdc_id)
+
+          ### FIXME: tsugliani
+          # We need to check the previous variables, especially (edge_*)
+          # which can fail in some *weird* situations.
+          params = {
+             'method'   => :get,
+             'command'  => "/admin/edgeGateway/#{edge_gateway_id}"
+           }
+
+          response, _headers = send_request(params)
+
+          interesting = response.css(
+            'EdgeGateway Configuration EdgeGatewayServiceConfiguration'
+          )
+
+          add_snat_rule = true
+          interesting.css('NatService NatRule').each do |node|
+            if node.css('RuleType').text == 'DNAT' &&
+               node.css('GatewayNatRule/OriginalIp').text == edge_gateway_ip &&
+               node.css('GatewayNatRule/TranslatedIp').text == edge_vapp_ip &&
+               node.css('GatewayNatRule/OriginalPort').text == 'any'
+               # remove old DNAT rule any -> any from older vagrant-vcloud versions
+              node.remove
+            end
+            if node.css('RuleType').text == 'SNAT' &&
+               node.css('GatewayNatRule/OriginalIp').text == edge_vapp_ip &&
+               node.css('GatewayNatRule/TranslatedIp').text == edge_gateway_ip
+              add_snat_rule = false
+            end
+          end
+
+          add_firewall_rule = true
+          interesting.css('FirewallService FirewallRule').each do |node|
+            if node.css('Port').text == '-1' &&
+               node.css('DestinationIp').text == edge_gateway_ip &&
+               node.css('DestinationPortRange').text == 'Any'
+              add_firewall_rule = false
+            end
+          end
+
+          builder = Nokogiri::XML::Builder.new
+          builder << interesting
+
+          set_edge_rules = Nokogiri::XML(builder.to_xml) do |config|
+            config.default_xml.noblanks
+          end
+
+          nat_rules = set_edge_rules.at_css('NatService')
+
+          # Add all DNAT port rules edge -> vApp for the given list
+          ports.each do |port| 
+            nat_rule = Nokogiri::XML::Builder.new do |xml|
+                xml.NatRule {
+                  xml.RuleType 'DNAT'
+                  xml.IsEnabled 'true'
+                  xml.GatewayNatRule {
+                    xml.Interface('href' => edge_network_id )
+                    xml.OriginalIp edge_gateway_ip
+                    xml.OriginalPort port
+                    xml.TranslatedIp edge_vapp_ip
+                    xml.TranslatedPort port
+                    xml.Protocol 'tcpudp'
+                  }
+                }
+            end
+            nat_rules << nat_rule.doc.root.to_xml
+          end
+
+          if (add_snat_rule)
+            snat_rule = Nokogiri::XML::Builder.new do |xml|
+                xml.NatRule {
+                  xml.RuleType 'SNAT'
+                  xml.IsEnabled 'true'
+                  xml.GatewayNatRule {
+                    xml.Interface('href' => edge_network_id )
+                    xml.OriginalIp edge_vapp_ip
+                    xml.TranslatedIp edge_gateway_ip
+                    xml.Protocol 'any'
+                  }
+                }
+            end             
+            nat_rules << snat_rule.doc.root.to_xml
+          end
+
+
+          if (add_firewall_rule)
+          firewall_rule_1 = Nokogiri::XML::Builder.new do |xml|
+              xml.FirewallRule {
+                xml.IsEnabled 'true'
+                xml.Description 'Allow Vagrant Communications'
+                xml.Policy 'allow'
+                xml.Protocols {
+                  xml.Any 'true'
+                }
+                xml.DestinationPortRange 'Any'
+                xml.DestinationIp edge_gateway_ip
+                xml.SourcePortRange 'Any'
+                xml.SourceIp 'Any'
+                xml.EnableLogging 'false'
+              }
+          end           
+          fw_rules = set_edge_rules.at_css('FirewallService')
+            fw_rules << firewall_rule_1.doc.root.to_xml
+          end
+
+          xml = set_edge_rules.at_css 'EdgeGatewayServiceConfiguration'
+          xml['xmlns'] = 'http://www.vmware.com/vcloud/v1.5'
+
+          params = {
+            'method'  => :post,
+            'command' => "/admin/edgeGateway/#{edge_gateway_id}/action/" +
+                         'configureServices'
+          }
+
+          _response, headers = send_request(
+            params,
+            set_edge_rules.to_xml,
+            'application/vnd.vmware.admin.edgeGatewayServiceConfiguration+xml'
+          )
+
+          task_id = headers['Location'].gsub("#{@api_url}/task/", '')
+          task_id
+        end
+
+        
         ##
         # get vApp edge public IP from the vApp ID
         # Only works when:
@@ -1550,6 +1448,8 @@ module VagrantPlugins
         # 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?
+
           # Check the network configuration section
           params = {
             'method' => :get,
@@ -1583,6 +1483,7 @@ module VagrantPlugins
           if edge_ip == ''
             return nil
           else
+            @cached_vapp_edge_public_ips[vapp_id] = edge_ip
             return edge_ip
           end
         end

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

@@ -18,6 +18,9 @@ module VagrantPlugins
               options    = scoped_hash_override(options, :vcloud)
               id         = options[:id]
 
+              # skip forwarded rules already found in handle_nat_port_collisions
+              next if options[:already_exists]
+
               mappings[host_port] =
                 Model::ForwardedPort.new(id, host_port, guest_port, options)
             end

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -201,13 +201,15 @@ files:
 - lib/vagrant-vcloud/action/announce_ssh_exec.rb
 - lib/vagrant-vcloud/action/build_vapp.rb
 - lib/vagrant-vcloud/action/connect_vcloud.rb
-- lib/vagrant-vcloud/action/destroy.rb
+- lib/vagrant-vcloud/action/destroy_vapp.rb
+- lib/vagrant-vcloud/action/destroy_vm.rb
 - lib/vagrant-vcloud/action/disconnect_vcloud.rb
 - lib/vagrant-vcloud/action/forward_ports.rb
 - lib/vagrant-vcloud/action/handle_nat_port_collisions.rb
 - lib/vagrant-vcloud/action/inventory_check.rb
 - lib/vagrant-vcloud/action/is_bridged.rb
 - lib/vagrant-vcloud/action/is_created.rb
+- lib/vagrant-vcloud/action/is_last_vm.rb
 - lib/vagrant-vcloud/action/is_paused.rb
 - lib/vagrant-vcloud/action/is_running.rb
 - lib/vagrant-vcloud/action/message_already_running.rb
@@ -215,6 +217,7 @@ files:
 - lib/vagrant-vcloud/action/message_not_created.rb
 - lib/vagrant-vcloud/action/message_will_not_destroy.rb
 - lib/vagrant-vcloud/action/power_off.rb
+- lib/vagrant-vcloud/action/power_off_vapp.rb
 - lib/vagrant-vcloud/action/power_on.rb
 - lib/vagrant-vcloud/action/read_ssh_info.rb
 - lib/vagrant-vcloud/action/read_state.rb

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

@@ -1,66 +0,0 @@
-module VagrantPlugins
-  module VCloud
-    module Action
-      class Destroy
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_vcloud::action::destroy')
-        end
-
-        def call(env)
-          cfg = env[:machine].provider_config
-          cnx = cfg.vcloud_cnx.driver
-          vapp_id = env[:machine].get_vapp_id
-          vm_id = env[:machine].id
-
-          cfg.org = cnx.get_organization_by_name(cfg.org_name)
-          cfg.vdc_id = cnx.get_vdc_id_by_name(cfg.org, cfg.vdc_name)
-
-          test_vapp = cnx.get_vapp(vapp_id)
-
-          @logger.debug(
-            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
-          )
-
-          if test_vapp[:vms_hash].count == 1
-            env[:ui].info('Single VM left in the vApp, destroying the vApp...')
-
-            if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-              env[:ui].info(
-                "Removing NAT rules on [#{cfg.vdc_edge_gateway}] " +
-                "for IP [#{cfg.vdc_edge_gateway_ip}]."
-              )
-              @logger.debug(
-                "Deleting Edge Gateway rules - vdc id: #{cfg.vdc_id}"
-              )
-              edge_remove = cnx.remove_edge_gateway_rules(
-                cfg.vdc_edge_gateway,
-                cfg.vdc_id,
-                cfg.vdc_edge_gateway_ip,
-                vapp_id
-              )
-              cnx.wait_task_completion(edge_remove)
-            end
-
-            env[:ui].info('Destroying vApp...')
-            vapp_delete_task = cnx.delete_vapp(vapp_id)
-            @logger.debug("vApp Delete task id #{vapp_delete_task}")
-            cnx.wait_task_completion(vapp_delete_task)
-
-            env[:machine].id = nil
-            env[:machine].vappid = nil
-          else
-            env[:ui].info('Destroying VM...')
-            vm_delete_task = cnx.delete_vm(vm_id)
-            @logger.debug("VM Delete task id #{vm_delete_task}")
-            cnx.wait_task_completion(vm_delete_task)
-
-            env[:machine].id = nil
-          end
-
-          @app.call env
-        end
-      end
-    end
-  end
-end