vagrant-vcloud 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377aff5a6fcd7aa53aeb8a1c07c6ea0814a768ee
-  data.tar.gz: 663ad5f16d5dc1bd1a66bc91b9779c406e604b07
+  metadata.gz: 4bbc6566a5568f44799cac8c73a73bb5c127e8c5
+  data.tar.gz: 05d23945c5e91ed947cf69ae5c92a7b9a7aca1bd
 SHA512:
-  metadata.gz: 41d434f6cd5704e662edd1ac2f68d75d883fb7486559018e0a55b2a1e64ddd7dfc1fcbaf9fc921e78dfb7186eb082859eb17a1112b6170968c56b438733925fc
-  data.tar.gz: 142935eac15c311473c27eb829358afe4340551e2c4e8cd4a7ca4ea2d47bf82590716c0fa43dbb1e447fba6ef9058b3f969046a0ab0a6a905f4c348255743517
+  metadata.gz: 14299a5e78c4b71505aa785e90e570c50478c68777ed45115280403db365f819d3bdf1dea2656ef1f572624b68ad8b123b81eec84dd2d8f88294e9439fae7e75
+  data.tar.gz: 1c305fb8f6ca86e0acc976ae4cce5c9d025570c79ef62d047d1f8c50bf905951b42fb675376e761348a1c55674d0ccab49af9e62b4c6d645273db3d3d58afacc

data/README.md

@@ -1,16 +1,25 @@
 [Vagrant](http://www.vagrantup.com) provider for VMware vCloud Director®
 =============
 
-[Version 0.3.1](https://github.com/frapposelli/vagrant-vcloud/releases/tag/v0.3.1) has been released!
+[Version 0.3.2](../../releases/tag/v0.3.2) 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.
 
+If you're unsure about what are the correct network settings for your Vagrantfile make sure to check out the [Network Deployment Options](https://github.com/frapposelli/vagrant-vcloud/wiki/Network-Deployment-Options) wiki page.
+
+Features of Version 0.3.2 are:
+
+- Added support for ```vagrant share``` command [[#31](https://github.com/frapposelli/vagrant-vcloud/issues/31)] Support vagrant share
+- Restructured the ```vagrant vcloud-status``` to ```vagrant vcloud status``` for future-proofing [[#53](https://github.com/frapposelli/vagrant-vcloud/issues/53)]
+- Added ```vagrant vcloud --redeploy-edge-gw``` to redeploy Edge Gateway [[#54](https://github.com/frapposelli/vagrant-vcloud/issues/54)]
+- Several Bug Fixes [[#45](https://github.com/frapposelli/vagrant-vcloud/issues/45)], [[#46](https://github.com/frapposelli/vagrant-vcloud/issues/46)], [[#47](https://github.com/frapposelli/vagrant-vcloud/issues/47)], [[#48](https://github.com/frapposelli/vagrant-vcloud/issues/48)], [[#50](https://github.com/frapposelli/vagrant-vcloud/issues/50)], [[#51](https://github.com/frapposelli/vagrant-vcloud/issues/51)], [[#52](https://github.com/frapposelli/vagrant-vcloud/issues/52)], [[#56](https://github.com/frapposelli/vagrant-vcloud/issues/56)], [[#57](https://github.com/frapposelli/vagrant-vcloud/issues/57)], [[#61](https://github.com/frapposelli/vagrant-vcloud/issues/61)]
+
 Features of Version 0.3.1 are:
 
-- Small hotfix to include "preRunning" condition when using vCloud Director 5.5 [Issue #44]
+- Small hotfix to include "preRunning" condition when using vCloud Director 5.5 [[#44](https://github.com/frapposelli/vagrant-vcloud/issues/44)]. - [Andrew Poland](https://github.com/apoland)
 
 Features of Version 0.3.0 are:
 
@@ -20,12 +29,12 @@ A substantial release, major kudos to [Stefan Scherer](https://github.com/Stefan
 - 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.
+- Fixed Issue [[#33](../../issues/33)] - Error removing/creating NAT rules on second vagrant up.
+- Fixed Issue [[#43](../../issues/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.
+- Fixed Issue [[#32](../../issues/32)] - Port Forwarding rules are deleted when Halting a VM.
 
 Features of Version 0.2.1 are:
 
@@ -33,8 +42,8 @@ Features of Version 0.2.1 are:
 
 Features of Version 0.2.0 are:
 
-- It's now possible to connect to an existing VDC network without creating a vShield Edge using ```network_bridge = true``` in the Vagrantfile [ISSUE #23]. *experimental*
-- Added a ```upload_chunksize``` parameter to specify the chunk dimension during box uploads [ISSUE #21].
+- It's now possible to connect to an existing VDC network without creating a vShield Edge using ```network_bridge = true``` in the Vagrantfile [[#23](../../issues/23)]. *experimental*
+- Added a ```upload_chunksize``` parameter to specify the chunk dimension during box uploads [[#21](../../issues/21)].
 - Added support for [vCloud® Hybrid Service™](http://www.vmware.com/products/vcloud-hybrid-service) API version 5.7.
 - Added a new command to vagrant called ```vcloud-status``` that shows the current status of the vCloud instance relative to the Vagrant deployment. *experimental*
 - General code cleanup, code should be more readable and there's a rubocop file for our code conventions.
@@ -44,47 +53,13 @@ Features of Version 0.2.0 are:
 - Fixed the Edge Gateway NAT rules creation / deletion.
 - Added debug capabilities down to XML traffic exchanged during the REST calls.
 
-Features of Version 0.1.2 are:
-
-- Fix ssh_key array for the sync_folder [ISSUE #30 thanks [@JMG-OICR](https://github.com/JMG-OICR)]
-
-Features of Version 0.1.1 are:
-
-  - bugfix multiple sub allocation pools ranges [ISSUE #24]
-  - Putting back Google DNS as default if not specified
-  - binding vCloud 5.5 API on 5.1 driver
-  - Debug cut and general cosmetic cleanup
-  - added DNS choice using the "ip_dns" Array config property.
-  - Updated sync_folders.rb with code from vagrant-aws, Will focus on a better sync engine later in the future.
-  - Removed dependency on rest-client gem, moved everything to httpclient.
-  - Fixed destroy vApp bug.
-
-Features of Version 0.1.0 are:
-
-- Basic Create/Provision/Destroy lifecycle.
-- Rsync-based provisioning (working on alternatives for that).
-- Use a single vApp as a container for Multi-VM Vagrantfiles.
-- Use a vApp vShield Edge to perform DNAT/SNAT on a single IP for Multi-VM Vagrantfiles.
-- Automatically create NAT rules on a fronting Organization Edge.
-- Automatic upload of the Vagrant box to the specified catalog.
-- Works on [vCloud® Hybrid Service™](http://www.vmware.com/products/vcloud-hybrid-service)!
-
-What is still missing:
-
-- TEST SUITES! (working on that).
-- Speed, the code is definitely not optimized.
-- Permission checks, make sure you have at least Catalog Admin privileges if you want to upload boxes to vCloud.
-- Thorough testing.
-- Error checking is absymal.
-- Some spaghetti code here and there.
-- Bugs, bugs and BUGS!.
 
-If you're a developer and want to lend us a hand, head over to our ```develop``` branch and get busy!
+Check the full releases changelog [here](../../releases)
 
 Install
 -------------
 
-Version 0.1.0 can be easily installed by running:
+Latest version can be easily installed by running the following command:
 
 ```vagrant plugin install vagrant-vcloud```
 
@@ -92,6 +67,9 @@ Vagrant will download all the required gems during the installation process.
 
 After the install has completed a ```vagrant up --provider=vcloud``` will trigger the newly installed provider.
 
+Configuration
+-------------
+
 Here's a sample Multi-VM Vagrantfile, please note that ```vcloud.vdc_edge_gateway``` and ```vcloud.vdc_edge_gateway_ip``` are required only when you cannot access ```vcloud.vdc_network_name``` directly and there's an Organization Edge between your workstation and the vCloud Network.
 
 ```ruby
@@ -143,4 +121,22 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+For additional documentation on different network setups with vCloud Director, check the [Network Deployment Options](../../wiki/Network-Deployment-Options) Wiki page
+
+Contribute
+-------------
+
+What is still missing:
+
+- TEST SUITES! (working on that).
+- Speed, the code is definitely not optimized.
+- Permission checks, make sure you have at least Catalog Admin privileges if you want to upload boxes to vCloud.
+- Thorough testing.
+- Error checking is absymal.
+- Some spaghetti code here and there.
+- Bugs, bugs and BUGS!.
+
+If you're a developer and want to lend us a hand, head over to our ```develop``` branch and send us PRs!
+
+
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/frapposelli/vagrant-vcloud/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/vagrant-vcloud/action.rb

@@ -51,16 +51,10 @@ module VagrantPlugins
             # If the VM is running, then our work here is done, exit
             if env[:result]
               b2.use MessageAlreadyRunning
-              next
-            end
-          end
-          b.use Call, IsPaused do |env, b2|
-            if env[:result]
-              b3.use Resume
-              next
+            else
+              b2.use PowerOn
             end
           end
-          b.use PowerOn
         end
       end
 
@@ -145,7 +139,6 @@ module VagrantPlugins
       # key.
       def self.action_read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
           b.use ConnectVCloud
           b.use ReadSSHInfo
         end
@@ -164,15 +157,22 @@ module VagrantPlugins
 
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
+          # b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
               next
             end
-            # This calls our helper that announces the IP used to connect
-            # to the VM, either directly to the vApp vShield or to the Org Edge
-            b2.use AnnounceSSHExec
+
+            b2.use Call, IsRunning do |env2, b3|
+              unless env2[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              # This calls our helper that announces the IP used to connect
+              # to the VM, either directly to the vApp vShield or to the Org Edge
+              b3.use AnnounceSSHExec
+            end
           end
         end
       end
@@ -243,6 +243,8 @@ module VagrantPlugins
                action_root.join('is_last_vm')
       autoload :MessageAlreadyRunning,
                action_root.join('message_already_running')
+      autoload :MessageNotRunning,
+               action_root.join('message_not_running')
       autoload :MessageCannotSuspend,
                action_root.join('message_cannot_suspend')
       autoload :MessageNotCreated,

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

@@ -10,7 +10,7 @@ module VagrantPlugins
         def call(env)
           config = env[:machine].provider_config
 
-          if !config.vcloud_cnx
+          if !config.vcloud_cnx or !config.vcloud_cnx.driver.auth_key
             @logger.info('Connecting to vCloud Director...')
 
               @logger.debug("config.hostname    : #{config.hostname}")

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

@@ -4,21 +4,20 @@ module VagrantPlugins
       class IsBridged
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::is_bridged")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::is_bridged')
         end
 
         def call(env)
-         
-          vAppId = env[:machine].get_vapp_id
+          vapp_id = env[:machine].get_vapp_id
 
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
 
           begin
-            @logger.debug("Trying to get the vApp port forwarding rules")
-            cnx.get_vapp_port_forwarding_rules(vAppId)
+            @logger.debug('Trying to get the vApp port forwarding rules')
+            cnx.get_vapp_port_forwarding_rules(vapp_id)
           rescue
-            @logger.debug("Setting the bridged_network environment var to true")
+            @logger.debug('Setting the bridged_network environment var to true')
             env[:bridged_network] = true
           end
 

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class MessageNotRunning
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t('vagrant_vcloud.vm_not_running'))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ module VagrantPlugins
   module VCloud
     module Action
       class ReadSSHInfo
-        # FIXME: More work needed here for vCloud logic (vApp, VM IPs, etc.)
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new('vagrant_vcloud::action::read_ssh_info')
@@ -14,6 +13,28 @@ module VagrantPlugins
           @app.call env
         end
 
+        # Small method to check the tcp connection to an ip:port works.
+        # Return false if anything fails, and true if it succeeded.
+        def check_for_ssh(ip, port)
+          begin
+            Timeout::timeout(1) do
+              begin
+                s = TCPSocket.new(ip, port)
+                s.close
+                @logger.debug("SSH Connection successful !")
+                return true
+              rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+                @logger.debug("SSH Connection Refused/Host Unreachable...")
+                return false
+              end
+            end
+          rescue Timeout::Error
+            @logger.debug("SSH Connection Timeout...")
+          end
+
+          return false
+        end
+
         def read_ssh_info(env)
           return nil if env[:machine].id.nil?
 
@@ -36,11 +57,16 @@ module VagrantPlugins
           end
 
           if !cfg.network_bridge.nil?
-            @logger.debug("We're running in bridged mode,
-                          fetching the IP directly from the VM")
+            @logger.debug(
+              'We\'re running in bridged mode, ' \
+              'fetching the IP directly from the VM'
+            )
             vm_info = cnx.get_vm(env[:machine].id)
-            @logger.debug("IP address for #{vm_name}:
-                          #{vm_info[:networks]['Vagrant-vApp-Net'][:ip]}")
+            @logger.debug(
+              "IP address for #{vm_name}: " \
+              "#{vm_info[:networks]['Vagrant-vApp-Net'][:ip]}"
+            )
+
             @external_ip = vm_info[:networks]['Vagrant-vApp-Net'][:ip]
             @external_port = '22'
           else
@@ -58,21 +84,43 @@ module VagrantPlugins
             end
 
             if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-              @logger.debug("We're running vagrant behind an Organization vDC
-                            edge")
+              @logger.debug(
+                "We're running vagrant behind an Organization vDC Edge"
+              )
               @external_ip = cfg.vdc_edge_gateway_ip
             end
           end
 
-          # FIXME: fix the selfs and create a meaningful info message
-          # @logger.debug(
-          #  "Our variables: IP #{@external_ip} and Port #{@external_port}"
-          # )
+          @logger.debug(
+            "SSH INFO: IP #{@external_ip} and Port #{@external_port}"
+          )
+
+          # tsugliani: Temporary Fix for Issue #56
+          # SSH unavailable makes the deployment fails.
+          # Wait infinitely right now for SSH...
+          # sleep_counter incremented by 1s each loop.
+          #
+          # This should be fixed with implementing Vagrant::Util::Retryable
+          # and something like:
+          #
+          # retryable(:on => Vagrant::Errors::SSHSomething, :tries => 10, :sleep => 5) do
+          #   check_for_ssh(ip, port, :error_class => Vagrant::Errors::SSHSomething)
+          # end
+          #
+          sleep_counter = 5
+
+          while check_for_ssh(@external_ip, @external_port) == false
+            env[:ui].info(
+              "Waiting for SSH Access on #{@external_ip}:#{@external_port} ... "
+            )
+            sleep sleep_counter
+            sleep_counter += 1
+          end
 
+          # If we are here, then SSH is ready, continue
           {
-              # FIXME: these shouldn't be self
-              :host => @external_ip,
-              :port => @external_port
+            :host => @external_ip,
+            :port => @external_port
           }
         end
       end

data/lib/vagrant-vcloud/cap/forwarded_ports.rb

@@ -0,0 +1,43 @@
+module VagrantPlugins
+  module VCloud
+    module Cap
+      module ForwardedPorts
+
+        # Reads the forwarded ports that currently exist on the machine
+        # itself. This raises an exception if the machine isn't running.
+        #
+        # This also may not match up with configured forwarded ports, because
+        # Vagrant auto port collision fixing may have taken place.
+        #
+        # @return [Hash<Integer, Integer>] Host => Guest port mappings.
+        def self.forwarded_ports(machine)
+          result = {}
+
+          cfg = machine.provider_config
+          cnx = cfg.vcloud_cnx.driver
+          vapp_id = machine.get_vapp_id
+          vm_name = machine.name
+          vm = cnx.get_vapp(vapp_id)
+          myhash = vm[:vms_hash][vm_name.to_sym]
+
+          if vm.nil?
+            return
+          end
+
+          if cfg.network_bridge.nil?
+            rules = cnx.get_vapp_port_forwarding_rules(vapp_id)
+
+            rules.each do |rule|
+              if rule[:vapp_scoped_local_id] == myhash[:vapp_scoped_local_id]
+                result[rule[:nat_external_port].to_i] = rule[:nat_internal_port].to_i
+              end
+            end
+          end
+          result
+        end
+
+      end
+    end
+  end
+end
+

data/lib/vagrant-vcloud/cap/public_address.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module VCloud
+    module Cap
+      module PublicAddress
+
+        def self.public_address(machine)
+
+          # Initial try for vagrant share feature.
+          # It seems ssh_info[:port] is given automatically.
+          # I think this feature was built planning that the port forwarding
+          # and networking was done on the vagrant machine, which isn't the
+          # case in vagrant-vcloud
+
+          ssh_info = machine.ssh_info
+          ssh_info[:host]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vcloud/command.rb

@@ -5,51 +5,13 @@ module VagrantPlugins
   module VCloud
     class Command < Vagrant.plugin('2', :command)
       def self.synopsis
-        'outputs status of the vCloud Director setup [vcloud provider only]'
+        'namespace to interact with vCloud Director specifics [vcloud provider only]'
       end
 
-      def execute
-        options = {}
-        opts = OptionParser.new do |o|
-          o.banner = 'Usage: vagrant vcloud-status [--all]'
-
-          # We can probably extend this if needed for specific information
-          o.on('-a', '--all', 'Displays all available information') do |f|
-            options[:all] = true
-          end
-        end
-
-        @argv = parse_options(opts)
-        return unless @argv
-
-        # initialize some variables
-        vapp_id = nil
-        cfg = nil
-
-        # Go through the vagrant machines
-        with_target_vms(@argv) do |machine|
-
-          # FIXME/Bug: why does the provider switch to virtualbox when
-          # destroying VMs within the the vApp:
-          # .vagrant/machines/<machine>/virtualbox Cannot trace why this
-          # happens :-( (tsugliani)
-          if machine.provider_name != :vcloud
-            # Not a vCloud Director provider, exit with explicit error message
-            puts "#{machine.provider_name} provider is incompatible with " +
-                  'this command'
-            exit 1
-          end
-
-          # Force reloads on objects by fetching the ssh_info
-          machine.provider.ssh_info
-
-          # populate cfg & vApp Id for later use.
-          cfg = machine.provider_config
-          vapp_id = machine.get_vapp_id
-          break
-        end
-
+      def command_vcloud_status(cfg, vapp_id)
         # Set our handlers to the driver and objects
+
+        puts "Fetching vCloud Director status..."
         cnx = cfg.vcloud_cnx.driver
         vapp = cnx.get_vapp(vapp_id)
 
@@ -80,130 +42,223 @@ module VagrantPlugins
 
         # Print the General Information Table
         puts table
+      end
 
-        # Display Network information only if --all is passed to the cmd
-        if options[:all] == true
-
-          # FIXME: this needs to be fixed to accomodate the bridged scenario
-          # potentially showing only the assigned IPs in the VMs
+      def command_vcloud_network(cfg, vapp_id)
+        # FIXME: this needs to be fixed to accomodate the bridged scenario
+        # potentially showing only the assigned IPs in the VMs
 
-          if !cfg.network_bridge.nil?
+        puts 'Fetching vCloud Director network settings ...'
+        cnx = cfg.vcloud_cnx.driver
+        vapp = cnx.get_vapp(vapp_id)
 
-            # Create a new table for the network information
-            network_table = Terminal::Table.new
-            network_table.title = 'Network Map'
+        organization = cnx.get_organization_by_name(cfg.org_name)
+        cfg.vdc_id = cnx.get_vdc_id_by_name(organization, cfg.vdc_name)
 
-            network_table << ['VM Name', 'IP Address', 'Connection']
-            network_table << :separator
+        if !cfg.network_bridge.nil?
+          # Create a new table for the network information
+          network_table = Terminal::Table.new
+          network_table.title = 'Network Map'
 
-            # ap vapp[:vms_hash]
+          network_table << ['VM Name', 'IP Address', 'Connection']
+          network_table << :separator
 
+          vapp[:vms_hash].each do |vm|
+            network_table << [vm[0], vm[1][:addresses][0], 'Direct']
+          end
+        else
+          vapp_edge_ip = cnx.get_vapp_edge_public_ip(vapp_id)
+          vapp_edge_rules = cnx.get_vapp_port_forwarding_rules(vapp_id)
+          edge_gateway_rules = cnx.get_edge_gateway_rules(cfg.vdc_edge_gateway,
+                                                          cfg.vdc_id)
+
+          # Create a new table for the network information
+          network_table = Terminal::Table.new
+          network_table.title = 'Vagrant vCloud Director Network Map'
+
+          network_table << ['VM Name', 'Destination NAT Mapping', 'Enabled']
+          network_table << :separator
+
+          # Fetching Destination NAT Rules for each vApp/Edge/VM/Mapping
+          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|
-              # ap vm
-
-              network_table << [vm[0], vm[1][:addresses][0], 'Direct']
-            end
-          else
-
-            vapp_edge_ip = cnx.get_vapp_edge_public_ip(vapp_id)
-            vapp_edge_rules = cnx.get_vapp_port_forwarding_rules(vapp_id)
-            edge_gateway_rules = cnx.get_edge_gateway_rules(cfg.vdc_edge_gateway,
-                                                            cfg.vdc_id)
-
-            # Create a new table for the network information
-            network_table = Terminal::Table.new
-            network_table.title = 'Vagrant vCloud Director Network Map'
-
-            network_table << ['VM Name', 'Destination NAT Mapping', 'Enabled']
-            network_table << :separator
-
-            # Fetching Destination NAT Rules for each vApp/Edge/VM/Mapping
-            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
+              # 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
+          end
 
-            # Fetching Source NAT Rules for the vApp
-            network_table << :separator
-            network_table << ['Network Name', 'Source NAT Mapping', 'Enabled']
-            network_table << :separator
-
-            edge_gateway_rules.each do |edge_gateway_rule|
-              # Only check SNAT and src/dst
-              if edge_gateway_rule[:rule_type] == 'SNAT' &&
-                 edge_gateway_rule[:original_ip] == vapp_edge_ip &&
-                 edge_gateway_rule[:translated_ip] == cfg.vdc_edge_gateway_ip
-
-                network_table << [
-                  edge_gateway_rule[:interface_name],
-                  "#{vapp_edge_ip} -> #{cfg.vdc_edge_gateway_ip}",
-                  edge_gateway_rule[:is_enabled]
-                ]
-              end
+          # Fetching Source NAT Rules for the vApp
+          network_table << :separator
+          network_table << ['Network Name', 'Source NAT Mapping', 'Enabled']
+          network_table << :separator
+
+          edge_gateway_rules.each do |edge_gateway_rule|
+            # Only check SNAT and src/dst
+            if edge_gateway_rule[:rule_type] == 'SNAT' &&
+               edge_gateway_rule[:original_ip] == vapp_edge_ip &&
+               edge_gateway_rule[:translated_ip] == cfg.vdc_edge_gateway_ip
+
+              network_table << [
+                edge_gateway_rule[:interface_name],
+                "#{vapp_edge_ip} -> #{cfg.vdc_edge_gateway_ip}",
+                edge_gateway_rule[:is_enabled]
+              ]
             end
+          end
 
-            # Fetching Edge Gateway Firewall Rules
-            network_table << :separator
-            network_table << ['Rule# - Description', 'Firewall Rules', 'Enabled']
-            network_table << :separator
-            edge_gateway_rules.each do |edge_gateway_rule|
-              # Only add firewall rules
-              if edge_gateway_rule[:rule_type] == 'Firewall'
-                network_table << [
-                  "#{edge_gateway_rule[:id]} - " +
-                  "(#{edge_gateway_rule[:description]})",
-                  "#{edge_gateway_rule[:policy]} " +
-                  "SRC:#{edge_gateway_rule[:source_ip]}:" +
-                  "#{edge_gateway_rule[:source_portrange]} to " +
-                  "DST:#{edge_gateway_rule[:destination_ip]}:" +
-                  "#{edge_gateway_rule[:destination_portrange]}",
-                  "#{edge_gateway_rule[:is_enabled]}"
-                ]
-              end
+          # Fetching Edge Gateway Firewall Rules
+          network_table << :separator
+          network_table << ['Rule# - Description', 'Firewall Rules', 'Enabled']
+          network_table << :separator
+          edge_gateway_rules.each do |edge_gateway_rule|
+            # Only add firewall rules
+            if edge_gateway_rule[:rule_type] == 'Firewall'
+              network_table << [
+                "#{edge_gateway_rule[:id]} - " +
+                "(#{edge_gateway_rule[:description]})",
+                "#{edge_gateway_rule[:policy]} " +
+                "SRC:#{edge_gateway_rule[:source_ip]}:" +
+                "#{edge_gateway_rule[:source_portrange]} to " +
+                "DST:#{edge_gateway_rule[:destination_ip]}:" +
+                "#{edge_gateway_rule[:destination_portrange]}",
+                "#{edge_gateway_rule[:is_enabled]}"
+              ]
             end
           end
-          # Print the Network Table
-          puts
-          puts network_table
+        end
+        # Print the Network Table
+        puts network_table
+      end
+
+      def command_vcloud_redeploy_edge_gw(cfg)
+        cnx = cfg.vcloud_cnx.driver
+
+        organization = cnx.get_organization_by_name(cfg.org_name)
+        cfg.vdc_id = cnx.get_vdc_id_by_name(organization, cfg.vdc_name)
+
+        edge_gw_id = cnx.find_edge_gateway_id(cfg.vdc_edge_gateway, cfg.vdc_id)
+        task_id = cnx.redeploy_edge_gateway(edge_gw_id)
+
+        puts "Redeploying #{cfg.vdc_edge_gateway} vShield Edge Gateway... " +
+             '(This task can take a few minutes)'
+        cnx.wait_task_completion(task_id)
+        puts 'Done'
+      end
+
+      def execute
+        options = {}
+        opts = OptionParser.new do |o|
+          o.banner = 'Usage: vagrant vcloud [options]'
+
+          # We can probably extend this if needed for specific information
+          o.on(
+            '-n',
+            '--network',
+            'Display the vCloud Director network mapping information'
+          ) do |f|
+            options[:network] = true
+          end
+
+          o.on(
+            '-s',
+            '--status',
+            'Display the vCloud Director objects IDs'
+          ) do |f|
+            options[:status] = true
+          end
+
+          o.on(
+            '-r',
+            '--redeploy-edge-gw',
+            'Redeploy the vCloud Director Edge Gateway'
+          ) do |f|
+            options[:redeploy_edge_gw] = true
+          end
+
+        end
+
+        @argv = parse_options(opts)
+        return unless @argv
+
+        # If no arguments, print help
+        if options.keys.count() == 0
+          puts opts
+          exit 1
+        end
+
+        puts 'Initializing vCloud Director provider...'
+        # initialize some variables
+        vapp_id = nil
+        cfg = nil
+
+        # Go through the vagrant machines
+        with_target_vms(@argv) do |machine|
+
+          # FIXME/Bug: why does the provider switch to virtualbox when
+          # destroying VMs within the the vApp:
+          # .vagrant/machines/<machine>/virtualbox Cannot trace why this
+          # happens :-( (tsugliani)
+          if machine.provider_name != :vcloud
+            # Not a vCloud Director provider, exit with explicit error message
+            puts "#{machine.provider_name} provider is incompatible with " +
+                  'this command'
+            exit 1
+          end
 
+          # Force reloads on objects by fetching the ssh_info
+          machine.provider.ssh_info
+
+          # populate cfg & vApp Id for later use.
+          cfg = machine.provider_config
+          vapp_id = machine.get_vapp_id
+          break
+        end
+
+        # iterate through each option and call the according command.
+        options.keys.each do |key|
+          case key
+          when :status
+            command_vcloud_status(cfg, vapp_id)
+          when :network
+            command_vcloud_network(cfg, vapp_id)
+          when :redeploy_edge_gw
+            command_vcloud_redeploy_edge_gw(cfg)
+          end
         end
 
         0

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

@@ -309,9 +309,12 @@ module VagrantPlugins
             # Massive debug when LOG=DEBUG
             # Using awesome_print to get nice XML output for better readability
             if @logger.level == 1
-              ap "SEND #{params['method'].upcase} #{url}"
+              ap "[#{Time.now.ctime}] -> SEND #{params['method'].upcase} #{url}"
               if payload
                 payload_xml = Nokogiri.XML(payload)
+                ap 'SEND HEADERS'
+                ap extheader
+                ap 'SEND BODY'
                 ap payload_xml
               end
             end
@@ -335,9 +338,12 @@ module VagrantPlugins
               # Massive debug when LOG=DEBUG
               # Using awesome_print to get nice XML output for readability
               if @logger.level == 1
-                ap "RECV #{response.status}"
+                ap "[#{Time.now.ctime}] <- RECV #{response.status}"
                 # Just avoid the task spam.
                 if !url.index('/task/')
+                  ap 'RECV HEADERS'
+                  ap response.headers
+                  ap 'RECV BODY'
                   ap nicexml
                 end
               end

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

@@ -47,9 +47,10 @@ module VagrantPlugins
           # Instantiate the proper version driver for vCloud
           @logger.debug("Finding driver for vCloud version: #{@version}")
           driver_map   = {
-            "5.1" => Version_5_1,
-            "5.5" => Version_5_1, # Binding vCloud 5.5 API on our current 5.1 implementation
-            "5.7" => Version_5_1 # Binding vCHS API on our current 5.1 implementation
+            '5.1' => Version_5_1,
+            '5.5' => Version_5_1, # Binding vCloud 5.5 API on our current 5.1 implementation
+            '5.6' => Version_5_1, # Binding vCHS API on our current 5.1 implementation
+            '5.7' => Version_5_1  # Binding vCHS API on our current 5.1 implementation
           }
 
           if @version.start_with?('0.9') ||
@@ -138,11 +139,20 @@ module VagrantPlugins
             end
 
             version_info = Nokogiri.parse(response.body)
-            # FIXME: Find a smarter way to check for vCloud API version
-            # Changed from .first to .last because that's the way it's defined
-            # in the request answer.
+
             api_version = version_info.css('VersionInfo Version')
-            api_version.last.text
+
+            api_version_supported = 0.0
+
+            # Go through each available Version and return the latest supported
+            # version
+            api_version.each do |api_available_version|
+              if api_version_supported.to_f < api_available_version.text.to_f
+                api_version_supported = api_available_version.text
+              end
+            end
+
+            api_version_supported
 
           rescue SocketError
             raise Errors::HostNotFound, :message => host_url

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

@@ -1107,6 +1107,22 @@ module VagrantPlugins
           end
         end
 
+        ##
+        # Redeploy the vShield Edge Gateway VM, due to some knowns issues
+        # where the current rules are not "applied" and the EdgeGW is in an
+        # unmanageable state.
+        #
+        def redeploy_edge_gateway(edge_gateway_id)
+          params = {
+            'method'  => :post,
+            'command' => "/admin/edgeGateway/#{edge_gateway_id}/action/redeploy"
+          }
+
+          _response, headers = send_request(params)
+          task_id = headers['Location'].gsub("#{@api_url}/task/", '')
+          task_id
+        end
+
         ##
         # Find an edge gateway network from the edge name and vdc_id, and ip
         #
@@ -1364,7 +1380,7 @@ module VagrantPlugins
           nat_rules = set_edge_rules.at_css('NatService')
 
           # Add all DNAT port rules edge -> vApp for the given list
-          ports.each do |port| 
+          ports.each do |port|
             nat_rule = Nokogiri::XML::Builder.new do |xml|
                 xml.NatRule {
                   xml.RuleType 'DNAT'
@@ -1394,7 +1410,7 @@ module VagrantPlugins
                     xml.Protocol 'any'
                   }
                 }
-            end             
+            end
             nat_rules << snat_rule.doc.root.to_xml
           end
 
@@ -1414,7 +1430,7 @@ module VagrantPlugins
                 xml.SourceIp 'Any'
                 xml.EnableLogging 'false'
               }
-          end           
+          end
           fw_rules = set_edge_rules.at_css('FirewallService')
             fw_rules << firewall_rule_1.doc.root.to_xml
           end
@@ -1438,7 +1454,7 @@ module VagrantPlugins
           task_id
         end
 
-        
+
         ##
         # get vApp edge public IP from the vApp ID
         # Only works when:
@@ -1697,9 +1713,9 @@ module VagrantPlugins
           task, errormsg = nil
           loop do
             task = get_task(task_id)
-            @logger.debug(
-              "Evaluating taskid: #{task_id}, current status #{task[:status]}"
-            )
+            # @logger.debug(
+            #  "Evaluating taskid: #{task_id}, current status #{task[:status]}"
+            # )
             break if !['queued','preRunning','running'].include?(task[:status])
             sleep 5
           end

data/lib/vagrant-vcloud/plugin.rb

@@ -30,9 +30,20 @@ module VagrantPlugins
         Provider
       end
 
+      # Add vagrant share support
+      provider_capability('vcloud', 'public_address') do
+        require_relative 'cap/public_address'
+        Cap::PublicAddress
+      end
+
+      provider_capability(:vcloud, :forwarded_ports) do
+        require_relative "cap/forwarded_ports"
+        Cap::ForwardedPorts
+      end
+
       # Added a vagrant vcloud-status command to enhance troubleshooting and
       # visibility.
-      command('vcloud-status') do
+      command('vcloud') do
         require_relative 'command'
         Command
       end

data/lib/vagrant-vcloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VCloud
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/locales/en.yml

@@ -1,8 +1,9 @@
-en: 
-  vagrant_vcloud: 
+en:
+  vagrant_vcloud:
     vm_not_created: "The VM has not been created"
     will_not_destroy: "VM will not be destroyed"
     vm_already_running: "VM is already running"
+    vm_not_running: "VM is not running"
     vm_halted_cannot_suspend: "VM is not running or already suspended, cannot suspend it."
     sync:
       rsync_not_found_warning: |-
@@ -10,7 +11,7 @@ en:
         Make sure rsync is installed and the binary can be found in the PATH.
       rsync_folder: |-
         Rsyncing folder: %{hostpath} => %{guestpath}
-    config: 
+    config:
       api_version: "Configuration must specify a vCloud API version (default=5.1)"
       catalog_name: "Configuration must specify a vCloud Director Catalog (for the VM templates images)"
       ip_dns: "DNS configuration must be specified as an Array type"
@@ -23,7 +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)"
-    errors: 
+    errors:
       missing_compute_resource: "Configured compute resource not found"
       missing_datacenter: "Configured data center not found"
       missing_resource_pool: "Configured resource pool not found"
@@ -37,7 +38,7 @@ en:
       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}"
       forward_port_collision: "Port collision detected, change it in the Vagrantfile or add auto_correct: true. %{guest_port} => %{host_port}"
-      rest_errors: 
+      rest_errors:
         object_not_found: "Object not found in vCloud Director"
         invalid_config_error: "Invalid Guest Customization Specified"
         invalid_state_error: "Invalid vApp State %{message}"
@@ -58,7 +59,7 @@ en:
         Host path: %{hostpath}
         Error: %{err}
 
-    states: 
+    states:
       not_created: |-
         The environment has not yet been created. Run `vagrant up` to
         create the environment. If a machine is not created, only the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fabio Rapposelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -215,6 +215,7 @@ files:
 - lib/vagrant-vcloud/action/message_already_running.rb
 - lib/vagrant-vcloud/action/message_cannot_suspend.rb
 - lib/vagrant-vcloud/action/message_not_created.rb
+- lib/vagrant-vcloud/action/message_not_running.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
@@ -225,6 +226,8 @@ files:
 - lib/vagrant-vcloud/action/suspend.rb
 - lib/vagrant-vcloud/action/sync_folders.rb
 - lib/vagrant-vcloud/action/unmap_port_forwardings.rb
+- lib/vagrant-vcloud/cap/forwarded_ports.rb
+- lib/vagrant-vcloud/cap/public_address.rb
 - lib/vagrant-vcloud/command.rb
 - lib/vagrant-vcloud/config.rb
 - lib/vagrant-vcloud/driver/base.rb