fog-softlayer 0.2.1 → 0.3.1

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

@@ -0,0 +1,29 @@
+#
+# 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_subnet_package_id
+          42
+        end
+
+      end
+
+      class Real
+        def get_subnet_package_id
+          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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+#
+# 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_subnet_price_code
+          42
+        end
+
+      end
+
+      class Real
+        def get_subnet_price_code
+          subnet_package_id = get_subnet_package_id
+          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
+          end.compact.first
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+#
+# 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 list_networks
+          response = Excon::Response.new
+          response.body = @networks
+          response.status = 200
+          response
+        end
+
+      end
+
+      class Real
+        def list_networks
+          self.request(:account, :get_network_vlans, :query => 'objectMask=mask[subnets.id,subnets.note,subnets.subnetType,type,primaryRouter.datacenter,tagReferences,networkSpace]')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+#
+# 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 list_subnets
+          # TODO: Implement.
+          raise Fog::Errors::MockNotImplemented
+        end
+
+      end
+
+      class Real
+        def list_subnets
+        self.request(:account, :get_subnets, :query => 'objectMask=mask[networkVlan,ipAddresses.id,datacenter,hardware,virtualGuests.id,virtualGuests.fullyQualifiedDomainName]')
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/storage.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 require 'fog/softlayer/core'
 
 module Fog

data/lib/fog/softlayer/version.rb

@@ -4,8 +4,9 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 module Fog
   module Softlayer
-    VERSION = "0.2.1"
+    VERSION = "0.3.1"
   end
 end

data/tests/compute/flavors_helper.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 def flavors_tests(connection, params = {}, mocks_implemented = true)
 
   tests('success') do

data/tests/compute/server_helper.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 def server_tests(connection, params = {}, mocks_implemented = true)
 
   model_tests(connection.servers, params, mocks_implemented) do

data/tests/compute/servers_helper.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 def servers_tests(connection, params = {}, mocks_implemented = true)
 
   collection_tests(connection.servers, params, mocks_implemented) do

data/tests/helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 require 'simplecov'
 require 'securerandom'
 

data/tests/helpers/collection_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 def collection_tests(collection, params = {}, mocks_implemented = true)
 
   tests('success') do

data/tests/helpers/compute/flavors_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 def flavors_tests(connection, params = {}, mocks_implemented = true)
 
   tests('success') do

data/tests/helpers/compute/server_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 def server_tests(connection, params = {}, mocks_implemented = true)
 
   model_tests(connection.servers, params, mocks_implemented) do

data/tests/helpers/compute/servers_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 def servers_tests(connection, params = {}, mocks_implemented = true)
 
   collection_tests(connection.servers, params, mocks_implemented) do

data/tests/helpers/formats_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 require "fog/schema/data_validator"
 
 # format related hackery

data/tests/helpers/formats_helper_tests.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 Shindo.tests('test_helper', 'meta') do
 
   tests('comparing welcome data against schema') do

data/tests/helpers/mock_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 # Use so you can run in mock mode from the command line
 #
 # FOG_MOCK=true fog

data/tests/helpers/model_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 def model_tests(collection, params = {}, mocks_implemented = true)
 
   tests('success') do

data/tests/helpers/responds_to_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 module Shindo
   class Tests
 

data/tests/helpers/schema_validator_tests.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 Shindo.tests('Fog::Schema::DataValidator', 'meta') do
 
   validator = Fog::Schema::DataValidator.new

data/tests/helpers/succeeds_helper.rb

@@ -1,3 +1,10 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
 module Shindo
   class Tests
 

data/tests/softlayer/compute/helper.rb

@@ -4,4 +4,5 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 require File.expand_path("schema", File.dirname(__FILE__))

data/tests/softlayer/compute/schema.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 module Fog
   module Softlayer
     module Nullable

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

@@ -14,7 +14,8 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
         :image_id => '23f7f05f-3657-4330-8772-329ed2e816bc',
         :name => 'test-vm',
         :domain => 'example.com',
-        :datacenter => 'dal05'
+        :datacenter => 'dal05',
+        :bare_metal => false
     }
 
     bmc_opts = {
@@ -22,8 +23,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,
-        :datecenter => 'dal05'
+        :datecenter => 'dal05',
+        :bare_metal => true
     }
 
     @vm = Fog::Compute[:softlayer].servers.new(vm_opts)
@@ -66,7 +67,33 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
   end
 
   tests ("failure") do
-
+    
+    # should not allow Virtual Guests creation without bare_metal flag
+    tests(".new").raises(Exception) do
+      # As we don't have fixture I don't touch original vm_opts
+      nobm_vm_opts = vm_opts.clone
+      nobm_vm_opts.delete(:bare_metal)
+      Fog::Compute[:softlayer].servers.new(nobm_vm_opts)
+    end
+    
+    # should not allow Bare Metal creation without bare_metal flag
+    tests(".new").raises(Exception) do
+      # As we don't have fixture I don't touch original bmc_opts
+      nobm_bmc_opts = bmc_opts.clone
+      nobm_bmc_opts.delete(:bare_metal)
+      Fog::Compute[:softlayer].servers.new(nobm_bmc_opts)
+    end
+    
+    # should not allow a set bare_metal flag manually on Virtual Guests
+    tests("#bare_metal=").raises(NoMethodError) do
+      @vm.bare_metal = true
+    end
+    
+    # should not allow a set bare_metal flag manually on Bare Metal Servers
+    tests("#bare_metal=").raises(NoMethodError) do
+      @vm.bare_metal = false
+    end
+    
     # should not allow a second save
     tests("#save").raises(Fog::Errors::Error) do
       @vm.save

data/tests/softlayer/requests/compute/bmc_tests.rb

@@ -12,18 +12,19 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
 
     @bmc = {
         :operatingSystemReferenceCode      => 'UBUNTU_LATEST',
-        :processorCoreAmount               => 1,
-        :memoryCapacity                    => 1,
+        :processorCoreAmount               => 2,
+        :memoryCapacity                    => 2,
         :hourlyBillingFlag                 => true,
         :domain                            => 'example.com',
         :hostname                          => 'test',
+        :datacenter                        => { :name => 'wdc01' }
     }
 
     tests("#create_bare_metal_server('#{@bmc}')") do
       response = @sl_connection.create_bare_metal_server(@bmc)
       @server_id = response.body['id']
       data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER, {:allow_extra_keys => true}) { response.body }
-      data_matches_schema(200) { response.status }
+      data_matches_schema(201) { response.status }
     end
 
     tests("#get_bare_metal_servers()") do

data/tests/softlayer/requests/compute/tag_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests("Fog::Compute[:softlayer] | tag requests", ["softlayer"]) do
 
   @sl_connection = Fog::Compute[:softlayer]
 
-  opts = { :flavor_id => 'm1.small', :os_code => 'UBUNTU_LATEST',  :name => 'matt', :datacenter => 'dal05'}
+  opts = { :flavor_id => 'm1.small', :os_code => 'UBUNTU_LATEST',  :name => 'matt', :datacenter => 'dal05', :bare_metal => false}
   @vm = @sl_connection.servers.create(opts)
 
   opts[:bare_metal] = true

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

@@ -0,0 +1,129 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests("Fog::Network[:softlayer] | network requests", ["softlayer"]) do
+
+  @sl = Fog::Network[:softlayer]
+
+  @order = {
+      'complexType' => 'SoftLayer_Container_Product_Order_Network_Vlan',
+      'name' => 'test-vlan',
+      'routerId' => 1234,
+      'router' => 'fcr01a.xxx01',
+      'location' => 1234,
+      'quantity' =>1,
+      'packageId' =>0,
+      'prices' =>[
+          {'id' => 42 },
+          {'id' => 42 },
+      ]
+  }
+
+
+  tests('success') do
+
+    tests("#get_private_vlan_price_code") do
+      data_matches_schema(Integer) { @sl.get_private_vlan_price_code }
+    end
+
+    tests("#get_public_vlan_price_code") do
+      data_matches_schema(Integer) { @sl.get_public_vlan_price_code }
+    end
+
+    tests("#get_subnet_package_id") do
+      data_matches_schema(Integer) { @sl.get_subnet_package_id }
+    end
+
+    tests("#get_subnet_price_code") do
+      data_matches_schema(Integer) { @sl.get_subnet_price_code }
+    end
+
+    tests("#create_network(#{@order})") do
+      returns(@order['router']) { @sl.create_network(@order).body['orderDetails']['router']['hostname'] }
+      returns(200) { @sl.create_network(@order).status }
+    end
+
+    tests("#list_networks") do
+      @network_ids = @sl.list_networks.body.map { |vlan| vlan['id'] }
+      returns(2) { @network_ids.count }
+    end
+
+    tests("#get_network(#{@network_ids[0]})") do
+      returns(200) { @sl.get_network(@network_ids[0]).status}
+      returns(200) { @sl.get_network(@network_ids[1]).status}
+    end
+
+    tests("#create_network_tags(#{@network_ids[0]}, ['sparkle', 'motion'])") do
+      returns(200) { @sl.create_network_tags(@network_ids[0], ['sparkle', 'motion']).status }
+    end
+
+    tests("#get_network_tags(#{@network_ids[0]})") do
+      tags = @sl.get_network_tags(@network_ids[0]).body['tagReferences'].map { |ref| ref['tag']['name'] }
+      returns(2) { tags.count }
+      returns(true) { ['sparkle', 'motion'].include?(tags[0]) }
+      returns(true) { ['sparkle', 'motion'].include?(tags[1]) }
+    end
+
+    tests("#delete_network_tags(#{@network_ids[0]}, ['sparkle'])") do
+      returns(200) { @sl.delete_network_tags(@network_ids[0], ['sparkle']).status }
+      tags = @sl.get_network_tags(@network_ids[0]).body['tagReferences'].map { |ref| ref['tag']['name'] }
+      returns(1) { tags.count }
+      returns(false) { ['sparkle'].include?( tags[0]) }
+      returns(true) { ['motion'].include?( tags[0]) }
+    end
+
+    tests("#delete_network(#{@network_ids[1]})") do
+      response = @sl.delete_network(@network_ids[1])
+      returns(200) { response.status }
+      returns(true) { response.body }
+    end
+
+
+
+
+  end
+
+  tests('failure') do
+    tests("#create_network").raises(ArgumentError) do
+      @sl.create_network
+    end
+
+    tests("#get_network").raises(ArgumentError) do
+      @sl.get_network
+    end
+
+    tests("#get_network(#{@network_ids[1]})") do
+      returns(404) { @sl.get_network(@network_ids[1]).status }
+    end
+
+    tests("#create_network_tags(#{@network_ids[1]}, ['sparkle', 'motion'])") do
+      returns(404) { @sl.create_network_tags(@network_ids[1], ['sparkle', 'motion']).status }
+    end
+
+    tests("#create_network_tags(#{@network_ids[0]}, 'sparkle,motion')").raises(ArgumentError) do
+      @sl.create_network_tags(@network_ids[0], 'sparkle,motion').status
+    end
+
+    tests("#get_network_tags(#{@network_ids[1]})") do
+      returns(404) { @sl.get_network_tags(@network_ids[1]).status }
+    end
+
+    tests("#delete_network_tags(#{@network_ids[1]}, ['sparkle'])") do
+      returns(404) { @sl.delete_network_tags(@network_ids[1], ['sparkle']).status }
+    end
+
+    tests("#delete_network_tags(#{@network_ids[0]}, 'sparkle')").raises(ArgumentError) do
+      @sl.delete_network_tags(@network_ids[0], 'sparkle').status
+    end
+
+    tests("#delete_network(#{@network_ids[1]})") do
+      returns(404) { @sl.delete_network(@network_ids[1]).status }
+    end
+
+
+  end
+end