fog-softlayer 0.4.6 → 0.4.7

data/lib/fog/softlayer/network.rb

@@ -50,7 +50,7 @@ module Fog
       request :get_datacenters
       request :get_datacenter_routers
       request :get_references_by_tag_name
-
+      request :get_maintenance_windows
 
       request :create_network_tags
       request :delete_network_tags

data/lib/fog/softlayer/requests/account/create_brand.rb

@@ -0,0 +1,41 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        # Create a Brand
+        # @param [Hash] attributes
+        # @return [Excon::Response]
+        def create_brand(attributes)
+          raise ArgumentError, "Fog::Account::Softlayer#create_brand expects argument of type Hash" unless attributes.kind_of?(Hash)
+          response = Excon::Response.new
+          required = %w{keyName longName name account}
+          if Fog::Softlayer.valid_request?(required, attributes)
+            response.status = 201
+            response.body = { :id => Fog::Softlayer.mock_vm_id.to_i, :catalogId => 14 }.merge(attributes)
+            @brands << response.body
+          else
+            response.status = 500
+            response.body = {
+              "code" => "SoftLayer_Exception_MissingCreationProperty",
+              "error" => "Properties #{required.join(', ')} ALL must be set to create an instance of 'SoftLayer_Brand'."
+            }
+          end
+          response
+        end
+      end
+
+      class Real
+        def create_brand(attributes)
+          request(:brand, :create_object, :body => attributes, :http_method => :POST)
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/account/get_account_owned_brands.rb

@@ -0,0 +1,58 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        # Get all brands who are owned by account.
+        # @param [Integer] identifier
+        # @return [Excon::Response]
+        def get_account_owned_brands(identifier)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = mocked_brands
+          if @accounts.select {|account| account['id'] == identifier.to_i }.empty?
+            response.status = 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{identifier}'.",
+              "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+      end
+
+      class Real
+        def get_account_owned_brands(identifier)
+          return request(:account, :getOwnedBrands) if identifier.nil?
+          request(:account, "#{identifier}/getOwnedBrands")
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        def mocked_brands
+          [
+            {
+              "catalogId"=>14,
+              "id"=>11111,
+              "keyName"=>"NAME",
+              "longName"=>"Name Name",
+              "name"=>"Name"
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/account/get_brand.rb

@@ -0,0 +1,36 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        # Get a Brand
+        # @param [Integer] identifier
+        # @return [Excon::Response]
+        def get_brand(identifier)
+          response = Excon::Response.new
+          response.body = @brands.select {|brand| brand[:id] == identifier.to_i }.first || {}
+          response.status = response.body.empty? ? 404 : 200
+          if response.status == 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{identifier}'.",
+              "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          end
+          response
+        end
+      end
+
+      class Real
+        def get_brand(identifier)
+          request(:brand, identifier, :expected => [200, 404], :query => 'objectMask=mask[account]')
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/account/get_brand_owned_accounts.rb

@@ -0,0 +1,111 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        # Get all accounts who are owned by brand.
+        # @param [Integer] identifier
+        # @return [Excon::Response]
+        def get_brand_owned_accounts(identifier)
+          response = Excon::Response.new
+          if @brands.select {|brand| brand[:id] == identifier.to_i }.empty?
+            response.status = 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{identifier}'.",
+              "code"=>"SoftLayer_Exception_ObjectNotFound"
+            }
+          else
+            response.status = 200
+            response.body = mocked_accounts
+          end
+          response
+        end
+      end
+
+      class Real
+        def get_brand_owned_accounts(identifier)
+          request(:brand, "#{identifier}/getOwnedAccounts")
+        end
+      end
+    end
+  end
+end
+
+
+module Fog
+  module Account
+    class Softlayer
+      class Mock
+        def mocked_accounts
+          [
+            {
+              "accountManagedResourcesFlag"=>false,
+              "accountStatusId"=>1001,
+              "address1"=>"R 1",
+              "allowedPptpVpnQuantity"=>1,
+              "brandId"=>23456,
+              "city"=>"Itajuba",
+              "claimedTaxExemptTxFlag"=>false,
+              "companyName"=>"teste",
+              "country"=>"BR",
+              "createDate"=>"2015-06-10T17:06:27-03:00",
+              "email"=>"a@gmail.com",
+              "firstName"=>"Matheus2",
+              "id"=>23456,
+              "isReseller"=>0,
+              "lastName"=>"Mina2",
+              "lateFeeProtectionFlag"=>nil,
+              "modifyDate"=>"2015-06-10T17:06:31-03:00",
+              "postalCode"=>"37500-050",
+              "state"=>"OT",
+              "statusDate"=>nil,
+              "brand"=>
+                {
+                  "catalogId"=>14,
+                  "id"=>12345,
+                  "keyName"=>"ALS",
+                  "longName"=>"als",
+                  "name"=>"als",
+                  "ownedAccounts"=>
+                    [
+                      {
+                        "accountManagedResourcesFlag"=>false,
+                        "accountStatusId"=>1001,
+                        "address1"=>"Av, 1303 Sl 10",
+                        "address2"=>"Sl 11",
+                        "allowedPptpVpnQuantity"=>2,
+                        "brandId"=>44443,
+                        "city"=>"Itajuba",
+                        "claimedTaxExemptTxFlag"=>false,
+                        "companyName"=>"Tecnologias LTDA",
+                        "country"=>"BR",
+                        "createDate"=>"2010-10-06T11:32:30-03:00",
+                        "email"=>"sysadmin@example.com.br",
+                        "firstName"=>"Xe",
+                        "id"=>12345,
+                        "isReseller"=>1,
+                        "lastName"=>"Silva",
+                        "lateFeeProtectionFlag"=>true,
+                        "modifyDate"=>"2011-02-14T17:40:23-02:00",
+                        "officePhone"=>"+55 35 3629-1616",
+                        "postalCode"=>"37500-903",
+                        "state"=>"OT",
+                        "statusDate"=>nil,
+                        "brand"=>nil
+                      },
+                      nil
+                    ]
+                }
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/network/get_maintenance_windows.rb

@@ -0,0 +1,82 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Network
+    class Softlayer
+      class Mock
+        def get_maintenance_windows(location_id, begin_date, end_date, slots_number)
+          raise ArgumentError, "Arguments for #{self.class.name}##{__method__} must be present." if begin_date.nil? || end_date.nil? || location_id.nil? || slots_number.nil?
+          response = Excon::Response.new
+          response.status = 200
+          response.body = get_windows
+          response
+        end
+
+      end
+
+      class Real
+        def get_maintenance_windows(location_id, begin_date, end_date, slots_number)
+          request(:provisioning_maintenance_window, :get_maintenance_windows, :body => [begin_date, end_date, location_id, slots_number], :http_method => :POST)
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Network
+    class Softlayer
+      class Mock
+        def get_windows
+          [
+            {
+              "beginDate"=>"2015-06-01T09:00:00-06:00",
+              "dayOfWeek"=>1,
+              "endDate"=>"2015-06-01T12:00:00-06:00",
+              "id"=>12570,
+              "locationId"=>265592,
+              "portalTzId"=>201
+            },
+            {
+              "beginDate"=>"2015-06-01T17:00:00-06:00",
+              "dayOfWeek"=>2,
+              "endDate"=>"2015-06-01T20:00:00-06:00",
+              "id"=>12584,
+              "locationId"=>265592,
+              "portalTzId"=>201
+            },
+            {
+              "beginDate"=>"2015-06-01T17:00:00-06:00",
+              "dayOfWeek"=>2,
+              "endDate"=>"2015-06-01T20:00:00-06:00",
+              "id"=>117748,
+              "locationId"=>265592,
+              "portalTzId"=>201
+            },
+            {
+              "beginDate"=>"2015-06-02T01:00:00-06:00",
+              "dayOfWeek"=>2,
+              "endDate"=>"2015-06-02T04:00:00-06:00",
+              "id"=>12568,
+              "locationId"=>265592,
+              "portalTzId"=>201
+            },
+            {
+              "beginDate"=>"2015-06-02T09:00:00-06:00",
+              "dayOfWeek"=>2,
+              "endDate"=>"2015-06-02T12:00:00-06:00",
+              "id"=>12591,
+              "locationId"=>265592,
+              "portalTzId"=>201
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/requests/product/place_order.rb

@@ -7,7 +7,6 @@
 module Fog
   module Softlayer
     class Product
-
       class Mock
         def place_order(order_template)
           response = Excon::Response.new
@@ -16,21 +15,6 @@ module Fog
           return response
         end
 
-      end
-
-      class Real
-        def place_order(order_template)
-          request(:product_order, :place_order, :body => order_template, :http_method => :POST)
-        end
-      end
-    end
-  end
-end
-
-module Fog
-  module Product
-    class Softlayer
-      class Mock
         def place_order_mock
           {
               "orderDate"=>"2015-04-17T11:12:12-06:00",
@@ -253,6 +237,12 @@ module Fog
           }
         end
       end
+
+      class Real
+        def place_order(order_template)
+          request(:product_order, :place_order, :body => order_template, :http_method => :POST)
+        end
+      end
     end
   end
-end
+end

data/lib/fog/softlayer/storage.rb

@@ -37,7 +37,14 @@ module Fog
       request :put_static_obj_manifest
       request :post_set_meta_temp_url_key
 
+      module Integrity
+        def validate_username!(name)
+          name =~ /:/ and raise ArgumentError, "Invalid username format. If you are using a Storage specific username, use only the part after the colon."
+        end
+      end
+
       class Mock
+        include Integrity
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -52,6 +59,7 @@ module Fog
         def initialize(options={})
           @softlayer_api_key = options[:softlayer_api_key]
           @softlayer_username = options[:softlayer_username]
+          validate_username! @softlayer_username
           @path = '/v1/AUTH_1234'
           @containers = {}
         end
@@ -77,12 +85,15 @@ module Fog
       end
 
       class Real
+        include Integrity
+
         attr_reader :auth_url
         attr_accessor :auth_token, :auth_expires
 
         def initialize(options={})
           @api_key = options[:softlayer_api_key]
           @username = options[:softlayer_username]
+          validate_username! @username
           @cluster = options[:softlayer_cluster]
           @storage_account = options[:softlayer_storage_account] || default_storage_account(options[:softlayer_username], options[:softlayer_api_key])
           @connection_options     = options[:connection_options] || {}

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

data/tests/softlayer/account/helper.rb

@@ -0,0 +1,8 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require File.expand_path("schema", File.dirname(__FILE__))