fog-softlayer 0.3.15 → 0.3.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM3ZjY0NjYzYjg4ZmQ3YjA1MDUzODVmNDk3OWQwMjhiNWI0ZDE3Nw==
+    NmQwNjc3NzUzZWIwY2I2YTcwYjNjYzA5ZDFjNGRhYWI1ZmIxOWZlMA==
   data.tar.gz: !binary |-
-    NGUzN2I2ZmFhZjk3MjU2Y2IxZmNlOGM2ZGFmNjY3MTFkMDhlMjRkOQ==
+    ZjNkZGM0NmM4ODhiMzY0ZjhmZDkxMjNmMTNiMGI2YjcxYmM5Zjk0MA==
 SHA512:
   metadata.gz: !binary |-
-    YmRhZjg5Mjc4ZGE0MjRkYTAwMmI1ZDdhM2NjZWMwYjAyOGRkOGE0Y2MyZDQ1
-    MWQyYzBjMTdlODQ4NWIwMTllMTMxNTRkNDYxZDcwZjIyNDY1ZTUwNDVkODQ4
-    NzQxZjI1ZjQ1NGNhNDljODk4NTM5MjNhYmM4ZjEyNmNiNmE5NzI=
+    OTQ2ZGIxMDEyYzkzMDk4MzVlNmZmMDM5ZjgzM2YxMTJiZGQ2NjMwOGNjYWU1
+    MjVjNTZmMDk3ZDM2ZGZkODM5ZThlZDkxYzgxMGIzYWRkNmUzMTk2NTZhMjA3
+    YjgwOTFhNGNiYzA5ODA3NGQ2NTM2OTJhNmQ4ZTZmZjNjOTcwMjQ=
   data.tar.gz: !binary |-
-    ZDNiMGJiNTUyZDgzODZjN2QwZTRkOTRkNDU1NjczOTNiZDc0MGU5MGRhOGU5
-    ZDgyZTY0Zjk0MzU4MGEwMTM2OTA0ZTkxNDgyZjA2NDg1ZDU0MDIzNGNlMjg0
-    ZTRlNWI1M2RiNmI0ZDg1Y2UzNjBkZGQzMTk4ZjgyMjRmNmI3MWU=
+    MGJkMGJkYzZlMWVhMjg0NTVlNGJlYjI5ZDFhMzU3YjgzYzRjM2NlYTdkODgy
+    MDU2MTg2ZGM5OTZmOGI5YzEyODBmODc5NGM0MWJiYzYzN2ZlYzE3MGZiNTBl
+    Yjk2YTY3ZWUxZGIyNTBkN2UwODI1NzhjMTlkYmEyNzg2NjUzYzk=

data/lib/fog/softlayer/compute.rb

@@ -27,6 +27,8 @@ module Fog
       model         :image
       collection    :key_pairs
       model         :key_pair
+      collection    :network_components
+      model         :network_component
       collection    :servers
       model         :server
       collection    :tags

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

@@ -0,0 +1,44 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Softlayer
+      class NetworkComponent < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :port
+        attribute :mac_address,               :aliases => 'macAddress'
+        attribute :max_speed,                 :aliases => 'maxSpeed'
+        attribute :modify_date,               :aliases => 'modifyDate'
+        attribute :status
+        attribute :speed
+        attribute :primary_ip_address,        :aliases => 'primaryIpAddress'
+
+        def save
+          raise "#{self.class.name} objects are readonly."
+        end
+
+        def create
+          raise "#{self.class.name} objects are readonly."
+        end
+
+        def update
+          raise "#{self.class.name} objects are readonly."
+        end
+
+        def destroy
+          raise "#{self.class.name} objects are readonly."
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/softlayer/models/compute/key_pair'
+
+module Fog
+  module Compute
+    class Softlayer
+      class NetworkComponents < Fog::Collection
+        model Fog::Compute::Softlayer::NetworkComponent
+
+        # just a stub
+
+      end
+    end
+  end
+end

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

@@ -28,6 +28,7 @@ module Fog
         attribute :image_id
         attribute :ephemeral_storage,        :aliases => 'localDiskFlag'
         attribute :key_pairs,                :aliases => 'sshKeys'
+        attribute :network_components
 
         # Times
         attribute :created_at,              :aliases => ['createDate', 'provisionDate'], :type => :time
@@ -129,6 +130,14 @@ module Fog
           if self.key_pairs
             attributes[:key_pairs].map! { |key| { :id => key.id } }
           end
+          if self.network_components
+            self.network_components = self.network_components.map do |component|
+              component[:maxSpeed] = component.delete(:speed) if component[:speed]
+              component[:maxSpeed] = component.delete(:max_speed) if component[:max_speed]
+              component
+            end
+          end
+
           remap_attributes(attributes, attributes_mapping)
           clean_attributes
         end
@@ -202,6 +211,30 @@ module Fog
           attributes[:user_data]
         end
 
+        def network_components
+          if id
+            (public_network_components << private_network_components).flatten
+          else
+            attributes[:network_components]
+          end
+        end
+
+        def public_network_components
+          if attributes['frontendNetworkComponents']
+            attributes['frontendNetworkComponents'].map { |n| Fog::Compute::Softlayer::NetworkComponent.new(n) }
+          else
+            []
+          end
+        end
+
+        def private_network_components
+          if attributes['backendNetworkComponents']
+            attributes['backendNetworkComponents'].map { |n| Fog::Compute::Softlayer::NetworkComponent.new(n) }
+          else
+            []
+          end
+        end
+
         def ready?
           if bare_metal?
             state == "on"
@@ -311,7 +344,8 @@ module Fog
               :private_vlan => :primaryBackendNetworkComponent,
               :key_pairs => :sshKeys,
               :private_network_only => :privateNetworkOnlyFlag,
-              :user_data => :userData
+              :user_data => :userData,
+              :network_components => :networkComponents,
           }
 
           conditional = if bare_metal?

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

@@ -26,7 +26,7 @@ module Fog
 
       class Real
         def get_bare_metal_server(identifier)
-          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData]')
+          request(:hardware_server, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,memory,provisionDate,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData,frontendNetworkComponents,backendNetworkComponents]')
         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, :query => 'objectMask=mask[datacenter,tagReferences,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData]')
+          request(:account, :get_hardware, :query => 'objectMask=mask[datacenter,tagReferences,memory,processorCoreAmount,hardDrives,datacenter,hourlyBillingFlag,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData,frontendNetworkComponents,backendNetworkComponents]')
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Fog
 
       class Real
         def get_vm(identifier)
-          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData]')
+          request(:virtual_guest, identifier, :expected => [200, 404], :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,sshKeys.id,privateNetworkOnlyFlag,userData,frontendNetworkComponents,backendNetworkComponents]')
         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, :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,primaryNetworkComponent.networkVlan,sshKeys.id,privateNetworkOnlyFlag,userData]')
+          request(:account, :get_virtual_guests, :query => 'objectMask=mask[datacenter,tagReferences,blockDevices,blockDeviceTemplateGroup.globalIdentifier,operatingSystem.softwareLicense.softwareDescription.referenceCode,primaryNetworkComponent.networkVlan,sshKeys.id,privateNetworkOnlyFlag,userData,frontendNetworkComponents,backendNetworkComponents]')
         end
       end
     end

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.3.15"
+    VERSION = "0.3.16"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Matt Eldridge
@@ -219,6 +219,8 @@ files:
 - lib/fog/softlayer/models/compute/images.rb
 - lib/fog/softlayer/models/compute/key_pair.rb
 - lib/fog/softlayer/models/compute/key_pairs.rb
+- lib/fog/softlayer/models/compute/network_component.rb
+- lib/fog/softlayer/models/compute/network_components.rb
 - lib/fog/softlayer/models/compute/server.rb
 - lib/fog/softlayer/models/compute/servers.rb
 - lib/fog/softlayer/models/compute/tag.rb