fog-softlayer 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d1c6f03ac2e0040db85db4721b27d0d4cd64cb
-  data.tar.gz: bdc6756610695169ad345a08c366322bebb1bf4f
+  metadata.gz: cd484e83287b20edfcfd073db47bd291faed8c06
+  data.tar.gz: da6511cbe65a7f13426558dd2007731fa3ef86f9
 SHA512:
-  metadata.gz: 78c526fb8b3708aad63c410bbd34d6ead32c8f7ecaa43bae0d3706667ea08909fde2b4e1c6231b37863a11d37e47cf61843667ad2d131411925f8eec93914427
-  data.tar.gz: 549aa937fb695071e6e85f3c7860899958781ca58d0e3d8a69f36c21a0ff3cc684c10f0a0a50df0a74257ef0b27bc254c4feead972cce9c7b1ec83361bc2b258
+  metadata.gz: 98c102483e5a54a01c83d435cdaacaa12b0b22bff8cc095d3648b94f0e178c3776df48956e32276ae5c640952bd5106b995a9638d3679b3e48dc18bd0f9f6a12
+  data.tar.gz: bb8e4e8106d2af87c0cd99833f5e55c811bf52ba80476ef4e272c2a2ea4de9b50411c35144054a53cf087bce0c820213ee96821f54876fc0400445d1d48ef1dd

data/CONTRIBUTORS.md

@@ -8,4 +8,5 @@
 * Matt Eldridge <matt.eldridge@us.ibm.com>
 * Paulo Henrique Lopes Ribeiro <paulo@majority.co>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
+* Thomas Ingram <code@ravinggenius.com>
 * geemus <geemus@gmail.com>

data/examples/account.md

@@ -0,0 +1,82 @@
+### Account Examples
+
+If you are unfamiliar with fog, we recommend reading our [getting started](getting_started.md) guide.
+
+
+#### Create a connection to SoftLayer Account Service
+
+```ruby
+	require 'fog/softlayer'
+	@sl = Fog::Account[:softlayer]
+```
+
+1. Create a sub-brand (First way)
+```ruby
+  attributes = {
+      'key_name' => "T_B",
+      'long_name' => "Long Test Brand Name",
+      'name' => "My name",
+      'account' => {
+        address1: "Street",
+        city: "City",
+     	companyName: "Example",
+    	country: "BR",
+    	email: "example@example.com",
+    	firstName: "FirstName",
+    	lastName: "LastName",
+    	postalCode: "0000-000",
+    	state: "EX"
+      } 
+    }
+  @brand = @sl.brands.create(attributes)
+```
+
+1. Create a sub-brand (Second way)
+```ruby
+  attributes = {
+      'key_name' => "T_B",
+      'long_name' => "Long Test Brand Name",
+      'name' => "My name",
+      'account' => {
+        address1: "Street",
+        city: "City",
+     	companyName: "Example",
+    	country: "BR",
+    	email: "example@example.com",
+    	firstName: "FirstName",
+    	lastName: "LastName",
+    	postalCode: "0000-000",
+    	state: "EX"
+      } 
+    }
+  @brand = @sl.brands.new(attributes)
+  @brand.save
+```
+
+1. Create a sub-brand (Third way)
+```ruby
+  attributes = {
+      'key_name' => "T_B",
+      'long_name' => "Long Test Brand Name",
+      'name' => "My name",
+      'account' => {
+        address1: "Street",
+        city: "City",
+     	companyName: "Example",
+    	country: "BR",
+    	email: "example@example.com",
+    	firstName: "FirstName",
+    	lastName: "LastName",
+    	postalCode: "0000-000",
+    	state: "EX"
+      } 
+  }
+  @brand = @sl.brands.new(attributes)
+  @brand.create
+```
+
+1. Get all brand accounts
+```ruby
+  @brand = @sl.brands.get(id)
+  @brand.get_accounts
+```

data/examples/compute.md

@@ -332,15 +332,31 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
     server.get_upgrade_options
   ```
 
-1. Update a server.
+1. Update a virtual guest server.
+Hash keys are the categories and the hash values are the capacity. You can retrieve them from upgrade options.
 
   ```ruby
     new_attributes = {
-      :cpu => 2,
-      :memory => 1, # this value is in GBs
-      :max_port_speed => 100, # this value is in MPBSs
+      :guest_core => 2,
+      :ram => 1, # this value is in GBs
+      :port_speed => 100, # this value is in MPBSs
       :time => Time.now + 5.minutes # if you don't specify, time will be equal to now
     }
+
+    server = @sl.servers.get(123456)
+    server.update(new_attributes)
+  ```
+
+1. Update a bare metal server.
+Hash keys are the categories and the hash values are the capacity. You can retrieve them from upgrade options.
+
+  ```ruby
+    new_attributes = {
+      :ram => 4, # this value is in GBs
+      :port_speed => 100, # this value is in MPBSs
+      :maintenance_window => 1111 # should see examples/network "Get a datacenter maintenance windows."
+    }
+
     server = @sl.servers.get(123456)
     server.update(new_attributes)
   ```

data/examples/network.md

@@ -275,3 +275,9 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
 		# You can't delete a network if it has actively routed addresses...
 	```
 	
+1. Get a datacenter maintenance windows.
+
+	```ruby
+	dc = @sl.datacenters.by_name('YOUR_DATACENTER')
+	dc.get_maintenance_windows(begin_date, end_date, slots_number) # dates need be a Datetime
+	```

data/lib/fog/softlayer.rb

@@ -13,6 +13,10 @@ require File.expand_path('../softlayer/ext/string', __FILE__)
 require File.expand_path('../softlayer/ext/hash', __FILE__) unless {}.respond_to? :deep_merge
 
 module Fog
+  module Account
+    autoload :Softlayer, File.expand_path('../softlayer/account', __FILE__)
+  end
+
   module Compute
     autoload :Softlayer, File.expand_path('../softlayer/compute', __FILE__)
   end
@@ -38,6 +42,7 @@ module Fog
     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(:account, 'Account')
     service(:compute, 'Compute')
     service(:dns, 'DNS')
     service(:network, 'Network')

data/lib/fog/softlayer/account.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/softlayer/compute/shared'
+
+module Fog
+  module Account
+    class Softlayer < Fog::Service
+      # Client credentials
+      requires :softlayer_username, :softlayer_api_key
+
+      model_path 'fog/softlayer/models/account'
+      collection    :brands
+      model         :brand
+
+      request_path 'fog/softlayer/requests/account'
+      request :create_brand
+      request :get_account_owned_brands
+      request :get_brand
+      request :get_brand_owned_accounts
+
+      # The Mock Service allows you to run a fake instance of the Service
+      # which makes no real connections.
+      #
+      #
+      class Mock
+        include Fog::Softlayer::Compute::Shared
+
+        def initialize(options={})
+          @brands = []
+          @accounts = [{'id' => 1}]
+          super(options)
+        end
+
+        def credentials
+          { :provider           => 'softlayer',
+            :softlayer_username => @softlayer_username,
+            :softlayer_api_key  => @softlayer_api_key
+          }
+        end
+      end
+
+      ##
+      # Makes real connections to Softlayer.
+      #
+      class Real
+        include Fog::Softlayer::Slapi
+        include Fog::Softlayer::Compute::Shared
+
+        def initialize(options={})
+          @softlayer_api_key = options[:softlayer_api_key]
+          @softlayer_username = options[:softlayer_username]
+        end
+
+        def request(service, path, options = {})
+          options = {:username => @softlayer_username, :api_key => @softlayer_api_key}.merge(options)
+          Fog::Softlayer::Slapi.slapi_request(service, path, options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/compute.rb

@@ -76,8 +76,6 @@ module Fog
       request :reboot_vm
       request :update_key_pair
 
-      request :place_order, 'fog/softlayer/requests/product'
-
       # The Mock Service allows you to run a fake instance of the Service
       # which makes no real connections.
       #

data/lib/fog/softlayer/models/account/brand.rb

@@ -0,0 +1,50 @@
+#
+# 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 Brand < Fog::Model
+        identity  :id, :type => :integer
+        attribute :catalog_id, :aliases => 'catalogId', :type => :integer
+        attribute :key_name, :aliases => 'keyName'
+        attribute :long_name, :aliases => 'longName'
+        attribute :name
+        attribute :account
+
+        def initialize(attributes = {})
+          super(attributes)
+        end
+
+        def get_accounts
+          service.get_brand_owned_accounts(id).body
+        end
+
+        def save
+          return create if attributes[:id].nil?
+          raise StandardError, "Update is not implemented"
+        end
+
+        def create
+          template = create_template
+          service.create_brand(template).body
+        end
+
+        private
+
+        def create_template
+          {
+            keyName: attributes[:key_name],
+            longName: attributes[:long_name],
+            name: attributes[:name],
+            account: attributes[:account]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/account/brands.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/softlayer/models/account/brand'
+
+module Fog
+  module Account
+    class Softlayer
+      class Brands < Fog::Collection
+        model Fog::Account::Softlayer::Brand
+
+        def all
+          data = service.get_account_owned_brands
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = service.get_brand(identifier).body
+          new.merge_attributes(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/compute/server.rb

@@ -362,11 +362,12 @@ module Fog
           service.get_virtual_guest_upgrade_item_prices(id).body
         end
 
-        def update(update_attributes = {})
-          raise Exception("Need implementation for BM") if bare_metal?
+        def update(update_attributes)
+          raise ArgumentError if update_attributes.nil?
+          product_connection
           prices = get_item_prices_id(update_attributes)
-          order = generate_upgrade_order(prices, update_attributes[:time])
-          service.place_order(order).body
+          order = generate_upgrade_order(prices, update_attributes[:time] || update_attributes[:maintenance_window])
+          @product_conn.place_order(order).body
         end
 
         def generate_order_template
@@ -386,6 +387,21 @@ module Fog
           )
         end
 
+        def product_connection
+          if Fog.mock?
+            @product_conn = Fog::Softlayer::Product.new(
+                :provider => :softlayer,
+                :softlayer_username => service.instance_variable_get(:@credentials)[:username],
+                :softlayer_api_key => service.instance_variable_get(:@credentials)[:api_key]
+            )
+          end
+          @product_conn ||= Fog::Softlayer::Product.new(
+              :provider => :softlayer,
+              :softlayer_username => service.instance_variable_get(:@softlayer_username),
+              :softlayer_api_key =>  service.instance_variable_get(:@softlayer_api_key)
+          )
+        end
+
         def _get_private_vlan
           if self.id
             vlan_id = if bare_metal?
@@ -491,37 +507,56 @@ module Fog
         end
 
         def get_item_prices_id_by_value(item_price_array, category, value)
-          item_price_array = item_price_array.select { |item_price| item_price["categories"].find { |category_hash| category_hash["categoryCode"] == category } }
-          item_price = item_price_array.find { |item_price| item_price['item']['capacity'].to_i == value }
-          item_price["id"]
+          item_prices = item_price_array.select { |item_price| item_price["categories"].find { |category_hash| category_hash["categoryCode"] == category } }
+          item_price = item_prices.find { |item_price| item_price['item']['capacity'] == value.to_s }
+          item_price.nil? ? "" : item_price["id"]
         end
 
         def get_item_prices_id(update_attributes)
           item_price_array = get_upgrade_options
-          categories = {:cpu => "guest_core", :memory => "ram", :max_port_speed => "port_speed"}
-          prices = []
           update_attributes.delete(:time)
-          update_attributes.each_pair { |key, value| prices << { :id => get_item_prices_id_by_value(item_price_array, categories[key], update_attributes[key]) } }
-          prices
+          update_attributes.delete(:maintenance_window)
+          update_attributes.map { |key, value| { :id => get_item_prices_id_by_value(item_price_array, key.to_s, value) } }
         end
 
-        def generate_upgrade_order(prices, time)
+        def bm_upgrade_order_template(value)
           {
-            :complexType => 'SoftLayer_Container_Product_Order_Virtual_Guest_Upgrade',
-            :prices => prices,
-            :properties => [
+            :complexType => 'SoftLayer_Container_Product_Order_Hardware_Server_Upgrade',
+            :hardware => [
               {
-                :name => 'MAINTENANCE_WINDOW',
-                :value => time.present? ? time.iso8601 : Time.now.iso8601
+                :id => id
               }
             ],
+            :properties => [
+              {
+                :name => 'MAINTENANCE_WINDOW_ID',
+                :value => value
+              }
+            ]
+          }
+        end
+
+        def vm_upgrade_order_template(time)
+          {
+            :complexType => 'SoftLayer_Container_Product_Order_Virtual_Guest_Upgrade',
             :virtualGuests => [
               {
                 :id => id
               }
+            ],
+            :properties => [
+              {
+                :name => 'MAINTENANCE_WINDOW',
+                :value => (time.nil? || time.empty?) ? Time.now.iso8601 : time.iso8601
+              }
             ]
           }
         end
+
+        def generate_upgrade_order(prices, value)
+          return bm_upgrade_order_template(value).merge({ :prices => prices }) if bare_metal?
+          vm_upgrade_order_template(value).merge({ :prices => prices })
+        end
       end
     end
   end

data/lib/fog/softlayer/models/network/datacenter.rb

@@ -29,6 +29,10 @@ module Fog
           @routable_subnets ||= service.request(:location_datacenter, "#{id}/get_bound_subnets").body
         end
 
+        def get_avaliable_maintenance_windows(begin_date, end_date, slots_number)
+          service.get_maintenance_windows(id, begin_date, end_date, slots_number).body
+        end
+
         def save
           raise "Not possible."
         end