fog-softlayer 0.3.23 → 0.3.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzcxZGUzMTQwNmEzZTIyOGY2Zjk1YjI4ODQ2NjBkODU1OGFhYzE2Mw==
+    ZjA1MDg2NWU4OWViM2IyNTU4Y2Y1OTViOWEwMjIwZTM4ZTBjZjg4OA==
   data.tar.gz: !binary |-
-    MjljOTY0ZmVmNzBkMzY5ZmFhZWRjYTA1MTIwMWQzM2UyNDQzYmI5YQ==
+    NjFkODczNzBmOGQ2ZjlhNTIxYzE3ZWNjMTA3YjA3MmIxNzI5ZmMzZA==
 SHA512:
   metadata.gz: !binary |-
-    NzRmZDc3YWU0MzUxMDkxMmU0OTIyNWNmNzEzZDkwMDRhYjA1ZTNlMjVmMmMx
-    ZGI5ZWE3NjhmMjY4Y2YxYWRkNWY2MjZkOGM3MWE2YmQ5NGIyMmUyNTZlNGU3
-    NTFkNWMyMWJmZjc4YjgyNzA2NGViZDdjMTc4MmY4NGMwYWY4NmE=
+    Y2E0NWIxYTJjYzRiM2M5ZjdkODdjMTE5OTQ1OGJiYzA3ZDliZThhMzZlNGIx
+    N2E3NzcwOWExMzcyNGZkOGRjY2FlYzRjMjUxMDU2MjAxMzljYjdjY2JkMmVl
+    YmU2Y2FjNTVhYmZkYTJiOTVlZGIzYWQ0NzA4OGEzNDZlYTgxNjI=
   data.tar.gz: !binary |-
-    MjJkZTM2ODM3NjYzNjIxOWFkOTI3OGQzODliY2Q0OTg5Y2IxMjNmNjU4ZjU0
-    ODc1OGU3ZjY1MTc4YzM1ZDM4NWYwYzhiNjVmYzhkOWFkYThjMTczOGU0MmRm
-    MjJmMjZkNDEyM2M2ZWUxYTFkN2NjZmQ2ZWQwMzljYWRhOTk4YTc=
+    MzM3MmY5MTUxYzliNTRmNTFkNzY2NmZkYmY4MWQwNzk5NmY4MzkwOGEzMTJh
+    ZDM1YjM5ZjllNWVhNWEzYzQ1MzFlMTcyMzZlNjY4ZjQ4MjViM2VmYzFjZWRi
+    YTkxNDE4NzNkMzA0N2I2YmVlYTgzZWNkNjNhMDkzM2U5NDYyYWI=

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

@@ -23,24 +23,49 @@ module Fog
         attribute :broadcast,             :aliases => 'broadcastAddress'
         attribute :gateway
         attribute :datacenter,            :squash => :name
+        attribute :address_space,         :aliases => 'addressSpace'
 
         def addresses
-          @addresses ||= attributes['ipAddresses'].map do |address|
-            service.ips.get(address['id'])
+          @addresses ||= begin
+            if attributes['ipAddresses'].nil?
+              []
+            else
+              attributes['ipAddresses'].map do |address|
+                service.ips.get(address['id'])
+              end
+            end
           end
         end
 
+        #def addresses=(addresses)
+        #  @addresses = addresses
+        #end
+
+        def portable?
+          type == 'ROUTED_TO_VLAN'
+        end
+
+        def private?
+          address_space == 'PRIVATE'
+        end
+
+        def public?
+          not private?
+        end
+
         def save
           requires :network_id, :cidr, :ip_version
           identity ? update : create
         end
 
-        def create
-          requires :network_id, :cidr, :ip_version
-          merge_attributes(service.create_subnet(self.network_id,
-                                                 self.cidr,
-                                                 self.ip_version,
-                                                 self.attributes).body['subnet'])
+        def create(address_count=4)
+          requires :vlan_id
+          response = service.create_subnet(build_order(address_count)).body
+          merge_attributes(response)
+          #merge_attributes(service.create_subnet(self.network_id,
+          #                                       self.cidr,
+          #                                       self.ip_version,
+          #                                       self.attributes).body['subnet'])
           self
         end
 
@@ -56,6 +81,22 @@ module Fog
           service.delete_subnet(self.id)
           true
         end
+
+        private
+
+        def build_order(address_count)
+          order = {
+              'complexType' => 'SoftLayer_Container_Product_Order_Network_Subnet',
+              'location' => datacenter,
+              'quantity' =>1,
+              'packageId' =>0,
+              'prices' =>[
+                  {'id' => portable? ? service.get_portable_subnet_price_code(address_count, public?) : service.get_subnet_price_code }
+              ]
+          }
+          order['endPointVlanId'] = vlan_id if portable?
+          order
+        end
       end
     end
   end

data/lib/fog/softlayer/network.rb

@@ -39,6 +39,7 @@ module Fog
 
       request :list_networks
       request :create_network
+      request :create_subnet
       request :delete_network
       request :get_network
 
@@ -46,6 +47,8 @@ module Fog
       request :get_public_vlan_price_code
       request :get_subnet_package_id
       request :get_subnet_price_code
+      request :get_portable_subnet_package_id
+      request :get_portable_subnet_price_code
       request :get_datacenters
       request :get_datacenter_routers
       request :get_references_by_tag_name

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

@@ -0,0 +1,27 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Network
+    class Softlayer
+
+      class Mock
+        def create_subnet(order)
+          raise ArgumentError, "Order argument for #{self.class.name}##{__method__} must be Hash." unless order.is_a?(Hash)
+          # TODO: more than a stub
+        end
+      end
+
+      class Real
+        def create_subnet(order)
+          raise ArgumentError, "Order argument for #{self.class.name}##{__method__} must be Hash." unless order.is_a?(Hash)
+          self.request(:product_order, :place_order, :body => order, :http_method => :post)
+        end
+      end
+    end
+  end
+end

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

@@ -33,7 +33,10 @@ module Fog
 
       class Real
         def get_datacenter_routers(id)
-          request(:location_datacenter, "#{id}/get_hardware_routers", :query => 'objectMask=id;hostname')
+          Excon.defaults[:read_timeout] *= 2 # this SLAPI method is incredibly slow to respond
+          result = request(:location_datacenter, "#{id}/get_hardware_routers", :query => 'objectMask=id;hostname')
+          Excon.defaults[:read_timeout] /= 2
+          result
         end
       end
     end

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

@@ -0,0 +1,33 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Network
+    class Softlayer
+
+      class Mock
+
+        def get_portable_subnet_package_id(address_space)
+          address_space.downcase!; err_msg = "Argument for #{self.class.name}##{__method__} must be 'PRIVATE' or 'PUBLIC'."
+          raise ArgumentError, err_msg unless %{private public}.include?(address_space)
+          42
+        end
+
+      end
+
+      class Real
+        def get_portable_subnet_package_id(address_space)
+          address_space.downcase!; err_msg = "Argument for #{self.class.name}##{__method__} must be 'PRIVATE' or 'PUBLIC'."
+          raise ArgumentError, err_msg unless %{private public}.include?(address_space)
+          request(:product_package, '0/get_configuration', :query => 'objectMask=mask[isRequired,itemCategory]').body.map do |item|
+            item['itemCategory']['id'] if item['itemCategory']['categoryCode'] == "sov_sec_ip_addresses_#{address_space == 'public' ? 'pub' : 'priv'}"
+          end.compact.first
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+module Fog
+  module Network
+    class Softlayer
+
+      class Mock
+
+        def get_portable_subnet_price_code(address_count, public=true)
+          42
+        end
+
+      end
+
+      class Real
+        def get_portable_subnet_price_code(address_count, public=true)
+          portable_subnet_package_id = get_portable_subnet_package_id(public ? 'PUBLIC' : 'PRIVATE')
+          request(:product_package, '0/get_item_prices', :query => 'objectMask=mask[id,categories.id,item.description]').body.map do |item|
+            catg = item['categories'][0]
+            item['id'] if catg['id'] == portable_subnet_package_id && item['item']['description'] =~ /^#{address_count}/
+          end.compact.first
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Fog
 
       class Real
         def get_subnet(id)
-          self.request(:network_subnet, "#{id}/get_object", :query => 'objectMask=mask[datacenter,ipAddresses.id,virtualGuests.fullyQualifiedDomainName,virtualGuests.id,hardware.fullyQualifiedDomainName,hardware.id]')
+          self.request(:network_subnet, "#{id}/get_object", :query => 'objectMask=mask[datacenter,ipAddresses.id,virtualGuests.fullyQualifiedDomainName,virtualGuests.id,hardware.fullyQualifiedDomainName,hardware.id,addressSpace]')
         end
       end
     end

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

@@ -11,14 +11,18 @@ module Fog
 
       class Mock
 
-        def get_subnet_package_id
+        def get_subnet_package_id(address_space)
+          address_space.downcase!; err_msg = "Argument for #{self.class.name}##{__method__} must be 'PRIVATE' or 'PUBLIC'."
+          raise ArgumentError, err_msg unless %{private public}.include?(address_space)
           42
         end
 
       end
 
       class Real
-        def get_subnet_package_id
+        def get_subnet_package_id(address_space)
+          address_space.downcase!; err_msg = "Argument for #{self.class.name}##{__method__} must be 'PRIVATE' or 'PUBLIC'."
+          raise ArgumentError, err_msg unless %{private public}.include?(address_space)
           request(:product_package, '0/get_configuration', :query => 'objectMask=mask[isRequired,itemCategory]').body.map do |item|
             item['itemCategory']['id'] if item['itemCategory']['categoryCode'] == 'static_sec_ip_addresses'
           end.compact.first

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

@@ -11,17 +11,17 @@ module Fog
 
       class Mock
 
-        def get_subnet_price_code
+        def get_subnet_price_code(address_count, public=true)
           42
         end
 
       end
 
       class Real
-        def get_subnet_price_code
-          subnet_package_id = get_subnet_package_id
+        def get_subnet_price_code(address_count, public=true)
+          subnet_package_id = get_subnet_package_id(public ? 'PUBLIC' : 'PRIVATE')
           request(:product_package, '0/get_item_prices', :query => 'objectMask=mask[id,categories.id,item.description]').body.map do |item|
-            item['id'] if item['categories'][0]['id'] == subnet_package_id
+            item['id'] if catg['id'] == subnet_package_id && item['item']['description'] =~ /^#{address_count}/
           end.compact.first
         end
       end

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.3.23"
+    VERSION = "0.3.24"
   end
 end

data/tests/softlayer/requests/network/network_tests.rb

@@ -35,11 +35,11 @@ Shindo.tests("Fog::Network[:softlayer] | network requests", ["softlayer"]) do
     end
 
     tests("#get_subnet_package_id") do
-      data_matches_schema(Integer) { @sl.get_subnet_package_id }
+      data_matches_schema(Integer) { @sl.get_subnet_package_id('PUBLIC') }
     end
 
     tests("#get_subnet_price_code") do
-      data_matches_schema(Integer) { @sl.get_subnet_price_code }
+      data_matches_schema(Integer) { @sl.get_subnet_price_code(4) }
     end
 
     tests("#create_network(#{@order})") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Matt Eldridge
@@ -279,6 +279,7 @@ files:
 - lib/fog/softlayer/requests/dns/update_record.rb
 - lib/fog/softlayer/requests/network/create_network.rb
 - lib/fog/softlayer/requests/network/create_network_tags.rb
+- lib/fog/softlayer/requests/network/create_subnet.rb
 - lib/fog/softlayer/requests/network/delete_global_ip_address.rb
 - lib/fog/softlayer/requests/network/delete_network.rb
 - lib/fog/softlayer/requests/network/delete_network_tags.rb
@@ -290,6 +291,8 @@ files:
 - lib/fog/softlayer/requests/network/get_ip_addresses.rb
 - lib/fog/softlayer/requests/network/get_network.rb
 - lib/fog/softlayer/requests/network/get_network_tags.rb
+- lib/fog/softlayer/requests/network/get_portable_subnet_package_id.rb
+- lib/fog/softlayer/requests/network/get_portable_subnet_price_code.rb
 - lib/fog/softlayer/requests/network/get_private_vlan_price_code.rb
 - lib/fog/softlayer/requests/network/get_public_vlan_price_code.rb
 - lib/fog/softlayer/requests/network/get_references_by_tag_name.rb