vagrant-cloudstack 1.3.0 → 1.4.0

data/lib/vagrant-cloudstack/action/start_instance.rb

@@ -1,81 +1,81 @@
-require "log4r"
-require "vagrant/util/retryable"
-require "vagrant-cloudstack/util/timer"
-
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This starts a stopped instance.
-      class StartInstance
-        include Vagrant::Util::Retryable
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_cloudstack::action::start_instance")
-        end
-
-        def call(env)
-          # Initialize metrics if they haven't been
-          env[:metrics] ||= {}
-
-          server = env[:cloudstack_compute].servers.get(env[:machine].id)
-
-          env[:ui].info(I18n.t("vagrant_cloudstack.starting"))
-
-          begin
-            server.start
-
-            domain                               = env[:machine].provider_config.domain_id
-            domain_config                        = env[:machine].provider_config.get_domain_config(domain)
-
-            # Wait for the instance to be ready first
-            env[:metrics]["instance_ready_time"] = Util::Timer.time do
-              tries = domain_config.instance_ready_timeout / 2
-
-              env[:ui].info(I18n.t("vagrant_cloudstack.waiting_for_ready"))
-              begin
-                retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
-                  # If we're interrupted don't worry about waiting
-                  next if env[:interrupted]
-
-                  # Wait for the server to be ready
-                  server.wait_for(2) { ready? }
-                end
-              rescue Fog::Errors::TimeoutError
-                # Notify the user
-                raise Errors::InstanceReadyTimeout,
-                   :timeout => domain_config.instance_ready_timeout
-              end
-            end
-          rescue Fog::Compute::Cloudstack::Error => e
-            raise Errors::FogError, :message => e.message
-          end
-
-          @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
-
-          if !env[:interrupted]
-            env[:metrics]["instance_ssh_time"] = Util::Timer.time do
-              # Wait for communicator to be ready.
-              communicator = env[:machine].config.vm.communicator
-              communicator = "SSH" if communicator.nil?
-              env[:ui].info(I18n.t("vagrant_cloudstack.waiting_for_communicator", :communicator => communicator.to_s.upcase))
-              while true
-                # If we're interrupted then just back out
-                break if env[:interrupted]
-                break if env[:machine].communicate.ready?
-                sleep 2
-              end
-            end
-
-            @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
-
-            # Ready and booted!
-            env[:ui].info(I18n.t("vagrant_cloudstack.ready"))
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require "log4r"
+require "vagrant/util/retryable"
+require "vagrant-cloudstack/util/timer"
+
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This starts a stopped instance.
+      class StartInstance
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_cloudstack::action::start_instance")
+        end
+
+        def call(env)
+          # Initialize metrics if they haven't been
+          env[:metrics] ||= {}
+
+          server = env[:cloudstack_compute].servers.get(env[:machine].id)
+
+          env[:ui].info(I18n.t("vagrant_cloudstack.starting"))
+
+          begin
+            server.start
+
+            domain                               = env[:machine].provider_config.domain_id
+            domain_config                        = env[:machine].provider_config.get_domain_config(domain)
+
+            # Wait for the instance to be ready first
+            env[:metrics]["instance_ready_time"] = Util::Timer.time do
+              tries = domain_config.instance_ready_timeout / 2
+
+              env[:ui].info(I18n.t("vagrant_cloudstack.waiting_for_ready"))
+              begin
+                retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
+                  # If we're interrupted don't worry about waiting
+                  next if env[:interrupted]
+
+                  # Wait for the server to be ready
+                  server.wait_for(2) { ready? }
+                end
+              rescue Fog::Errors::TimeoutError
+                # Notify the user
+                raise Errors::InstanceReadyTimeout,
+                   :timeout => domain_config.instance_ready_timeout
+              end
+            end
+          rescue Fog::Compute::Cloudstack::Error => e
+            raise Errors::FogError, :message => e.message
+          end
+
+          @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
+
+          if !env[:interrupted]
+            env[:metrics]["instance_ssh_time"] = Util::Timer.time do
+              # Wait for communicator to be ready.
+              communicator = env[:machine].config.vm.communicator
+              communicator = "SSH" if communicator.nil?
+              env[:ui].info(I18n.t("vagrant_cloudstack.waiting_for_communicator", :communicator => communicator.to_s.upcase))
+              while true
+                # If we're interrupted then just back out
+                break if env[:interrupted]
+                break if env[:machine].communicate.ready?
+                sleep 2
+              end
+            end
+
+            @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
+
+            # Ready and booted!
+            env[:ui].info(I18n.t("vagrant_cloudstack.ready"))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/action/stop_instance.rb

@@ -1,28 +1,28 @@
-require "log4r"
-
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This stops the running instance.
-      class StopInstance
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_cloudstack::action::stop_instance")
-        end
-
-        def call(env)
-          server = env[:cloudstack_compute].servers.get(env[:machine].id)
-
-          if env[:machine].state.id == :stopped
-            env[:ui].info(I18n.t("vagrant_cloudstack.already_status", :status => env[:machine].state.id))
-          else
-            env[:ui].info(I18n.t("vagrant_cloudstack.stopping"))
-            server.stop({'force' => !!env[:force_halt]})
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This stops the running instance.
+      class StopInstance
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_cloudstack::action::stop_instance")
+        end
+
+        def call(env)
+          server = env[:cloudstack_compute].servers.get(env[:machine].id)
+
+          if env[:machine].state.id == :stopped
+            env[:ui].info(I18n.t("vagrant_cloudstack.already_status", :status => env[:machine].state.id))
+          else
+            env[:ui].info(I18n.t("vagrant_cloudstack.stopping"))
+            server.stop({'force' => !!env[:force_halt]})
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/action/terminate_instance.rb

@@ -1,224 +1,269 @@
-require 'log4r'
-
-module VagrantPlugins
-  module Cloudstack
-    module Action
-      # This terminates the running instance.
-      class TerminateInstance
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_cloudstack::action::terminate_instance')
-        end
-
-        def call(env)
-          # Delete the Firewall rule
-          remove_firewall_rules(env)
-
-          # Disable Static NAT
-          remove_static_nat(env)
-
-          # Delete the Port forwarding rule
-          remove_portforwarding(env)
-
-          # Destroy the server and remove the tracking ID
-          if env[:machine].id.nil?
-            env[:ui].info(I18n.t('vagrant_cloudstack.no_instance_found'))
-            return
-          else
-            server = env[:cloudstack_compute].servers.get(env[:machine].id)
-
-            env[:ui].info(I18n.t('vagrant_cloudstack.terminating'))
-
-            domain = env[:machine].provider_config.domain_id
-            domain_config = env[:machine].provider_config.get_domain_config(domain)
-            expunge_on_destroy = domain_config.expunge_on_destroy
-
-            options = {}
-            options['expunge'] = expunge_on_destroy
-
-            job = server.destroy(options)
-            while true
-              response = env[:cloudstack_compute].query_async_job_result({:jobid => job.id})
-              if response['queryasyncjobresultresponse']['jobstatus'] != 0
-                break
-              else
-                env[:ui].info('Waiting for instance to be deleted')
-                sleep 2
-              end
-            end
-          end
-
-          # Delete the vmcredentials file
-          remove_stored_credentials(env)
-
-          # Remove keyname from cloudstack
-          remove_generated_ssh_key(env)
-
-          remove_security_groups(env)
-
-          env[:machine].id = nil
-
-          @app.call(env)
-        end
-
-        def remove_security_groups(env)
-          security_groups_file = env[:machine].data_dir.join('security_groups')
-          if security_groups_file.file?
-            File.read(security_groups_file).each_line do |line|
-              security_group_id = line.strip
-              begin
-                security_group = env[:cloudstack_compute].security_groups.get(security_group_id)
-
-                security_group.ingress_rules.each do |ir|
-                  env[:cloudstack_compute].revoke_security_group_ingress({:id => ir['ruleid']})
-                end
-                env[:ui].info('Deleted ingress rules')
-
-                security_group.egress_rules.each do |er|
-                  env[:cloudstack_compute].revoke_security_group_egress({:id => er['ruleid']})
-                end
-                env[:ui].info('Deleted egress rules')
-
-              rescue Fog::Compute::Cloudstack::Error => e
-                raise Errors::FogError, :message => e.message
-              end
-
-              begin
-                env[:cloudstack_compute].delete_security_group({:id => security_group_id})
-              rescue Fog::Compute::Cloudstack::Error => e
-                env[:ui].warn("Couldn't delete group right now.")
-                env[:ui].warn('Waiting 30 seconds to retry')
-                sleep 30
-                retry
-              end
-            end
-            security_groups_file.delete
-          end
-        end
-
-        def remove_generated_ssh_key(env)
-          sshkeyname_file = env[:machine].data_dir.join('sshkeyname')
-          if sshkeyname_file.file?
-            env[:ui].info(I18n.t('vagrant_cloudstack.ssh_key_pair_removing'))
-            sshkeyname = ''
-            File.read(sshkeyname_file).each_line do |line|
-              sshkeyname = line.strip
-            end
-
-            begin
-              response = env[:cloudstack_compute].delete_ssh_key_pair(name: sshkeyname)
-              env[:ui].warn(I18n.t('vagrant_cloudstack.ssh_key_pair_no_success_removing', name: sshkeyname)) unless response['deletesshkeypairresponse']['success'] == 'true'
-            rescue Fog::Compute::Cloudstack::Error => e
-              env[:ui].warn(I18n.t('vagrant_cloudstack.errors.fog_error', :message => e.message))
-            end
-            sshkeyname_file.delete
-          end
-        end
-
-        def remove_stored_credentials(env)
-          vmcredentials_file = env[:machine].data_dir.join('vmcredentials')
-          vmcredentials_file.delete if vmcredentials_file.file?
-        end
-
-        def remove_portforwarding(env)
-          env[:ui].info(I18n.t('vagrant_cloudstack.deleting_port_forwarding_rule'))
-          port_forwarding_file = env[:machine].data_dir.join('port_forwarding')
-          if port_forwarding_file.file?
-            File.read(port_forwarding_file).each_line do |line|
-              rule_id = line.strip
-              begin
-                resp = env[:cloudstack_compute].delete_port_forwarding_rule({:id => rule_id})
-                job_id = resp['deleteportforwardingruleresponse']['jobid']
-                while true
-                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
-                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
-                    break
-                  else
-                    sleep 2
-                  end
-                end
-              rescue Fog::Compute::Cloudstack::Error => e
-                if e.message =~ /Unable to execute API command deleteportforwardingrule.*entity does not exist/
-                  env[:ui].warn(" -- Failed to delete portforwarding rule: #{e.message}")
-                else
-                  raise Errors::FogError, :message => e.message
-                end
-
-              end
-            end
-            port_forwarding_file.delete
-          end
-
-          # Delete the Communicator Port forwording public port file
-          # Delete the RDP Port forwording public port file
-          %w(pf_public_port pf_public_rdp_port).each do |pf_filename|
-            pf_file = env[:machine].data_dir.join(pf_filename)
-            pf_file.delete if pf_file.file?
-          end
-        end
-
-        def remove_static_nat(env)
-          env[:ui].info(I18n.t('vagrant_cloudstack.disabling_static_nat'))
-          static_nat_file = env[:machine].data_dir.join('static_nat')
-          if static_nat_file.file?
-            File.read(static_nat_file).each_line do |line|
-              ip_address_id = line.strip
-              begin
-                options = {
-                    :command => 'disableStaticNat',
-                    :ipaddressid => ip_address_id
-                }
-                resp = env[:cloudstack_compute].request(options)
-                job_id = resp['disablestaticnatresponse']['jobid']
-                while true
-                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
-                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
-                    break
-                  else
-                    sleep 2
-                  end
-                end
-              rescue Fog::Compute::Cloudstack::Error => e
-                raise Errors::FogError, :message => e.message
-              end
-            end
-            static_nat_file.delete
-          end
-        end
-
-        def remove_firewall_rules(env)
-          env[:ui].info(I18n.t('vagrant_cloudstack.deleting_firewall_rule'))
-          firewall_file = env[:machine].data_dir.join('firewall')
-          if firewall_file.file?
-            File.read(firewall_file).each_line do |line|
-              rule_id = line.strip
-              begin
-                options = {
-                    :command => 'deleteFirewallRule',
-                    :id => rule_id
-                }
-                resp = env[:cloudstack_compute].request(options)
-                job_id = resp['deletefirewallruleresponse']['jobid']
-                while true
-                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
-                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
-                    break
-                  else
-                    sleep 2
-                  end
-                end
-              rescue Fog::Compute::Cloudstack::Error => e
-                if e.message =~ /Unable to execute API command deletefirewallrule.*entity does not exist/
-                  env[:ui].warn(" -- Failed to delete firewall rule: #{e.message}")
-                else
-                  raise Errors::FogError, :message => e.message
-                end
-              end
-            end
-            firewall_file.delete
-          end
-        end
-      end
-    end
-  end
-end
+require 'log4r'
+
+module VagrantPlugins
+  module Cloudstack
+    module Action
+      # This terminates the running instance.
+      class TerminateInstance
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new('vagrant_cloudstack::action::terminate_instance')
+        end
+
+        def call(env)
+          # Delete the Firewall rule
+          remove_firewall_rules(env)
+
+          # Disable Static NAT
+          remove_static_nat(env)
+
+          # Delete the Port forwarding rule
+          remove_portforwarding(env)
+
+          # Destroy the server and remove the tracking ID
+          if env[:machine].id.nil?
+            env[:ui].info(I18n.t('vagrant_cloudstack.no_instance_found'))
+            return
+          else
+            server = env[:cloudstack_compute].servers.get(env[:machine].id)
+
+            env[:ui].info(I18n.t('vagrant_cloudstack.terminating'))
+
+            domain = env[:machine].provider_config.domain_id
+            domain_config = env[:machine].provider_config.get_domain_config(domain)
+            expunge_on_destroy = domain_config.expunge_on_destroy
+
+            options = {}
+            options['expunge'] = expunge_on_destroy
+
+            job = server.destroy(options)
+            while true
+              response = env[:cloudstack_compute].query_async_job_result({:jobid => job.id})
+              if response['queryasyncjobresultresponse']['jobstatus'] != 0
+                break
+              else
+                env[:ui].info('Waiting for instance to be deleted')
+                sleep 2
+              end
+            end
+          end
+
+          remove_volumes(env)
+
+          # Delete the vmcredentials file
+          remove_stored_credentials(env)
+
+          # Remove keyname from cloudstack
+          remove_generated_ssh_key(env)
+
+          remove_security_groups(env)
+
+          env[:machine].id = nil
+
+          env[:ui].info(I18n.t('vagrant_cloudstack.terminateinstance_done'))
+          @app.call(env)
+        end
+
+        def remove_volumes(env)
+          volumes_file = env[:machine].data_dir.join('volumes')
+          if volumes_file.file?
+            env[:ui].info(I18n.t('vagrant_cloudstack.deleting_volumes'))
+            File.read(volumes_file).each_line do |line|
+              volume_id = line.strip
+              begin
+                resp = env[:cloudstack_compute].detach_volume({:id => volume_id})
+                job_id = resp['detachvolumeresponse']['jobid']
+                while true
+                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
+                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
+                    break
+                  else
+                    sleep 2
+                  end
+                end
+              rescue Fog::Compute::Cloudstack::Error => e
+                if e.message =~ /Unable to execute API command detachvolume.*entity does not exist/
+                  env[:ui].warn(I18n.t('vagrant_cloudstack.detach_volume_failed', message: e.message))
+                else
+                  raise Errors::FogError, :message => e.message
+                end
+              end
+              resp = env[:cloudstack_compute].delete_volume({:id => volume_id})
+              env[:ui].warn(I18n.t('vagrant_cloudstack.detach_volume_failed', volume_id: volume_id)) unless resp['deletevolumeresponse']['success'] == 'true'
+            end
+            volumes_file.delete
+          end
+        end
+
+        def remove_security_groups(env)
+          security_groups_file = env[:machine].data_dir.join('security_groups')
+          if security_groups_file.file?
+            File.read(security_groups_file).each_line do |line|
+              security_group_id = line.strip
+              begin
+                security_group = env[:cloudstack_compute].security_groups.get(security_group_id)
+
+                security_group.ingress_rules.each do |ir|
+                  env[:cloudstack_compute].revoke_security_group_ingress({:id => ir['ruleid']})
+                end
+                env[:ui].info('Deleted ingress rules')
+
+                security_group.egress_rules.each do |er|
+                  env[:cloudstack_compute].revoke_security_group_egress({:id => er['ruleid']})
+                end
+                env[:ui].info('Deleted egress rules')
+
+              rescue Fog::Compute::Cloudstack::Error => e
+                raise Errors::FogError, :message => e.message
+              end
+
+              begin
+                env[:cloudstack_compute].delete_security_group({:id => security_group_id})
+              rescue Fog::Compute::Cloudstack::Error => e
+                env[:ui].warn("Couldn't delete group right now.")
+                env[:ui].warn('Waiting 30 seconds to retry')
+                sleep 30
+                retry
+              end
+            end
+            security_groups_file.delete
+          end
+        end
+
+        def remove_generated_ssh_key(env)
+          sshkeyname_file = env[:machine].data_dir.join('sshkeyname')
+          if sshkeyname_file.file?
+            env[:ui].info(I18n.t('vagrant_cloudstack.ssh_key_pair_removing'))
+            sshkeyname = ''
+            File.read(sshkeyname_file).each_line do |line|
+              sshkeyname = line.strip
+            end
+
+            begin
+              response = env[:cloudstack_compute].delete_ssh_key_pair(name: sshkeyname)
+              env[:ui].warn(I18n.t('vagrant_cloudstack.ssh_key_pair_no_success_removing', name: sshkeyname)) unless response['deletesshkeypairresponse']['success'] == 'true'
+            rescue Fog::Compute::Cloudstack::Error => e
+              env[:ui].warn(I18n.t('vagrant_cloudstack.errors.fog_error', :message => e.message))
+            end
+            sshkeyname_file.delete
+          end
+        end
+
+        def remove_stored_credentials(env)
+          vmcredentials_file = env[:machine].data_dir.join('vmcredentials')
+          vmcredentials_file.delete if vmcredentials_file.file?
+        end
+
+        def remove_portforwarding(env)
+          env[:ui].info(I18n.t('vagrant_cloudstack.deleting_port_forwarding_rule'))
+          port_forwarding_file = env[:machine].data_dir.join('port_forwarding')
+          if port_forwarding_file.file?
+            File.read(port_forwarding_file).each_line do |line|
+              rule_id = line.strip
+              begin
+                resp = env[:cloudstack_compute].delete_port_forwarding_rule({:id => rule_id})
+                job_id = resp['deleteportforwardingruleresponse']['jobid']
+                while true
+                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
+                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
+                    break
+                  else
+                    sleep 2
+                  end
+                end
+              rescue Fog::Compute::Cloudstack::Error => e
+                if e.message =~ /Unable to execute API command deleteportforwardingrule.*entity does not exist/
+                  env[:ui].warn(" -- Failed to delete portforwarding rule: #{e.message}")
+                else
+                  raise Errors::FogError, :message => e.message
+                end
+
+              end
+            end
+            port_forwarding_file.delete
+          end
+
+          # Delete the Communicator Port forwording public port file
+          # Delete the RDP Port forwording public port file
+          %w(pf_public_port pf_public_rdp_port).each do |pf_filename|
+            pf_file = env[:machine].data_dir.join(pf_filename)
+            pf_file.delete if pf_file.file?
+          end
+        end
+
+        def remove_static_nat(env)
+          env[:ui].info(I18n.t('vagrant_cloudstack.disabling_static_nat'))
+          static_nat_file = env[:machine].data_dir.join('static_nat')
+          if static_nat_file.file?
+            File.read(static_nat_file).each_line do |line|
+              ip_address_id = line.strip
+              begin
+                options = {
+                    :command => 'disableStaticNat',
+                    :ipaddressid => ip_address_id
+                }
+                resp = env[:cloudstack_compute].request(options)
+                job_id = resp['disablestaticnatresponse']['jobid']
+                while true
+                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
+                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
+                    break
+                  else
+                    sleep 2
+                  end
+                end
+              rescue Fog::Compute::Cloudstack::Error => e
+                raise Errors::FogError, :message => e.message
+              end
+            end
+            static_nat_file.delete
+          end
+        end
+
+        def remove_firewall_rules(env)
+          env[:ui].info(I18n.t('vagrant_cloudstack.deleting_firewall_rule'))
+          firewall_file = env[:machine].data_dir.join('firewall')
+          if firewall_file.file?
+            File.read(firewall_file).each_line do |line|
+              line_items=line.split(",").collect(&:strip)
+              rule_id = line_items[0]
+              type_string = line_items[1]
+
+              if type_string == 'firewallrule'
+                command_string = 'deleteFirewallRule'
+                response_string = 'deletefirewallruleresponse'
+              else
+                command_string = 'deleteNetworkACL'
+                response_string = 'deletenetworkaclresponse'
+              end
+
+              begin
+                options = {
+                    command: command_string,
+                    id: rule_id
+                }
+                resp = env[:cloudstack_compute].request(options)
+                job_id = resp[response_string]['jobid']
+                while true
+                  response = env[:cloudstack_compute].query_async_job_result({:jobid => job_id})
+                  if response['queryasyncjobresultresponse']['jobstatus'] != 0
+                    break
+                  else
+                    sleep 2
+                  end
+                end
+              rescue Fog::Compute::Cloudstack::Error => e
+                if e.message =~ /Unable to execute API command deletefirewallrule.*entity does not exist/
+                  env[:ui].warn(" -- Failed to delete #{type_string}: #{e.message}")
+                else
+                  raise Errors::FogError, :message => e.message
+                end
+              end
+            end
+            firewall_file.delete
+          end
+        end
+      end
+    end
+  end
+end