vagrant-softlayer 0.3.3 → 0.4.0

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

@@ -1,74 +1,74 @@
-module VagrantPlugins
-  module SoftLayer
-    module Action
-      # This creates a new instance.
-      class CreateInstance
-        include Util::Network
-        include Util::Warden
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          @env = env
-
-          @env[:ui].info I18n.t("vagrant_softlayer.vm.creating")
-
-          sl_warden { env[:sl_product_order].verifyOrder(env[:sl_virtual_guest].generateOrderTemplate(order_template)) }
-
-          result = sl_warden { env[:sl_virtual_guest].createObject(order_template) }
-          @env[:machine].id = result["id"].to_s
-
-          @app.call(@env)
-        end
-
-        def get_hostname
-          @env[:machine].provider_config.hostname || @env[:machine].config.vm.hostname
-        end
-
-        def get_vlan_id(vlan_name, vlan_space)
-          return vlan_name unless vlan_name.kind_of?(String)
-
-          routers = @env[:sl_account].object_mask("mask[routers,routers.datacenter,routers.networkVlans,routers.networkVlans.networkSpace,routers.networkVlans.type]").getObject["routers"]
-
-          routers.each do |router|
-            next if @env[:machine].provider_config.datacenter && router["datacenter"]["name"] != @env[:machine].provider_config.datacenter
-            router["networkVlans"].each do |vlan|
-              vlan_qualified_name = [ router["hostname"].split('.').reverse.join('.'), vlan["vlanNumber"] ].join('.')
-              return vlan["id"] if vlan.has_key?("name") && vlan["type"]["keyName"] == "STANDARD" && vlan["networkSpace"] == vlan_space.to_s.upcase && (vlan["name"] == vlan_name || vlan_qualified_name == vlan_name)
-            end
-          end
-
-          raise Errors::SLVlanIdNotFound, :vlan_space => vlan_space.to_s, :vlan_name => vlan_name.inspect
-        end
-
-        def order_template
-          template = {
-            "dedicatedAccountHostOnlyFlag" => @env[:machine].provider_config.dedicated,
-            "domain"                       => @env[:machine].provider_config.domain,
-            "hostname"                     => get_hostname,
-            "hourlyBillingFlag"            => @env[:machine].provider_config.hourly_billing,
-            "localDiskFlag"                => @env[:machine].provider_config.local_disk,
-            "maxMemory"                    => @env[:machine].provider_config.max_memory,
-            "networkComponents"            => [ { :maxSpeed => @env[:machine].provider_config.network_speed } ],
-            "privateNetworkOnlyFlag"       => @env[:machine].provider_config.private_only,
-            "sshKeys"                      => ssh_keys(@env),
-            "startCpus"                    => @env[:machine].provider_config.start_cpus
-          }
-
-          template["blockDevices"]                   =  @env[:machine].provider_config.disk_capacity.map{ |key,value| { "device"=> key.to_s, "diskImage" => { "capacity" => value.to_s } } } if @env[:machine].provider_config.disk_capacity
-          template["blockDeviceTemplateGroup"]       = { :globalIdentifier => @env[:machine].provider_config.image_guid } if @env[:machine].provider_config.image_guid
-          template["datacenter"]                     = { :name => @env[:machine].provider_config.datacenter } if @env[:machine].provider_config.datacenter
-          template["operatingSystemReferenceCode"]   = @env[:machine].provider_config.operating_system if !@env[:machine].provider_config.image_guid
-          template["postInstallScriptUri"]           = @env[:machine].provider_config.post_install if @env[:machine].provider_config.post_install
-          template["primaryBackendNetworkComponent"] = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_private, :private) } } if @env[:machine].provider_config.vlan_private
-          template["primaryNetworkComponent"]        = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_public,  :public) } } if @env[:machine].provider_config.vlan_public
-          template["userData"]                       = [ { :value => @env[:machine].provider_config.user_data } ] if @env[:machine].provider_config.user_data
-
-          return template
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module SoftLayer
+    module Action
+      # This creates a new instance.
+      class CreateInstance
+        include Util::Network
+        include Util::Warden
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+
+          @env[:ui].info I18n.t("vagrant_softlayer.vm.creating")
+
+          sl_warden { env[:sl_client]["SoftLayer_Product_Order"].verifyOrder(env[:sl_client]["SoftLayer_Virtual_Guest"].generateOrderTemplate(order_template)) }
+
+          result = sl_warden { env[:sl_client]["SoftLayer_Virtual_Guest"].createObject(order_template) }
+          @env[:machine].id = result["id"].to_s
+
+          @app.call(@env)
+        end
+
+        def get_hostname
+          @env[:machine].provider_config.hostname || @env[:machine].config.vm.hostname
+        end
+
+        def get_vlan_id(vlan_name, vlan_space)
+          return vlan_name unless vlan_name.kind_of?(String)
+
+          routers = @env[:sl_client]["SoftLayer_Account"].object_mask("mask[routers,routers.datacenter,routers.networkVlans,routers.networkVlans.networkSpace,routers.networkVlans.type]").getObject["routers"]
+
+          routers.each do |router|
+            next if @env[:machine].provider_config.datacenter && router["datacenter"]["name"] != @env[:machine].provider_config.datacenter
+            router["networkVlans"].each do |vlan|
+              vlan_qualified_name = [ router["hostname"].split('.').reverse.join('.'), vlan["vlanNumber"] ].join('.')
+              return vlan["id"] if vlan.has_key?("name") && vlan["type"]["keyName"] == "STANDARD" && vlan["networkSpace"] == vlan_space.to_s.upcase && (vlan["name"] == vlan_name || vlan_qualified_name == vlan_name)
+            end
+          end
+
+          raise Errors::SLVlanIdNotFound, :vlan_space => vlan_space.to_s, :vlan_name => vlan_name.inspect
+        end
+
+        def order_template
+          template = {
+            "dedicatedAccountHostOnlyFlag" => @env[:machine].provider_config.dedicated,
+            "domain"                       => @env[:machine].provider_config.domain,
+            "hostname"                     => get_hostname,
+            "hourlyBillingFlag"            => @env[:machine].provider_config.hourly_billing,
+            "localDiskFlag"                => @env[:machine].provider_config.local_disk,
+            "maxMemory"                    => @env[:machine].provider_config.max_memory,
+            "networkComponents"            => [ { :maxSpeed => @env[:machine].provider_config.network_speed } ],
+            "privateNetworkOnlyFlag"       => @env[:machine].provider_config.private_only,
+            "sshKeys"                      => ssh_keys(@env),
+            "startCpus"                    => @env[:machine].provider_config.start_cpus
+          }
+
+          template["blockDevices"]                   =  @env[:machine].provider_config.disk_capacity.map{ |key,value| { "device"=> key.to_s, "diskImage" => { "capacity" => value.to_s } } } if @env[:machine].provider_config.disk_capacity
+          template["blockDeviceTemplateGroup"]       = { :globalIdentifier => @env[:machine].provider_config.image_guid } if @env[:machine].provider_config.image_guid
+          template["datacenter"]                     = { :name => @env[:machine].provider_config.datacenter } if @env[:machine].provider_config.datacenter
+          template["operatingSystemReferenceCode"]   = @env[:machine].provider_config.operating_system if !@env[:machine].provider_config.image_guid
+          template["postInstallScriptUri"]           = @env[:machine].provider_config.post_install if @env[:machine].provider_config.post_install
+          template["primaryBackendNetworkComponent"] = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_private, :private) } } if @env[:machine].provider_config.vlan_private
+          template["primaryNetworkComponent"]        = { :networkVlan => { :id => get_vlan_id(@env[:machine].provider_config.vlan_public,  :public) } } if @env[:machine].provider_config.vlan_public
+          template["userData"]                       = [ { :value => @env[:machine].provider_config.user_data } ] if @env[:machine].provider_config.user_data
+
+          return template
+        end
+      end
+    end
+  end
+end

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

@@ -1,39 +1,39 @@
-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_account]       = ::SoftLayer::Service.new("SoftLayer_Account",       env[:sl_credentials])
-          env[:sl_product_order] = ::SoftLayer::Service.new("SoftLayer_Product_Order", env[:sl_credentials])
-          env[:sl_virtual_guest] = ::SoftLayer::Service.new("SoftLayer_Virtual_Guest", 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
+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,
+            :timeout      => env[:machine].provider_config.api_timeout,
+            :user_agent   => "vagrant-softlayer",
+            :username     => env[:machine].provider_config.username
+          }
+
+          env[:sl_client] = ::SoftLayer::Client.new(env[:sl_credentials])
+
+          unless env[:machine].id.nil? || env[:machine].id.empty?
+            env[:sl_machine] = env[:sl_client]["SoftLayer_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/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   = @env[:sl_client]["SoftLayer_Dns_Domain"]
+          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 = @env[:sl_client]["SoftLayer_Dns_Domain_ResourceRecord"]
+          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_virtual_guest].object_with_id(env[:machine].id.to_i)
-
-          retry_msg = lambda { @logger.debug("Object not found, retrying in 10 seconds.") }
-
-          # Defaults to 20 minutes timeout
-          Timeout::timeout(env[:machine].provider_config.provision_timeout, Errors::SLProvisionTimeoutError) 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_client]["SoftLayer_Virtual_Guest"].object_with_id(env[:machine].id.to_i)
+          
+          virtual_server = ::SoftLayer::VirtualServer.server_with_id(env[:machine].id.to_i, :client => env[:sl_client])
+          
+          #Rechecks every 10 sec
+          ready = virtual_server.wait_until_ready((env[:machine].provider_config.provision_timeout.to_f/10).ceil, env[:machine].provider_config.transaction_wait, 10) do |server_ready|
+            unless server_ready
+              provision_status = env[:sl_machine].getActiveTransaction
+              provision_status = " Provision status: #{provision_status["transactionStatus"]["friendlyName"]} (#{provision_status["transactionStatus"]["name"]})." if provision_status && ! provision_status.empty?
+              @logger.info("#{env[:machine].provider_config.hostname} is still provisioning. Retrying in 10 seconds.#{provision_status}")
+            end
+          end
+
+          raise Errors::SLProvisionTimeoutError unless ready
+
+          env[:ui].info I18n.t("vagrant_softlayer.vm.provisioned")
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end