fog-softlayer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQ0NDhiNGE1NjdjZmVjNWNhY2UxMTRkZjBiZWFhNjYwYTU2MTBlMA==
+    M2M4MGM2NTNkMTQ2M2UwZGUxZDU1MjBmZjJiZTIxY2ZkNzU3MWEyYg==
   data.tar.gz: !binary |-
-    NTljMjJlMmQ3N2JlYmY3ZTM4YmZiMmQwM2I4MTUyMjgxZjc4OGY0NA==
+    MjEwY2EzZmE4YTEwOTYyOTEyNTVjNDY0ODVhM2ExN2VkZGY1NTQzMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTBiMzQ1NDM5M2EzZWE5Y2U0ZDEzNmYzYjMxNDQ3MDExNzkzNTAzZjc0ZmY5
-    YWY4NTdjZmMxMjc3ODc1ZTE0ODVmMmM2MjkzNjk5ZWU2MzJlOTJiMjU3ZDEx
-    MjIyNjYyYWU5ZmUzMTVlNzNkZDkzNWY5NjJiNTQ2ZWFkMTNkZTA=
+    ZDRkN2ZmZmE1YWFmNGZmYWY5Yzk1ZjZlOTVkNWQ4MTVmMzkyNzYyOWJkYWY1
+    NzMxMzFkYzU1YTc5Y2IwMzM1M2YzZDhiMDc1YjU5NWY1ZjU1ZmEzNGQ5MTg3
+    MTYyYjlmMmEwY2Q4ZjY5NTM1MGUyZDliZDM0ZTJiZWNiOWE2NDU=
   data.tar.gz: !binary |-
-    YmI1NTgzZjI4ZjAyMWMyNTI1OTQwOTZkZDBjNjAwNWE2YmI3ZTI5NjIwOGUx
-    NDdmZGJmNjM1OWIzMmIxMzllMDBlZjkyNDM4MWNjMDhmOTg5Yjk5YTlkZjZk
-    M2I2NDY1M2YyZmNkMDhhZjI5ZmY1MmRmNDg4MGQxZTA0MDMzZGY=
+    N2NmN2YyNjUyZjUyZjhjNzBlNDZjYzM2MTQ0MzdlYjdkODA3YzYwMDJmMDE0
+    NDAyZjQ3NTdmYTM0NzYzNDgyNWFmYjUzZjE3NjM2Y2JiMmJmM2FmZTAwNjcw
+    MzgxOGVjZTRkMTBhOTg2MTkyYWY2ZDljNjlhNDU0ODdlZmY4ZDY=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.1 2014-06-10
+
+    * Fix Compute model after breaking change to SLAPI. :datecenter is no longer optional.
 ## 0.1.0 2014-06-10
 
     * Add missing get method to Fog::DNS::Softlayer::Record.

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

@@ -36,7 +36,7 @@ module Fog
 
         # Metadata
         attribute :account_id,              :aliases => 'accountId', :type => :integer
-        attribute :datacenter
+        attribute :datacenter,              :aliases => 'datacenter', :type => :squash
         attribute :single_tenant,           :aliases => 'dedicatedAccountHostOnlyFlag'
         attribute :global_identifier,       :aliases => 'globalIdentifier'
         attribute :hourly_billing_flag,     :aliases => 'hourlyBillingFlag'
@@ -66,6 +66,15 @@ module Fog
           attributes[:bare_metal] === 1 ? true : false
         end
 
+        def datacenter=(name)
+          name = name['name'] if name.is_a?(Hash)
+          attributes[:datacenter] = { :name => name }
+        end
+
+        def datacenter
+          attributes[:datacenter][:name] unless attributes[:datacenter].nil?
+        end
+
         def image_id=(uuid)
           attributes[:image_id] = {:globalIdentifier => uuid}
         end
@@ -241,7 +250,7 @@ module Fog
         end
 
         def validate_attributes
-          requires :name, :domain, :cpu, :ram
+          requires :name, :domain, :cpu, :ram, :datacenter
           requires_one :os_code, :image_id
           requires_one :image_id, :disk
           bare_metal? and image_id and raise ArgumentError, "Bare Metal Cloud does not support booting from Image"

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_bare_metal_server(identifier)
-          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
+          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_bare_metal_servers
-          request(:account, :get_hardware)
+          request(:account, :get_hardware, :query => 'objectMask=mask[datacenter,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.passwords.password]')
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_vm(identifier)
-          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
+          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_vms
-          request(:account, :get_virtual_guests)
+          request(:account, :get_virtual_guests, :query => 'objectMask=mask[datacenter,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.passwords.password]')
         end
       end
     end

data/lib/fog/softlayer/version.rb

@@ -6,6 +6,6 @@
 #
 module Fog
   module Softlayer
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/tests/softlayer/models/compute/server_tests.rb

@@ -13,7 +13,8 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
         :flavor_id => 'm1.small',
         :image_id => '23f7f05f-3657-4330-8772-329ed2e816bc',
         :name => 'test-vm',
-        :domain => 'example.com'
+        :domain => 'example.com',
+        :datacenter => 'dal05'
     }
 
     bmc_opts = {
@@ -21,7 +22,8 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
         :os_code => 'UBUNTU_LATEST',
         :name => 'test-bmc',
         :domain => 'bare-metal-server.com',
-        :bare_metal => true
+        :bare_metal => true,
+        :datecenter => 'dal05'
     }
 
     @vm = Fog::Compute[:softlayer].servers.new(vm_opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Eldridge