fog-softlayer 0.4.5 → 0.4.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmM2YjQyOGY4OTJhMGQxM2Y2NjMxOWM3OTI4MmQ4ZmQ1YWQ5YTVhZQ==
-  data.tar.gz: !binary |-
-    ZTI0NzU5MzQ3OWNjYTliZmRlYzFiZjU5ZDc5NjEwYzBmNTFmYjVjNg==
+SHA1:
+  metadata.gz: e7d1c6f03ac2e0040db85db4721b27d0d4cd64cb
+  data.tar.gz: bdc6756610695169ad345a08c366322bebb1bf4f
 SHA512:
-  metadata.gz: !binary |-
-    ZWQ5ZmEzOGM0YTA0N2M2ZDVjYzE5ODMyM2ZmZmI3MTA0YzFlNjc5NTdiYzVh
-    MTcyZmYxYWE4YzZmNTQ3MGZmMjg1ZDU1ZGEwNzhhYzUxNWIzZTViNTY5MjI1
-    MDhmMjEzMmE1Y2Y4NmNiZTM5MjlkMWFhMzI5YWZiMGRjYzY1ODY=
-  data.tar.gz: !binary |-
-    N2YxYmE2OWQ4Yzg2NDY4MGFmYTM0NmQwYjc4ZGQ2ODk5N2RkMGFlZDNjOTRl
-    YjJkNDQxMmE3ZTNhMWRlNmVlOWUzOGU4MWQ0NGQxYjhmNjBlYWMwMThhYzRi
-    NjIzNTM3Y2M5MmUxOTdkZDQ5MTYxNDE0ODBmOWM3ODQyOTZkYTU=
+  metadata.gz: 78c526fb8b3708aad63c410bbd34d6ead32c8f7ecaa43bae0d3706667ea08909fde2b4e1c6231b37863a11d37e47cf61843667ad2d131411925f8eec93914427
+  data.tar.gz: 549aa937fb695071e6e85f3c7860899958781ca58d0e3d8a69f36c21a0ff3cc684c10f0a0a50df0a74257ef0b27bc254c4feead972cce9c7b1ec83361bc2b258

data/examples/compute.md

@@ -141,7 +141,7 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
 
    ```ruby
      opts = {
-     	:flavor_id => "m1.small",
+     	:flavor_id => "m1.medium",
      	:os_code => "UBUNTU_LATEST",
      	:name => "test1",
      	:datacenter => "ams01",
@@ -173,7 +173,7 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
    opts = {
      	:cpu => 8,
      	:ram => 16348,     	
-     	:disk => {'capacity' => 100 },
+     	:disk => {'capacity' => 500 },
      	:ephemeral_storage => true,
      	:domain => "not-my-default.com",
      	:name => "hostname",
@@ -299,7 +299,6 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
 		
 	```
 
-
 1. Get all options to create a bare metal.
 
    ```ruby
@@ -324,4 +323,88 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
   ```ruby
     server = @sl.servers.get(123456)
     server.get_users
-  ```  
+  ```
+
+1. Get all upgrade options of a server.
+
+  ```ruby
+    server = @sl.servers.get(123456)
+    server.get_upgrade_options
+  ```
+
+1. Update a server.
+
+  ```ruby
+    new_attributes = {
+      :cpu => 2,
+      :memory => 1, # this value is in GBs
+      :max_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. Generate an order template for VM with flavor (simple).
+
+   ```ruby
+     opts = {
+     	:flavor_id => "m1.small",
+     	:image_id => "23f7f05f-3657-4330-8772-329ed2e816bc",
+     	:name => "test",
+     	:datacenter => "ams01"
+     }
+     new_server = @sl.servers.new(opts)
+     new_server.generate_order_template
+   ```
+
+1. Generate an order template for Bare Metal instance with flavor (simple).
+
+   ```ruby
+     opts = {
+     	:flavor_id => "m1.medium",
+     	:os_code => "UBUNTU_LATEST",
+     	:name => "test1",
+     	:datacenter => "ams01",
+     	:bare_metal => true
+     }
+     new_server = @sl.servers.new(opts)
+     new_server.generate_order_template
+   ```
+
+1. Generate an order template for VM without flavor.
+
+   ```ruby
+   	opts = {
+     	:cpu => 2,
+     	:ram => 2048,
+     	:disk => [{'device' => 0, 'diskImage' => {'capacity' => 100 } }],
+     	:ephemeral_storage => true,
+     	:domain => "not-my-default.com",
+     	:name => "hostname",
+     	:os_code => "UBUNTU_LATEST",
+     	:name => "test2",
+     	:datacenter => "ams01"
+     }
+     new_server = @sl.servers.new(opts)
+     new_server.generate_order_template
+   ```
+
+1. Generate an order template for Bare Metal Instance without a flavor
+
+   ```ruby
+   opts = {
+     	:cpu => 8,
+     	:ram => 16348,
+     	:disk => {'capacity' => 500 },
+     	:ephemeral_storage => true,
+     	:domain => "not-my-default.com",
+     	:name => "hostname",
+     	:os_code => "UBUNTU_LATEST",
+     	:name => "test2",
+     	:datacenter => "ams01",
+     	:bare_metal => true
+     }
+     new_server = @sl.servers.new(opts)
+     new_server.generate_order_template
+   ```

data/lib/fog/softlayer/compute.rb

@@ -46,12 +46,15 @@ module Fog
       request :delete_vm
       request :delete_vm_tags
       request :describe_tags
+      request :generate_bare_metal_order_template
+      request :generate_virtual_guest_order_template
       request :get_bare_metal_active_tickets
       request :get_bare_metal_create_options
       request :get_bare_metal_server
       request :get_bare_metal_server_by_ip
       request :get_bare_metal_servers
       request :get_bare_metal_tags
+      request :get_bare_metal_upgrade_item_prices
       request :get_bare_metal_users
       request :get_key_pair
       request :get_key_pairs
@@ -60,6 +63,7 @@ module Fog
       request :get_virtual_guest_active_tickets
       request :get_virtual_guest_by_ip
       request :get_virtual_guest_create_options
+      request :get_virtual_guest_upgrade_item_prices
       request :get_virtual_guest_users
       request :get_vm_tags
       request :get_vm
@@ -72,6 +76,8 @@ 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/compute/server.rb

@@ -357,6 +357,25 @@ module Fog
           service.get_virtual_guest_users(id).body
         end
 
+        def get_upgrade_options
+          return service.get_bare_metal_upgrade_item_prices(id).body if bare_metal?
+          service.get_virtual_guest_upgrade_item_prices(id).body
+        end
+
+        def update(update_attributes = {})
+          raise Exception("Need implementation for BM") if bare_metal?
+          prices = get_item_prices_id(update_attributes)
+          order = generate_upgrade_order(prices, update_attributes[:time])
+          service.place_order(order).body
+        end
+
+        def generate_order_template
+          copy = self.dup
+          copy.pre_save
+          return service.generate_bare_metal_order_template(copy.attributes).body if bare_metal?
+          service.generate_virtual_guest_order_template(copy.attributes).body
+        end
+
         private
 
         def network_connection
@@ -440,7 +459,6 @@ module Fog
           attributes.delete(:ephemeral_storage)
         end
 
-
         ##
         # Expand a "flavor" into cpu, ram, and disk attributes
         def extract_flavor
@@ -460,8 +478,8 @@ module Fog
 
         def validate_attributes
           requires :name, :domain, :cpu, :ram, :datacenter
-          requires_one :os_code, :image_id
-          requires_one :image_id, :disk
+          requires_one :os_code if self.attributes[:os_code].nil? # need this while os_code bug isn't fixed
+          requires_one :disk, :image_id
           bare_metal? and image_id and raise ArgumentError, "Bare Metal Cloud does not support booting from Image"
         end
 
@@ -472,6 +490,38 @@ module Fog
           self.datacenter = service.softlayer_default_datacenter if service.softlayer_default_datacenter and attributes[:datacenter].nil?
         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"]
+        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
+        end
+
+        def generate_upgrade_order(prices, time)
+          {
+            :complexType => 'SoftLayer_Container_Product_Order_Virtual_Guest_Upgrade',
+            :prices => prices,
+            :properties => [
+              {
+                :name => 'MAINTENANCE_WINDOW',
+                :value => time.present? ? time.iso8601 : Time.now.iso8601
+              }
+            ],
+            :virtualGuests => [
+              {
+                :id => id
+              }
+            ]
+          }
+        end
       end
     end
   end

data/lib/fog/softlayer/product.rb

@@ -30,6 +30,7 @@ module Fog
       request :get_package_item
       request :get_package_items
       request :get_packages
+      request :place_order
 
       # The Mock Service allows you to run a fake instance of the Service
       # which makes no real connections.

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

@@ -0,0 +1,162 @@
+#
+# 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
+        # Generate an order template for a Bare Metal
+        # @param [Integer] order_template
+        # @return [Excon::Response]
+        def generate_bare_metal_order_template(order_template)
+          raise ArgumentError, "Fog::Compute::Softlayer#create_vms expects argument of type Hash" unless order_template.kind_of?(Hash)
+          response = Excon::Response.new
+          required = %w{hostname domain processorCoreAmount memoryCapacity hourlyBillingFlag operatingSystemReferenceCode}
+          begin
+            raise MissingRequiredParameter unless Fog::Softlayer.valid_request?(required, order_template)
+            response.status = 200
+            response.body = order_template_mock
+          rescue MissingRequiredParameter
+            response.status = 500
+            response.body = {
+              "code" => "SoftLayer_Exception_MissingCreationProperty",
+              "error" => "Properties #{required.join(', ')} ALL must be set to create an instance of 'SoftLayer_Virtual_Guest'."
+            }
+          end
+          @virtual_guests.push(response.body).flatten!
+          response
+        end
+      end
+
+      class Real
+        def generate_bare_metal_order_template(order_template)
+          request(:hardware_server, :generate_order_template, body: order_template, :http_method => :POST)
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        def order_template_mock
+          {
+            "hardware"=>[
+              {
+                "domain"=>"example.com",
+                "hostname"=>"host1"
+              }
+            ],
+            "location"=>"265592",
+            "packageId"=>50,
+            "prices"=>[
+              {
+                "hourlyRecurringFee"=>".24",
+                "id"=>1921,
+                "recurringFee"=>"159",
+                "item"=>{
+                  "description"=>"2 x 2.0 GHz Core Bare Metal Instance - 2 GB Ram"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>37620,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Ubuntu Linux 14.04 LTS Trusty Tahr - Minimal Install (64 bit)"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>1267,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"500 GB SATA II"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>55,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Host Ping"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>57,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Email and Ticket"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>58,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Automated Notification"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>40640,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"100 Mbps Dual Public & Private Network Uplinks (Unbonded)"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>1800,
+                "item"=>{
+                  "description"=>"0 GB Bandwidth"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>420,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Unlimited SSL VPN Users & 1 PPTP VPN User per account"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>418,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Nessus Vulnerability Assessment & Reporting"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>905,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Reboot / Remote Console"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>21,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"1 IP Address"
+                }
+              }
+            ],
+            "quantity"=>1,
+            "sshKeys"=>[],
+            "useHourlyPricing"=>true
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,173 @@
+#
+# 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
+        # Generate an order template for a Virtual Guest
+        # @param [Integer] order_template
+        # @return [Excon::Response]
+        def generate_virtual_guest_order_template(order_template)
+          raise ArgumentError, "Fog::Compute::Softlayer#create_vms expects argument of type Hash" unless order_template.kind_of?(Hash)
+          response = Excon::Response.new
+          required = %w{hostname domain startCpus maxMemory hourlyBillingFlag localDiskFlag}
+          begin
+            raise MissingRequiredParameter unless Fog::Softlayer.valid_request?(required, order_template)
+            response.status = 200
+            response.body = order_template_mock
+          rescue MissingRequiredParameter
+            response.status = 500
+            response.body = {
+              "code" => "SoftLayer_Exception_MissingCreationProperty",
+              "error" => "Properties #{required.join(', ')} ALL must be set to create an instance of 'SoftLayer_Virtual_Guest'."
+            }
+          end
+          @virtual_guests.push(response.body).flatten!
+          response
+        end
+      end
+
+      class Real
+        def generate_virtual_guest_order_template(order_template)
+          request(:virtual_guest, :generate_order_template, body: order_template, :http_method => :POST)
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        def order_template_mock
+          {
+            "imageTemplateId"=>nil,
+            "location"=>"265592",
+            "packageId"=>46,
+            "prices"=>[
+              {
+                "hourlyRecurringFee"=>".021",
+                "id"=>1640,
+                "recurringFee"=>"15",
+                "item"=>{
+                  "description"=>"1 x 2.0 GHz Core"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>".019",
+                "id"=>1644,
+                "recurringFee"=>"12.6",
+                "item"=>{
+                  "description"=>"1 GB"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>37202,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Ubuntu Linux 14.04 LTS Trusty Tahr - Minimal Install (64 bit)"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>13899,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"25 GB (LOCAL)"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>55,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Host Ping"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>57,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Email and Ticket"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>58,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Automated Notification"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>272,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"10 Mbps Public & Private Network Uplinks"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>1800,
+                "item"=>{
+                  "description"=>"0 GB Bandwidth"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>420,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Unlimited SSL VPN Users & 1 PPTP VPN User per account"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>418,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Nessus Vulnerability Assessment & Reporting"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>905,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"Reboot / Remote Console"
+                }
+              },
+              {
+                "hourlyRecurringFee"=>"0",
+                "id"=>21,
+                "recurringFee"=>"0",
+                "item"=>{
+                  "description"=>"1 IP Address"
+                }
+              }
+            ],
+            "quantity"=>1,
+            "sourceVirtualGuestId"=>nil,
+            "sshKeys"=>[],
+            "useHourlyPricing"=>true,
+            "virtualGuests"=>[
+              {
+                "domain"=>"example.com",
+                "hostname"=>"host1"
+              }
+            ],
+            "complexType"=>"SoftLayer_Container_Product_Order_Virtual_Guest"
+          }
+        end
+      end
+    end
+  end
+end