fog-softlayer 0.4.6 → 0.4.7

data/tests/softlayer/account/schema.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+class Softlayer
+  module Account
+    module Formats
+      module Brand
+        BRAND = {
+          :id => Integer,
+          :catalogId => Integer,
+          :keyName => String,
+          :longName => String,
+          :name => String,
+          :account => Hash
+        }
+      end
+
+      module Collected
+        BRAND = {
+          :id => Fog::Nullable::Integer,
+          :catalog_id => Fog::Nullable::Integer,
+          :name => Fog::Nullable::String,
+          :long_name => Fog::Nullable::String,
+          :key_name => Fog::Nullable::String,
+          :account => Hash
+        }
+      end
+
+      module Collection
+        BRANDS = [Softlayer::Account::Formats::Collected::BRAND]
+      end
+    end
+  end
+end

data/tests/softlayer/models/account/brand_tests.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests("Fog::Account[:softlayer] | brand model", ["softlayer"]) do
+  @sl = Fog::Account[:softlayer]
+
+  tests 'success' do
+    attributes = {
+      'key_name' => "T_B",
+      'long_name' => "Long Test Brand Name",
+      'name' => "My name",
+      'account' => {}
+    }
+
+    tests '#save' do
+      @brand = @sl.brands.new(attributes)
+      response = @brand.save
+      data_matches_schema(Softlayer::Account::Formats::Collected::BRAND) { response }
+    end
+
+    tests '#create' do
+      @brand = @sl.brands.new(attributes)
+      response = @brand.create
+      @brand.id = response[:id]
+      data_matches_schema(Softlayer::Account::Formats::Collected::BRAND) { response }
+    end
+
+    tests '#get_accounts' do
+      data_matches_schema(Array) { @brand.get_accounts }
+    end
+  end
+
+  tests 'failure' do
+    attributes = {
+      'key_name' => "T_B",
+      'long_name' => "Long Test Brand Name",
+      'name' => "My name",
+    }
+
+    tests '#save' do
+      @brand = @sl.brands.new(attributes)
+      response = @brand.save
+      data_matches_schema(Hash) { response }
+    end
+
+    tests '#save' do
+      @brand.id = 1
+      raises(StandardError) { @brand.save }
+    end
+
+    tests '#create' do
+      @brand = @sl.brands.new(attributes)
+      response = @brand.create
+      data_matches_schema(Hash) { response }
+    end
+
+    tests '#get_accounts' do
+      response = @brand.get_accounts
+      data_matches_schema(Hash) { response }
+    end
+  end
+end

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

@@ -76,6 +76,18 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
       data_matches_schema(Array) { @bmc.get_upgrade_options }
     end
 
+    tests("#update(opts") do
+      bm_opts = {
+          :ram => 4
+      }
+      vm_opts = {
+          :ram => 4,
+          :maintenance_window => 1111
+      }
+      data_matches_schema(Hash) { @vm.update(vm_opts) }
+      data_matches_schema(Hash) { @bmc.update(bm_opts) }
+    end
+
     tests("#start") do
       returns(true) { @vm.start }
       returns(true) { @bmc.start }
@@ -140,9 +152,12 @@ Shindo.tests("Fog::Compute[:softlayer] | Server model", ["softlayer"]) do
 
     tests("#destroy") do
       data_matches_schema(String){ @bmc.destroy }
+      data_matches_schema(String){ @vm.destroy }
     end
 
-    @vm.destroy
-
+    tests("#update") do
+      raises(ArgumentError) { @vm.update }
+      raises(ArgumentError) { @bmc.update }
+    end
   end
 end

data/tests/softlayer/models/network/datacenter_tests.rb

@@ -0,0 +1,32 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests("Fog::Network[:softlayer] | Datacenter model", ["softlayer"]) do
+  pending unless Fog.mocking?
+
+  tests("success") do
+    @dc = Fog::Network[:softlayer].datacenters.first
+
+    tests("#get_avaliable_maintenance_windows(begin_date, end_date, slots_number)") do
+      data_matches_schema(Array) { @dc.get_avaliable_maintenance_windows("2015-06-01", "2015-06-02", 1) }
+    end
+  end
+
+  tests ("failure") do
+    tests("#get_avaliable_maintenance_windows(nil, end_date, slots_number)") do
+      raises(ArgumentError) { @dc.get_avaliable_maintenance_windows(nil, "2015-06-02", 1) }
+    end
+
+    tests("#get_maintenance_windows(location_id, begin_date, nil, slots_number)") do
+      raises(ArgumentError) { @dc.get_avaliable_maintenance_windows("2015-06-01", nil, 1) }
+    end
+
+    tests("#get_maintenance_windows(location_id, begin_date, end_date)") do
+      raises(ArgumentError) { @dc.get_avaliable_maintenance_windows("2015-06-01", "2015-06-02") }
+    end
+  end
+end

data/tests/softlayer/network/helper.rb

@@ -0,0 +1,8 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require File.expand_path("schema", File.dirname(__FILE__))

data/tests/softlayer/network/schema.rb

@@ -0,0 +1,20 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+class Softlayer
+  module Network
+    module Formats
+      module Datacenter
+        DATACENTER = {
+            "id" => Integer,
+            "long_name" => String,
+            "name" => String
+        }
+      end
+    end
+  end
+end

data/tests/softlayer/requests/account/account_tests.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+Shindo.tests("Fog::Account[:softlayer] | account requests", ["softlayer"]) do
+  @sl = Fog::Account[:softlayer]
+
+  tests('success') do
+    tests"#get_account_owned_brands('1')" do
+      response = @sl.get_account_owned_brands(1)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Array) { response.body }
+    end
+
+    tests"#get_account_owned_brands('1')" do
+      response = @sl.get_account_owned_brands(1)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Array) { response.body }
+    end
+  end
+
+  tests('failure') do
+    tests("#get_account_owned_brands('99999999')") do
+      response = @sl.get_account_owned_brands(99999999)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+  end
+end

data/tests/softlayer/requests/account/brand_tests.rb

@@ -0,0 +1,59 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+Shindo.tests("Fog::Account[:softlayer] | brand requests", ["softlayer"]) do
+  @sl = Fog::Account[:softlayer]
+
+  tests 'success' do
+    attributes = {
+      :keyName => "BRAND_NAME",
+      :longName => "Your Long Brand Name",
+      :name => "Brand Name",
+      :account => {}
+    }
+
+    tests '#create_brand(attributes)' do
+      response = @sl.create_brand(attributes)
+      @brand_id = response.body[:id]
+      data_matches_schema(201) { response.status }
+      data_matches_schema(Softlayer::Account::Formats::Brand::BRAND) { response.body }
+    end
+
+    tests "#get_brand('@brand_id')" do
+      response = @sl.get_brand(@brand_id)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Account::Formats::Brand::BRAND) { response.body }
+    end
+
+    tests "#get_brand_owned_accounts('@brand_id')" do
+      response = @sl.get_brand_owned_accounts(@brand_id)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Array) { response.body }
+    end
+  end
+
+  tests 'failure' do
+    tests "#get_brand('99999999')" do
+      response = @sl.get_brand(99999999)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
+    tests "#get_brand()" do
+      raises(ArgumentError) { @sl.get_brand }
+    end
+
+    tests "#get_brand_owned_accounts('99999999')" do
+      response = @sl.get_brand_owned_accounts(99999999)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
+    tests "#get_brand_owned_accounts()" do
+      raises(ArgumentError) { @sl.get_brand_owned_accounts }
+    end
+  end
+end

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

@@ -28,19 +28,36 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(201) { response.status }
     end
 
+    tests("#create_bare_metal_tags('#{@server_id}', [])") do
+      response = @sl_connection.create_bare_metal_tags(@server_id, [])
+      data_matches_schema(true) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
+    tests("#delete_bare_metal_tags('#{@server_id}', [])") do
+      response = @sl_connection.delete_bare_metal_tags(@server_id, [])
+      data_matches_schema(true) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#generate_bare_metal_order_template('#{@bmc}')") do
       response = @sl_connection.generate_bare_metal_order_template(@bmc)
       data_matches_schema(Hash) {response.body}
       data_matches_schema(200) {response.status}
     end
 
+    tests"#get_bare_metal_server('#{@server_id}'))" do
+      response = @sl_connection.get_bare_metal_server(@server_id)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER) { response.body }
+    end
+
     tests"#get_bare_metal_server_by_ip('#{@server_ip}'))" do
       response = @sl_connection.get_bare_metal_server_by_ip(@server_ip)
       data_matches_schema(200) { response.status }
       data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER) { response.body }
     end
 
-
     tests("#get_bare_metal_servers()") do
       @sl_connection.get_bare_metal_servers.body.each do |bms|
         data_matches_schema(Softlayer::Compute::Formats::BareMetal::SERVER) { bms }
@@ -53,6 +70,12 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(200) {response.status}
     end
 
+    tests("#get_bare_metal_tags('#{@server_id})'") do
+      response = @sl_connection.get_bare_metal_tags(@server_id)
+      data_matches_schema(Hash) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#get_bare_metal_users('#{@server_id})'") do
       response = @sl_connection.get_bare_metal_users(@server_id)
       data_matches_schema(Array) {response.body}
@@ -121,6 +144,12 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       @sl_connection.create_bare_metal_server([@bmc])
     end
 
+    tests("#get_bare_metal_server(#{@bmc}") do
+      response = @sl_connection.get_bare_metal_server(@bmc)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
     tests("#get_bare_metal_server_by_ip('1.1.1.1')") do
       response = @sl_connection.get_bare_metal_server_by_ip('1.1.1.1')
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
@@ -133,6 +162,32 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(404){ response.status }
     end
 
+    tests("#get_bare_metal_tags('#{bmc}')") do
+      response = @sl_connection.get_bare_metal_tags(bmc)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
+    tests("#create_bare_metal_tags('#{bmc}', {})") do
+      raises(ArgumentError) { raise ArgumentError.new }
+    end
+
+    tests("#create_bare_metal_tags('#{bmc}', [])") do
+      response = @sl_connection.create_bare_metal_tags(bmc, [])
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
+    tests("#delete_bare_metal_tags('#{bmc}', {})") do
+      raises(ArgumentError) { raise ArgumentError.new }
+    end
+
+    tests("#delete_bare_metal_tags('#{bmc}', [])") do
+      response = @sl_connection.delete_bare_metal_tags(bmc, [])
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404){ response.status }
+    end
+
     tests("#get_bare_metal_active_tickets('#{bmc}')") do
       response = @sl_connection.get_bare_metal_active_tickets(bmc)
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }

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

@@ -24,7 +24,6 @@ Shindo.tests("Fog::Compute[:softlayer] | key_pair requests", ["softlayer"]) do
 
 
   tests('success') do
-
     tests("#create_key_pair") do
       key = @sl_connection.create_key_pair(:key => @key_gen.call, :label => 'test-key-tmp')
       @kp2 = @sl_connection.key_pairs.get(key.body['id'])
@@ -51,11 +50,9 @@ Shindo.tests("Fog::Compute[:softlayer] | key_pair requests", ["softlayer"]) do
       returns(true) { @sl_connection.delete_key_pair(@kp1.id).body }
       returns(1) { @sl_connection.get_key_pairs.body.count }
     end
-
   end
 
   tests('failure') do
-
     tests("#get_key_pair").raises(ArgumentError) do
       @sl_connection.get_key_pair
     end
@@ -71,9 +68,5 @@ Shindo.tests("Fog::Compute[:softlayer] | key_pair requests", ["softlayer"]) do
     tests("#delete_key_pair(#{@kp1.id}") do
       returns(404) { @sl_connection.delete_key_pair(@kp1.id).status }
     end
-
-
-
   end
-
 end

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

@@ -18,7 +18,6 @@ Shindo.tests("Fog::Compute[:softlayer] | tag requests", ["softlayer"]) do
   test_tags = ['foo', 'bar', 'baz']
 
   tests('success') do
-
     tests("#create_vm_tags('#{@vm.id}', #{test_tags})") do
       returns(true, "returns true") { @sl_connection.create_vm_tags(@vm.id, test_tags).body}
       end

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

@@ -33,7 +33,8 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
 
     tests("#create_vms('#{@vms}')") do
       response = @sl_connection.create_vms(@vms)
-      #data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER, {:allow_extra_keys => true}) { response.body.first }
+      data_matches_schema(Array) { response.body }
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER, {:allow_extra_keys => true}) { response.body.first }
       data_matches_schema(200) { response.status }
     end
 
@@ -41,27 +42,45 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       response = @sl_connection.create_vm(@vm)
       @vm_id = response.body.first['id']
       @vm_ip = response.body.first['primaryIpAddress']
-      #data_matches_schema([Softlayer::Compute::Formats::VirtualGuest::SERVER], {:allow_extra_keys => true}) { response.body }
+      data_matches_schema([Softlayer::Compute::Formats::VirtualGuest::SERVER], {:allow_extra_keys => true}) { response.body }
       data_matches_schema(200) { response.status }
     end
 
+    tests("#create_vm_tags('#{@vm}', [])") do
+      response = @sl_connection.create_vm_tags(@vm_id, [])
+      data_matches_schema(true) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#generate_virtual_guest_order_template('#{@vm}')") do
       response = @sl_connection.generate_virtual_guest_order_template(@vm)
       data_matches_schema(Hash) {response.body}
       data_matches_schema(200) {response.status}
     end
 
-
     tests"#get_virtual_guest_by_ip('#{@vm_ip}'))" do
       response = @sl_connection.get_virtual_guest_by_ip(@vm_ip)
       data_matches_schema(200) { response.status }
       data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { response.body }
     end
 
+    tests"#get_vm('#{@vm_id}')" do
+      response = @sl_connection.get_vm(@vm_id)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { response.body }
+    end
+
+    tests"#get_vm_tags('#{@vm_id}')" do
+      response = @sl_connection.get_vm_tags(@vm_id)
+      data_matches_schema(200) { response.status }
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { response.body }
+    end
+
     tests"#get_vms()" do
       response = @sl_connection.get_vms
       data_matches_schema(200) { response.status }
-      #data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { vm }
+      data_matches_schema(Array) { response.body }
+      data_matches_schema(Softlayer::Compute::Formats::VirtualGuest::SERVER) { response.body.first }
     end
 
     tests("#get_virtual_guest_active_tickets(#{@vm_id})") do
@@ -118,6 +137,12 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(200) {response.status}
     end
 
+    tests("#delete_vm_tags('#{@vm_id})', []") do
+      response = @sl_connection.delete_vm_tags(@vm_id, [])
+      data_matches_schema(true) {response.body}
+      data_matches_schema(200) {response.status}
+    end
+
     tests("#get_virtual_guest_create_options()") do
       response = @sl_connection.get_virtual_guest_create_options
       data_matches_schema(Hash) {response.body}
@@ -155,12 +180,34 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       @sl_connection.create_vm(@vms)
     end
 
+    tests("#get_vm('99999999999999)") do
+      response = @sl_connection.get_vm('99999999999999')
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
+    tests("#get_vm_tags('99999999999999)") do
+      response = @sl_connection.get_vm_tags('99999999999999')
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
     tests("#get_virtual_guest_by_ip('1.1.1.1')") do
       response = @sl_connection.get_virtual_guest_by_ip('1.1.1.1')
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
       data_matches_schema(404) {response.status}
     end
 
+    tests("#create_vm_tags('99999999999999')") do
+      raises(ArgumentError) { raise ArgumentError.new }
+    end
+
+    tests("#create_vm_tags('99999999999999', [])") do
+      response = @sl_connection.create_vm_tags(99999999999999, [])
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
     tests("#get_virtual_guest_users('99999999999999')") do
       response = @sl_connection.get_virtual_guest_users(99999999999999)
       data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
@@ -215,5 +262,14 @@ Shindo.tests("Fog::Compute[:softlayer] | server requests", ["softlayer"]) do
       data_matches_schema(500) {response.status}
     end
 
+    tests("#delete_vm_tags('99999999999999', [])'") do
+      response = @sl_connection.delete_vm_tags(99999999999999)
+      data_matches_schema('SoftLayer_Exception_ObjectNotFound'){ response.body['code'] }
+      data_matches_schema(404) {response.status}
+    end
+
+    tests("#delete_vm_tags('99999999999999')") do
+      raises(ArgumentError) { raise ArgumentError.new }
+    end
   end
 end