vagrant-softlayer 0.2.0 → 0.3.0

data/lib/vagrant-softlayer/action/join_load_balancer.rb

@@ -1,95 +1,95 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # Look for defined load balancers and perform join operations.
-      class JoinLoadBalancer
-        include Util::LoadBalancer
-        include Util::Network
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::join_load_balancer")
-        end
-
-        def call(env)
-          @env = env
-
-          if enabled?
-            setup
-            prepare
-            join!
-            rebalance!
-          end
-
-          @app.call(@env)
-        end
-
-        def append_service_group(cfg, idx)
-          {}.tap do |virtual_server|
-            virtual_server["allocation"]    = 1
-            virtual_server["port"]          = cfg[:port]
-            virtual_server["serviceGroups"] = [
-              {
-                "routingMethodId" => (@enums["Routing_Method"][cfg[:method]] || 10),
-                "routingTypeId"   => (@enums["Routing_Type"][cfg[:type]] || 3),
-                "services"        => []
-              }
-            ]
-            @load_balancers[idx]["virtualServers"] << virtual_server
-          end
-        end
-
-        def join!
-          @pending = []
-
-          until @queue.empty?
-            job = @queue.pop
-            merge(job[:cfg], job[:idx])
-          end
-
-          # Perform the API calls for join.
-          @load_balancers.each_with_index do |lb, idx|
-            next unless @pending[idx]
-            @logger.debug("Updating VIP #{lb['id']} with: #{lb['virtualServers']}")
-            vip_id = @services["VirtualIpAddress"].object_with_id(lb["id"])
-            sl_warden { vip_id.editObject("virtualServers" => lb["virtualServers"]) }  
-          end
-        end
-
-        def merge(cfg, idx)
-          # Get the service group. Create it if not found.
-          sg = @load_balancers[idx]["virtualServers"].find(lambda { append_service_group(cfg, idx) }) { |g| g["port"] == cfg[:port] }
-          # Get the IP address ID of the current machine.
-          ip_id = ip_address_id(@env)
-          unless sg["serviceGroups"].first["services"].index { |s| s["ipAddressId"] == ip_id }
-            @logger.debug("Merging service: #{cfg[:service]}")
-            # Add the service to the group.
-            sg["serviceGroups"].first["services"] << {
-              "enabled"         => 1,
-              "ipAddressId"     => ip_id,
-              "groupReferences" => [ { "weight" => cfg[:service].weight } ],
-              "healthChecks"    => [ { "healthCheckTypeId" => (@enums["Health_Check_Type"][cfg[:service].health_check] || 21) } ],
-              "port"            => cfg[:service].destination_port
-            }
-            # Mark the load balancer object as pending update
-            @pending[idx] = true
-          end
-        end
-
-        def prepare
-          @env[:ui].info I18n.t("vagrant_softlayer.vm.joining_load_balancers")
-          
-          # For each definition, check if the load balancer exists and enqueue
-          # the join operation.
-          @queue = []
-          @env[:machine].provider_config.load_balancers.each do |cfg|
-            idx = @load_balancers.index { |lb| lb["ipAddress"]["ipAddress"] == cfg[:vip] }
-            raise Errors::SLLoadBalancerNotFound unless idx
-            @queue << { :cfg => cfg, :idx => idx }
-          end
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # Look for defined load balancers and perform join operations.
+      class JoinLoadBalancer
+        include Util::LoadBalancer
+        include Util::Network
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::join_load_balancer")
+        end
+
+        def call(env)
+          @env = env
+
+          if enabled?
+            setup
+            prepare
+            join!
+            rebalance!
+          end
+
+          @app.call(@env)
+        end
+
+        def append_service_group(cfg, idx)
+          {}.tap do |virtual_server|
+            virtual_server["allocation"]    = 1
+            virtual_server["port"]          = cfg[:port]
+            virtual_server["serviceGroups"] = [
+              {
+                "routingMethodId" => (@enums["Routing_Method"][cfg[:method]] || 10),
+                "routingTypeId"   => (@enums["Routing_Type"][cfg[:type]] || 3),
+                "services"        => []
+              }
+            ]
+            @load_balancers[idx]["virtualServers"] << virtual_server
+          end
+        end
+
+        def join!
+          @pending = []
+
+          until @queue.empty?
+            job = @queue.pop
+            merge(job[:cfg], job[:idx])
+          end
+
+          # Perform the API calls for join.
+          @load_balancers.each_with_index do |lb, idx|
+            next unless @pending[idx]
+            @logger.debug("Updating VIP #{lb['id']} with: #{lb['virtualServers']}")
+            vip_id = @services["VirtualIpAddress"].object_with_id(lb["id"])
+            sl_warden { vip_id.editObject("virtualServers" => lb["virtualServers"]) }  
+          end
+        end
+
+        def merge(cfg, idx)
+          # Get the service group. Create it if not found.
+          sg = @load_balancers[idx]["virtualServers"].find(lambda { append_service_group(cfg, idx) }) { |g| g["port"] == cfg[:port] }
+          # Get the IP address ID of the current machine.
+          ip_id = ip_address_id(@env)
+          unless sg["serviceGroups"].first["services"].index { |s| s["ipAddressId"] == ip_id }
+            @logger.debug("Merging service: #{cfg[:service]}")
+            # Add the service to the group.
+            sg["serviceGroups"].first["services"] << {
+              "enabled"         => 1,
+              "ipAddressId"     => ip_id,
+              "groupReferences" => [ { "weight" => cfg[:service].weight } ],
+              "healthChecks"    => [ { "healthCheckTypeId" => (@enums["Health_Check_Type"][cfg[:service].health_check] || 21) } ],
+              "port"            => cfg[:service].destination_port
+            }
+            # Mark the load balancer object as pending update
+            @pending[idx] = true
+          end
+        end
+
+        def prepare
+          @env[:ui].info I18n.t("vagrant_softlayer.vm.joining_load_balancers")
+          
+          # For each definition, check if the load balancer exists and enqueue
+          # the join operation.
+          @queue = []
+          @env[:machine].provider_config.load_balancers.each do |cfg|
+            idx = @load_balancers.index { |lb| lb["ipAddress"]["ipAddress"] == cfg[:vip] }
+            raise Errors::SLLoadBalancerNotFound unless idx
+            @queue << { :cfg => cfg, :idx => idx }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/resume_instance.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This resumes the suspended instance.
+      class ResumeInstance
+        include Util::Warden
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.resuming")
+          sl_warden { env[:sl_machine].resume }
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/setup_softlayer.rb

@@ -1,37 +1,38 @@
-require "log4r"
-
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This action creates the SoftLayer connection object and
-      # puts it into the `:sl_connection` key in the environment.
-      # Also, if a machine id is found, another key called
-      # `:sl_machine` and containing the masked object is created.
-      class SetupSoftLayer
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::connect_softlayer")
-        end
-
-        def call(env)
-          @logger.info("Creating the SoftLayer connection object...")
-
-          env[:sl_credentials] = {
-            :api_key      => env[:machine].provider_config.api_key,
-            :endpoint_url => env[:machine].provider_config.endpoint_url,
-            :username     => env[:machine].provider_config.username
-          }
-
-          env[:sl_connection] = ::SoftLayer::Service.new("SoftLayer_Virtual_Guest", env[:sl_credentials])
-
-          unless env[:machine].id.nil? || env[:machine].id.empty?
-            env[:sl_machine] = env[:sl_connection].object_with_id(env[:machine].id.to_i)
-          end
-
-          # Carry on
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This action creates the SoftLayer service objects and
+      # puts them into keys in the environment.
+      # Also, if a machine id is found, another key called
+      # `:sl_machine` and containing the masked object is created.
+      class SetupSoftLayer
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::connect_softlayer")
+        end
+
+        def call(env)
+          @logger.info("Creating the SoftLayer service objects...")
+
+          env[:sl_credentials] = {
+            :api_key      => env[:machine].provider_config.api_key,
+            :endpoint_url => env[:machine].provider_config.endpoint_url,
+            :username     => env[:machine].provider_config.username
+          }
+
+          env[:sl_virtual_guest] = ::SoftLayer::Service.new("SoftLayer_Virtual_Guest", env[:sl_credentials])
+          env[:sl_product_order] = ::SoftLayer::Service.new("SoftLayer_Product_Order", env[:sl_credentials])
+
+          unless env[:machine].id.nil? || env[:machine].id.empty?
+            env[:sl_machine] = env[:sl_virtual_guest].object_with_id(env[:machine].id.to_i)
+          end
+
+          # Carry on
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/suspend_instance.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This suspends the running instance.
+      class SuspendInstance
+        include Util::Warden
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.suspending")
+          sl_warden { env[:sl_machine].pause }
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -74,7 +74,7 @@ module VagrantPlugins
             command = [
               "rsync", "--verbose", "--archive", "-z",
               "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path].join("' -i '")}'",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-softlayer/action/update_dns.rb

@@ -1,94 +1,94 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # Look for the DNS zone relative to the configured domain and,
-      # on return path, perform an API call to add or remove the A
-      # resource record for the host.
-      class UpdateDNS
-        include Util::Network
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::update_dns")
-        end
-
-        def call(env)
-          @env = env
-
-          update_dns
-
-          @app.call(@env)
-        end
-
-        def add_record
-          template = {
-            "data"     => ip_address(@env),
-            "domainId" => @dns_zone["id"],
-            "host"     => hostname(@env),
-            "ttl"      => 86400,
-            "type"     => "a"
-          }
-          @env[:ui].info I18n.t("vagrant_softlayer.vm.creating_dns_record")
-          @logger.debug("Creating DNS A record for #{template['host']}.#{@dns_zone[:name]} (IP address #{template['data']}).")
-          resource = sl_warden { @resource.createObject(template) }
-          self.dns_id = resource["id"]
-        end
-
-        def delete_record
-          @env[:ui].info I18n.t("vagrant_softlayer.vm.deleting_dns_record")
-          @logger.debug("Deleting stored DNS A record (ID #{self.dns_id}).")
-          warn_msg = lambda { @env[:ui].warn I18n.t("vagrant_softlayer.errors.dns_record_not_found") }
-          sl_warden(warn_msg) { @resource.object_with_id(self.dns_id).deleteObject }
-        end
-
-        def dns_id
-          id = nil
-          id_file = @env[:machine].data_dir.join("dns_id")
-          id = id_file.read.chomp.to_i if id_file.file?
-          return id
-        end
-
-        def dns_id=(value)
-          @logger.info("New machine DNS ID: #{value.inspect}")
-
-          # The file that will store the id if we have one. This allows the
-          # ID to persist across Vagrant runs.
-          id_file = @env[:machine].data_dir.join("dns_id")
-
-          if value
-            # Write the "id" file with the id given.
-            id_file.open("w+") do |f|
-              f.write(value)
-            end
-          end
-        end
-
-        def update_dns
-          unless @env[:machine].provider_config.manage_dns
-            @logger.debug("Not managing DNS. Going ahead.")
-            return
-          end
-
-          # Lookup the DNS zone
-          zone   = ::SoftLayer::Service.new("SoftLayer_Dns_Domain", @env[:sl_credentials])
-          domain = @env[:machine].provider_config.domain
-
-          @logger.debug("Looking for #{domain} zone into the SoftLayer zone list.")
-          @dns_zone = sl_warden { zone.getByDomainName(domain).first }
-          raise Errors::SLDNSZoneNotFound, :zone => domain unless @dns_zone
-          @logger.debug("Found DNS zone: #{@dns_zone.inspect}")
-
-          # Add or remove the resource record
-          @resource = ::SoftLayer::Service.new("SoftLayer_Dns_Domain_ResourceRecord", @env[:sl_credentials])
-          case @env[:machine_action]
-          when :up
-            add_record unless self.dns_id
-          when :destroy
-            delete_record
-          end
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # Look for the DNS zone relative to the configured domain and,
+      # on return path, perform an API call to add or remove the A
+      # resource record for the host.
+      class UpdateDNS
+        include Util::Network
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::update_dns")
+        end
+
+        def call(env)
+          @env = env
+
+          update_dns
+
+          @app.call(@env)
+        end
+
+        def add_record
+          template = {
+            "data"     => ip_address(@env),
+            "domainId" => @dns_zone["id"],
+            "host"     => hostname(@env),
+            "ttl"      => 86400,
+            "type"     => "a"
+          }
+          @env[:ui].info I18n.t("vagrant_softlayer.vm.creating_dns_record")
+          @logger.debug("Creating DNS A record for #{template['host']}.#{@dns_zone[:name]} (IP address #{template['data']}).")
+          resource = sl_warden { @resource.createObject(template) }
+          self.dns_id = resource["id"]
+        end
+
+        def delete_record
+          @env[:ui].info I18n.t("vagrant_softlayer.vm.deleting_dns_record")
+          @logger.debug("Deleting stored DNS A record (ID #{self.dns_id}).")
+          warn_msg = lambda { @env[:ui].warn I18n.t("vagrant_softlayer.errors.dns_record_not_found") }
+          sl_warden(warn_msg) { @resource.object_with_id(self.dns_id).deleteObject }
+        end
+
+        def dns_id
+          id = nil
+          id_file = @env[:machine].data_dir.join("dns_id")
+          id = id_file.read.chomp.to_i if id_file.file?
+          return id
+        end
+
+        def dns_id=(value)
+          @logger.info("New machine DNS ID: #{value.inspect}")
+
+          # The file that will store the id if we have one. This allows the
+          # ID to persist across Vagrant runs.
+          id_file = @env[:machine].data_dir.join("dns_id")
+
+          if value
+            # Write the "id" file with the id given.
+            id_file.open("w+") do |f|
+              f.write(value)
+            end
+          end
+        end
+
+        def update_dns
+          unless @env[:machine].provider_config.manage_dns
+            @logger.debug("Not managing DNS. Going ahead.")
+            return
+          end
+
+          # Lookup the DNS zone
+          zone   = ::SoftLayer::Service.new("SoftLayer_Dns_Domain", @env[:sl_credentials])
+          domain = @env[:machine].provider_config.domain
+
+          @logger.debug("Looking for #{domain} zone into the SoftLayer zone list.")
+          @dns_zone = sl_warden { zone.getByDomainName(domain).first }
+          raise Errors::SLDNSZoneNotFound, :zone => domain unless @dns_zone
+          @logger.debug("Found DNS zone: #{@dns_zone.inspect}")
+
+          # Add or remove the resource record
+          @resource = ::SoftLayer::Service.new("SoftLayer_Dns_Domain_ResourceRecord", @env[:sl_credentials])
+          case @env[:machine_action]
+          when :up
+            add_record unless self.dns_id
+          when :destroy
+            delete_record
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-softlayer/action/wait_for_provision.rb

@@ -1,40 +1,40 @@
-require "log4r"
-
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # Waits until the new machine has been provisioned.
-      class WaitForProvision
-        include Util::Warden
-
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_softlayer::action::wait_for_provision")
-        end
-
-        def call(env)
-          env[:ui].info I18n.t("vagrant_softlayer.vm.wait_for_provision")
-
-          env[:sl_machine] = env[:sl_connection].object_with_id(env[:machine].id.to_i)
-
-          retry_msg = lambda { @logger.debug("Object not found, retrying in 10 seconds.") }
-
-          # 20 minutes timeout
-          Timeout::timeout(1200) do
-            @logger.debug("Checking if the newly ordered machine has been provisioned.")
-            sl_warden(retry_msg, 10) do
-              while env[:sl_machine].getPowerState["name"] != "Running" || env[:sl_machine].object_mask( { "provisionDate" => "" } ).getObject == {}
-                @logger.debug("The machine is still provisioning. Retrying in 10 seconds.")
-                sleep 10
-              end
-            end
-          end
-
-          env[:ui].info I18n.t("vagrant_softlayer.vm.provisioned")
-          
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+require "log4r"
+
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # Waits until the new machine has been provisioned.
+      class WaitForProvision
+        include Util::Warden
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_softlayer::action::wait_for_provision")
+        end
+
+        def call(env)
+          env[:ui].info I18n.t("vagrant_softlayer.vm.wait_for_provision")
+
+          env[:sl_machine] = env[:sl_virtual_guest].object_with_id(env[:machine].id.to_i)
+
+          retry_msg = lambda { @logger.debug("Object not found, retrying in 10 seconds.") }
+
+          # 20 minutes timeout
+          Timeout::timeout(1200) do
+            @logger.debug("Checking if the newly ordered machine has been provisioned.")
+            sl_warden(retry_msg, 10) do
+              while env[:sl_machine].getPowerState["name"] != "Running" || env[:sl_machine].object_mask( { "provisionDate" => "" } ).getObject == {}
+                @logger.debug("The machine is still provisioning. Retrying in 10 seconds.")
+                sleep 10
+              end
+            end
+          end
+
+          env[:ui].info I18n.t("vagrant_softlayer.vm.provisioned")
+          
+          @app.call(env)
+        end
+      end
+    end
+  end
+end