vagrant-vcloud 0.1.2 → 0.2.0

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

@@ -0,0 +1,30 @@
+module VagrantPlugins
+  module VCloud
+    module Action
+      class IsBridged
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant_vcloud::action::is_bridged")
+        end
+
+        def call(env)
+         
+          vAppId = 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)
+          rescue
+            @logger.debug("Setting the bridged_network environment var to true")
+            env[:bridged_network] = true
+          end
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -4,27 +4,26 @@ module VagrantPlugins
       class IsCreated
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::is_created")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::is_created')
         end
 
         def call(env)
-         
-          vAppId = env[:machine].get_vapp_id
-          
-          if vAppId.nil?
-            @logger.warn("vApp has not been created")
+          vapp_id = env[:machine].get_vapp_id
+
+          if vapp_id.nil?
+            @logger.warn('vApp has not been created')
             env[:result] = false
           else
-            @logger.info("vApp has been created and ID is: [#{vAppId}]")
-            
-            vmId = env[:machine].id
-            if vmId
-              @logger.info("VM has been added to vApp and ID is: [#{vmId}]")
+            @logger.info("vApp has been created and ID is: [#{vapp_id}]")
+
+            vm_id = env[:machine].id
+            if vm_id
+              @logger.info("VM has been added to vApp and ID is: [#{vm_id}]")
               env[:result] = true
-           else
-              @logger.warn("VM has not been added to vApp")
+            else
+              @logger.warn('VM has not been added to vApp')
               env[:result] = false
-           end
+            end
 
           end
 

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

@@ -1,5 +1,3 @@
-require "i18n"
-
 module VagrantPlugins
   module VCloud
     module Action

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

@@ -1,5 +1,3 @@
-require "i18n"
-
 module VagrantPlugins
   module VCloud
     module Action

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

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def call(env)
           # FIXME: This error should be categorized
-          env[:ui].info(I18n.t("vagrant_vcloud.vm_already_running"))
+          env[:ui].info(I18n.t('vagrant_vcloud.vm_already_running'))
           @app.call(env)
         end
       end

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

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def call(env)
           # FIXME: This error should be categorized
-          env[:ui].info(I18n.t("vagrant_vcloud.vm_halted_cannot_suspend"))
+          env[:ui].info(I18n.t('vagrant_vcloud.vm_halted_cannot_suspend'))
           @app.call(env)
         end
       end

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

@@ -8,7 +8,7 @@ module VagrantPlugins
 
         def call(env)
           # FIXME: this error should be categorized
-          env[:ui].info(I18n.t("vcloud.vm_not_created"))
+          env[:ui].info(I18n.t('vcloud.vm_not_created'))
           @app.call(env)
         end
       end

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

@@ -8,7 +8,12 @@ module VagrantPlugins
 
         def call(env)
           # FIXME: This error should be categorized
-          env[:ui].info(I18n.t("vagrant_vcloud.will_not_destroy", name: env[:machine].name))
+          env[:ui].info(
+            I18n.t(
+              'vagrant_vcloud.will_not_destroy',
+              name: env[:machine].name
+            )
+          )
           @app.call(env)
         end
       end

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

@@ -1,48 +1,43 @@
-require "i18n"
-
 module VagrantPlugins
   module VCloud
     module Action
       class PowerOff
-
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::poweroff")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::poweroff')
         end
 
         def call(env)
-
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
 
-          vAppId = env[:machine].get_vapp_id
-          vmId = env[:machine].id
-          vmName = env[:machine].name
+          vapp_id = env[:machine].get_vapp_id
+          vm_id = env[:machine].id
 
-          testvApp = cnx.get_vapp(vAppId)
+          test_vapp = cnx.get_vapp(vapp_id)
 
-          @logger.debug("Number of VMs in the vApp: #{testvApp[:vms_hash].count}")
+          @logger.debug(
+            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
+          )
 
-          if testvApp[:vms_hash].count == 1
+          if test_vapp[:vms_hash].count == 1
 
             # Poweroff vApp
-            env[:ui].info("Powering off vApp...")
-            vAppStopTask = cnx.poweroff_vapp(vAppId)
-            vAppStopWait = cnx.wait_task_completion(vAppStopTask)
+            env[:ui].info('Powering off vApp...')
+            vapp_stop_task = cnx.poweroff_vapp(vapp_id)
+            vapp_stop_wait = cnx.wait_task_completion(vapp_stop_task)
 
-            if !vAppStopWait[:errormsg].nil?
-              raise Errors::StopVAppError, :message => vAppStopWait[:errormsg]
+            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(vmId)
-            wait = cnx.wait_task_completion(task_id)
+            env[:ui].info('Powering off VM...')
+            task_id = cnx.poweroff_vm(vm_id)
+            cnx.wait_task_completion(task_id)
           end
 
-          true
-
           @app.call env
         end
       end

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

@@ -1,41 +1,80 @@
-require "i18n"
-
 module VagrantPlugins
   module VCloud
     module Action
       class PowerOn
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::power_on")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::power_on')
         end
 
         def call(env)
           @env = env
 
-
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vmName = env[:machine].name
-          vAppId = env[:machine].get_vapp_id
-
-	      env[:ui].info("Booting VM...")
-
-        testIp = cnx.get_vapp_edge_public_ip(vAppId)
-
-        poweronVM = cnx.poweron_vm(env[:machine].id)
-        cnx.wait_task_completion(poweronVM)
-
-        if testIp.nil? && cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-          @logger.debug("This is our first boot, we should map ports on org edge!")
-
-          env[:ui].info("Creating NAT rules on [#{cfg.vdc_edge_gateway}] for IP [#{cfg.vdc_edge_gateway_ip}].")
-
-          edgeMap = cnx.set_edge_gateway_rules(cfg.vdc_edge_gateway, cfg.vdc_id, cfg.vdc_edge_gateway_ip, vAppId)
-          cnx.wait_task_completion(edgeMap)
-        end
-
-
-
+          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
+
+          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
@@ -43,6 +82,3 @@ module VagrantPlugins
     end
   end
 end
-
-
-

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

@@ -2,12 +2,10 @@ 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")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::read_ssh_info')
         end
 
         def call(env)
@@ -16,49 +14,67 @@ module VagrantPlugins
           @app.call env
         end
 
-
         def read_ssh_info(env)
           return nil if env[:machine].id.nil?
 
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vmName = env[:machine].name
-          vAppId = env[:machine].get_vapp_id
+          vapp_id = env[:machine].get_vapp_id
+          vm_name = env[:machine].name
 
-          @logger.debug("Getting vapp info...")
-          vm = cnx.get_vapp(vAppId)
-          myhash = vm[:vms_hash][vmName.to_sym]
+          @logger.debug('Getting vApp information...')
+          vm = cnx.get_vapp(vapp_id)
+          myhash = vm[:vms_hash][vm_name.to_sym]
 
           if vm.nil?
-            # The machine can't be found
-            @logger.info("Machine couldn't be found, assuming it got destroyed.")
+            # The Virtual Machine couldn't be found.
+            @logger.info(
+              'Machine couldn\'t be found, assuming it got destroyed.'
+            )
             machine.id = nil
             return nil
           end
 
-          @logger.debug("Getting port forwarding rules...")
-          rules = cnx.get_vapp_port_forwarding_rules(vAppId)
-          
-          rules.each do |rule|
-            if rule[:vapp_scoped_local_id] == myhash[:vapp_scoped_local_id] && rule[:nat_internal_port] == "22"              
-              @externalIP = rule[:nat_external_ip]
-              @externalPort = rule[:nat_external_port]
-              break
+          if !cfg.network_bridge.nil?
+            @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]}")
+            @external_ip = vm_info[:networks]['Vagrant-vApp-Net'][:ip]
+            @external_port = '22'
+          else
+
+            @logger.debug('Getting port forwarding rules...')
+            rules = cnx.get_vapp_port_forwarding_rules(vAppId)
+
+            rules.each do |rule|
+              if rule[:vapp_scoped_local_id] == myhash[:vapp_scoped_local_id] \
+                 && rule[:nat_internal_port] == '22'
+
+                @external_ip = rule[:nat_external_ip]
+                @external_port = rule[:nat_external_port]
+                break
+
+              end
             end
-          end
 
-          if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-            @logger.debug("We're running vagrant behind an org edge")
-            @externalIP = cfg.vdc_edge_gateway_ip
+            if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
+              @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 #{@externalIP} and Port #{@externalPort}")
+          # @logger.debug(
+          #  "Our variables: IP #{@external_ip} and Port #{@external_port}"
+          # )
 
-          return {
-            # FIXME: these shouldn't be self
-              :host => @externalIP,
-              :port => @externalPort
+          {
+              # FIXME: these shouldn't be self
+              :host => @external_ip,
+              :port => @external_port
           }
         end
       end

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

@@ -1,57 +1,50 @@
-require "log4r"
-
 module VagrantPlugins
   module VCloud
     module Action
       class ReadState
-
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::read_state")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::read_state')
         end
 
         def call(env)
-          #env = read_state(env)
-            
-          env[:machine_state_id] = read_state(env) 
-          
+          env[:machine_state_id] = read_state(env)
+
           @app.call env
         end
 
         def read_state(env)
-
           # FIXME: this part needs some cleanup
-
           begin
             cfg = env[:machine].provider_config
             cnx = cfg.vcloud_cnx.driver
-            vAppId = env[:machine].get_vapp_id
-            vmName = env[:machine].name
+            vapp_id = env[:machine].get_vapp_id
+            vm_name = env[:machine].name
 
             if env[:machine].id.nil?
-              @logger.info("VM [#{vmName}] is not created yet")
+              @logger.info("VM [#{vm_name}] is not created yet")
               return :not_created
             end
 
-            vApp = cnx.get_vapp(vAppId)
-            vmStatus = vApp[:vms_hash][vmName][:status]
+            vapp = cnx.get_vapp(vapp_id)
+            vm_status = vapp[:vms_hash][vm_name][:status]
 
-            if vmStatus == "stopped"
-              @logger.info("VM [#{vmName}] is stopped")
+            if vm_status == 'stopped'
+              @logger.info("VM [#{vm_name}] is stopped")
               return :stopped
-            elsif vmStatus == "running"
-              @logger.info("VM [#{vmName}] is running")
+            elsif vm_status == 'running'
+              @logger.info("VM [#{vm_name}] is running")
               return :running
-            elsif vmStatus == "paused"
-              @logger.info("VM [#{vmName}] is suspended")
+            elsif vm_status == 'paused'
+              @logger.info("VM [#{vm_name}] is suspended")
               return :suspended
             end
           rescue Exception => e
             ### When bad credentials, we get here.
             @logger.debug("Couldn't Read VM State: #{e.message}")
-            raise VagrantPlugins::VCloud::Errors::VCloudError, :message => e.message
+            raise VagrantPlugins::VCloud::Errors::VCloudError,
+                  :message => e.message
           end
-          
         end
       end
     end