fog-softlayer 0.4.2.pre → 0.4.2

data/lib/fog/softlayer/requests/compute/get_virtual_guest_users.rb

@@ -0,0 +1,148 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        # Gets all Virtual Guest users
+        # @param [Integer] id
+        # @return [Excon::Response]
+        def get_virtual_guest_users(id)
+          response = Excon::Response.new
+          found = self.get_vms.body.map{|server| server['id']}.include?(id)
+          unless found
+            response.status = 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{id}'.",
+              "code" => "SoftLayer_Exception_ObjectNotFound"
+            }
+          else
+            response.status = 200
+            response.body = get_users
+          end
+          response
+        end
+      end
+
+      class Real
+        def get_virtual_guest_users(id)
+          request(:virtual_guest, "#{id}/getUsers")
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        def get_users
+          [
+            {
+              "accountId"=>000000, 
+          	  "address1"=>"Your address", 
+          	  "authenticationToken"=>
+          	  {
+          	    "hash"=>"06e849qqq25e5266753043484893344232", 
+          	    "user"=>nil, 
+          	    "userId"=>000000
+          	  }, 
+          	  "city"=>"Your City", 
+          	  "companyName"=>"Your Company", 
+          	  "country"=>"Your country", 
+          	  "createDate"=>"2014-03-05T13:23:04-06:00", 
+          	  "daylightSavingsTimeFlag"=>true, 
+          	  "denyAllResourceAccessOnCreateFlag"=>false, 
+          	  "displayName"=>"Your name", 
+          	  "email"=>"youremail@example.com", 
+          	   "firstName"=>"Your name", 
+          	  "forumPasswordHash"=>"121kdsksdkvm323j4j3", 
+          	  "id"=>000000, 
+          	  "lastName"=>"Your last name", 
+          	  "localeId"=>1, 
+          	  "modifyDate"=>"2014-03-05T13:23:04-06:00", 
+          	  "officePhone"=>"+55 00 111-111", 
+          	  "parentId"=>nil, 
+          	  "passwordExpireDate"=>nil, 
+          	  "permissionSystemVersion"=>2, 
+          	  "postalCode"=>"000000-000", 
+          	  "pptpVpnAllowedFlag"=>false, 
+          	  "savedId"=>"000000", 
+          	  "secondaryLoginManagementFlag"=>nil, 
+          	  "secondaryLoginRequiredFlag"=>nil, 
+          	  "secondaryPasswordModifyDate"=>"2014-03-05T13:40:12-06:00", 
+          	  "secondaryPasswordTimeoutDays"=>nil, 
+          	  "sslVpnAllowedFlag"=>false, 
+          	  "state"=>"OT", 
+          	  "statusDate"=>"2014-03-05T13:23:04-06:00", 
+          	  "timezoneId"=>114, 
+          	  "userStatusId"=>1001, 
+          	  "username"=>"Your username", 
+          	  "vpnManualConfig"=>false, 
+          	  "account"=>
+          	  {
+          	    "accountManagedResourcesFlag"=>false, 
+          	    "accountStatusId"=>1001, 
+          	    "address1"=>"Your address 1", 
+          	    "address2"=>"Your address 2", 
+          	    "allowedPptpVpnQuantity"=>1, 
+          	    "brandId"=>2, 
+          	    "city"=>"Your city", 
+          	    "claimedTaxExemptTxFlag"=>false, 
+          	    "companyName"=>"Your company", 
+          	    "country"=>"Your country", 
+          	    "createDate"=>"2014-03-05T13:23:04-06:00", 
+          	    "email"=>"youremail@example.com", 
+          	    "firstName"=>"Your name", 
+          	    "id"=>000000, 
+          	    "isReseller"=>1, 
+          	    "lastName"=>"Your last name", 
+          	    "lateFeeProtectionFlag"=>nil, 
+          	    "modifyDate"=>"2014-04-29T15:22:55-05:00", 
+          	    "officePhone"=>"+00 00 0000-0000", 
+          	    "postalCode"=>"00000-000", 
+          	    "state"=>"OT", 
+          	    "statusDate"=>nil, 
+          	    "masterUser"=>nil
+          	  }, 
+          	  "apiAuthenticationKeys"=>
+          	  [
+          	    {
+          	      "authenticationKey"=>"43k43dsmkf9994m3mdkm3k2mcdsk32", 
+          		    "id"=>000000, 
+          		    "timestampKey"=>302399304309, 
+          		    "userId"=>000000
+          	    }
+          	  ], 
+          	  "locale"=>
+          	  {
+          	    "friendlyName"=>"English", 
+          	    "id"=>1, 
+          	    "languageTag"=>"en-US", 
+          	    "name"=>"English"
+          	  }, 
+          	  "timezone"=>
+          	  {
+          	    "id"=>114, 
+          	    "longName"=>"(GMT-06:00) America/Dallas - CST", "name"=>"America/Chicago", 
+          	    "offset"=>"-0600", 
+          	    "shortName"=>"CST"
+          	  }, 
+          	  "userStatus"=>
+            	{
+          	    "id"=>1001, 
+          	    "keyName"=>"ACTIVE", 
+          	    "name"=>"Active"
+          	  }
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/slapi.rb

@@ -0,0 +1,96 @@
+#
+# Author:: Matt Eldridge (<plribeiro3000@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Softlayer
+    module Slapi
+      # Sends the real request to the real SoftLayer service.
+      #
+      # @param [String] service
+      #   ...ayer.com/rest/v3/Softlayer_Service_Name...
+      # @param path [String]
+      #   ...ayer.com/rest/v3/Softlayer_Service_Name/path.json
+      # @param [Hash] options
+      # @option options [Array<Hash>] :body
+      #   HTTP request body parameters
+      # @option options [String] :softlayer_api_url
+      #   Override the default (or configured) API endpoint
+      # @option options [String] :softlayer_username
+      #   Email or user identifier for user based authentication
+      # @option options [String] :softlayer_api_key
+      #   Password for user based authentication
+      # @return [Excon::Response]
+      def self.slapi_request(service, path, options)
+        # default HTTP method to get if not passed
+        http_method = options[:http_method] || :get
+        # set the target base url
+        @request_url = options[:softlayer_api_url] || Fog::Softlayer::SL_API_URL
+        # tack on the username and password
+        credentialize_url(options[:username], options[:api_key])
+        # set the SoftLayer Service name
+        set_sl_service(service)
+        # set the request path (known as the "method" in SL docs)
+        set_sl_path(path)
+        # set the query params if any
+
+
+        # build request params
+        params = { :headers => user_agent_header }
+        params[:headers]['Content-Type'] = 'application/json'
+        params[:expects] = options[:expected] || [200,201]
+        params[:query] = options[:query] unless options[:query].nil?
+        unless options[:body].nil?
+          options[:body] = [options[:body]] unless options[:body].kind_of?(Array)
+          params[:body] = Fog::JSON.encode({:parameters => options[:body]})
+        end
+
+        # initialize connection object
+        @connection = Fog::Core::Connection.new(@request_url, false, params)
+
+        # send it
+        response = @connection.request(:method => http_method)
+
+        # decode it
+        response.body = Fog::JSON.decode(response.body)
+        response
+      end
+
+      private
+
+      def self.credentialize_url(username, apikey)
+        @request_url = "https://#{sanitize_username(username)}:#{apikey}@#{@request_url}"
+      end
+
+      def self.sanitize_username(username)
+        username.gsub!(/@/, '%40')
+        username
+      end
+
+      ##
+      # Prepend "SoftLayer_" to the service name and Snake_Camel_Case the string before appending it to the @request_url.
+      #
+      def self.set_sl_service(service)
+        service = "SoftLayer_" << service.to_s.gsub(/^softlayer_/i, '').split('_').map{|i|i.capitalize}.join('_')
+        service.fix_convention_exceptions
+        @request_url += "/#{service}"
+      end
+
+      ##
+      # Try to smallCamelCase the path before appending it to the @request_url
+      #
+      def self.set_sl_path(path)
+        path = path.to_s.softlayer_underscore.softlayer_camelize
+        path.fix_convention_exceptions
+        @request_url += "/#{path}.json"
+      end
+
+      def self.user_agent_header
+        {"User-Agent" => "Fog SoftLayer Adapter #{Fog::Softlayer::VERSION}"}
+      end
+    end
+  end
+end

data/lib/fog/softlayer/storage.rb

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer/core'
-
 module Fog
   module Storage
     class Softlayer < Fog::Service
@@ -108,7 +106,7 @@ module Fog
             params = _build_params(params)
             response = @connection.request(params)
 
-            if response.status == 401
+            if response.status == 401 && !!@auth_token
               @auth_token = nil; @auth_expires = nil
               authenticate
               response = @connection.request(params)

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.4.2.pre"
+    VERSION = "0.4.2"
   end
 end

data/lib/fog/softlayer.rb

@@ -5,9 +5,72 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer'
-require 'fog/softlayer/compute'
-require 'fog/softlayer/dns'
-require 'fog/softlayer/network'
-require 'fog/softlayer/product'
-require 'fog/softlayer/storage'
+require 'fog/core'
+require 'fog/json'
+require 'time'
+require File.expand_path('../softlayer/version', __FILE__)
+require File.expand_path('../softlayer/ext/string', __FILE__)
+require File.expand_path('../softlayer/ext/hash', __FILE__) unless {}.respond_to? :deep_merge
+
+module Fog
+  module Compute
+    autoload :Softlayer, File.expand_path('../softlayer/compute', __FILE__)
+  end
+
+  module DNS
+    autoload :Softlayer, File.expand_path('../softlayer/dns', __FILE__)
+  end
+
+  module Network
+    autoload :Softlayer, File.expand_path('../softlayer/network', __FILE__)
+  end
+
+  module Storage
+    autoload :Softlayer, File.expand_path('../softlayer/storage', __FILE__)
+  end
+
+  module Softlayer
+    extend Fog::Provider
+
+    autoload :Product, File.expand_path('../softlayer/product', __FILE__)
+    autoload :Slapi, File.expand_path('../softlayer/slapi', __FILE__)
+
+    SL_API_URL = 'api.softlayer.com/rest/v3' unless defined? SL_API_URL
+    SL_STORAGE_AUTH_URL = 'objectstorage.softlayer.net/auth/v1.0' unless defined? SL_STORAGE_AUTH_URL
+
+    service(:compute, 'Compute')
+    service(:dns, 'DNS')
+    service(:network, 'Network')
+    service(:product, 'Product')
+    service(:storage, 'Storage')
+
+    def self.mock_account_id
+      Fog.mocking? and @sl_account_id ||= Fog::Mock.random_numbers(7)
+    end
+
+    def self.mock_vm_id
+      Fog::Mock.random_numbers(7)
+    end
+
+    def self.mock_global_identifier
+      Fog::UUID.uuid
+    end
+
+    def self.valid_request?(required, passed)
+      required.all? {|k| k = k.to_sym; passed.key?(k) and !passed[k].nil?}
+    end
+
+    # CGI.escape, but without special treatment on spaces
+    def self.escape(str,extra_exclude_chars = '')
+      str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
+        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+      end
+    end
+
+    def self.stringify_keys(obj)
+      return obj.inject({}){|memo,(k,v)| memo[k.to_s] =  stringify_keys(v); memo} if obj.is_a? Hash
+      return obj.inject([]){|memo,v    | memo         << stringify_keys(v); memo} if obj.is_a? Array
+      obj
+    end
+  end
+end

data/tests/softlayer/requests/compute/bmc_tests.rb

@@ -23,16 +23,36 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
     tests("#create_bare_metal_server('#{@bmc}')") do
       response = @sl_connection.create_bare_metal_server(@bmc)
       @server_id = response.body['id']
+      @server_ip = response.body['primaryIpAddress']
       data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER, {:allow_extra_keys => true}) { response.body }
       data_matches_schema(201) { response.status }
     end
 
+    tests"#get_bare_metal_server_by_ip('#{@server_ip}'))" do
+      response = @sl_connection.get_bare_metal_server_by_ip(@server_ip)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER) { response.body }
+    end
+
+
     tests("#get_bare_metal_servers()") do
       @sl_connection.get_bare_metal_servers.body.each do |bms|
         data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER) { bms }
       end
     end
 
+    tests("#get_bare_metal_active_tickets('#{@server_id})'") do
+      response = @sl_connection.get_bare_metal_active_tickets(@server_id)
+      data_matches_schema(Array) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+    
+    tests("#get_bare_metal_users('#{@server_id})'") do
+      response = @sl_connection.get_bare_metal_users(@server_id)
+      data_matches_schema(Array) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#power_on_bare_metal_server('#{@server_id})'") do
       response = @sl_connection.power_on_bare_metal_server(@server_id)
       data_matches_schema(true) {response.body}
@@ -62,6 +82,12 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(true) {response.body}
       data_matches_schema(200) {response.status}
     end
+
+    tests("#get_bare_metal_create_options()") do
+      response = @sl_connection.get_bare_metal_create_options
+      data_matches_schema(Hash) {response.body}
+      data_matches_schema(200) {response.status}
+    end
   end
 
   tests('failure') do
@@ -77,6 +103,18 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       @sl_connection.create_bare_metal_server([@bmc])
     end
 
+    tests("#get_bare_metal_server_by_ip('1.1.1.1')") do
+      response = @sl_connection.get_bare_metal_server_by_ip('1.1.1.1')
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
+    tests("#get_bare_metal_users('#{bmc}')") do
+      response = @sl_connection.get_bare_metal_users(bmc)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+    
     tests("#power_on_bare_metal_server('#{bmc}')") do
       response = @sl_connection.power_on_bare_metal_server(bmc)
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }

data/tests/softlayer/requests/compute/vm_tests.rb

@@ -40,16 +40,35 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
     tests("#create_vm('#{@vm}')") do
       response = @sl_connection.create_vm(@vm)
       @vm_id = response.body.first['id']
+      @vm_ip = response.body.first['primaryIpAddress']
       #data_matches_schema([Softlayer::Compute::Formats::VirtualGuest::SERVER], {:allow_extra_keys => true}) { response.body }
       data_matches_schema(200) { response.status }
     end
 
+    tests"#get_virtual_guest_by_ip('#{@vm_ip}'))" do
+      response = @sl_connection.get_virtual_guest_by_ip(@vm_ip)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { response.body }
+    end
+
     tests"#get_vms()" do
       response = @sl_connection.get_vms
       data_matches_schema(200) { response.status }
       #data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { vm }
     end
 
+    tests("#get_virtual_guest_active_tickets(#{@vm_id})") do
+      response = @sl_connection.get_virtual_guest_active_tickets(@vm_id)
+      data_matches_schema(Array) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
+    tests("#get_virtual_guest_users(#{@vm_id})") do
+      response = @sl_connection.get_virtual_guest_users(@vm_id)
+      data_matches_schema(Array) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#power_on_vm(#{@vm_id})") do
       response = @sl_connection.power_on_vm(@vm_id)
       data_matches_schema(true) {response.body}
@@ -85,6 +104,12 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(true) {response.body}
       data_matches_schema(200) {response.status}
     end
+
+    tests("#get_virtual_guest_create_options()") do
+      response = @sl_connection.get_virtual_guest_create_options
+      data_matches_schema(Hash) {response.body}
+      data_matches_schema(200) {response.status}
+    end
   end
 
   tests('failure') do
@@ -110,6 +135,18 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       @sl_connection.create_vm(@vms)
     end
 
+    tests("#get_virtual_guest_by_ip('1.1.1.1')") do
+      response = @sl_connection.get_virtual_guest_by_ip('1.1.1.1')
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
+    tests("#get_virtual_guest_users('99999999999999')") do
+      response = @sl_connection.get_virtual_guest_users(99999999999999)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
     tests("#power_on_vm('99999999999999')") do
       response = @sl_connection.power_on_vm(99999999999999)
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }