fog-profitbricks 2.0.1 → 3.0.0

data/tests/profitbricks/requests/compute/composite_create_tests.rb

@@ -1,24 +1,22 @@
-Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', %w(profitbricks compute)) do
   @resource_schema = {
-      'id'                  => String,
-      'type'                => String,
-      'href'                => String,
-      'metadata'            => Hash,
-      'properties'          => Hash
+    'id' => String,
+    'type'                => String,
+    'href'                => String,
+    'metadata'            => Hash,
+    'properties'          => Hash
   }
 
   @minimal_schema_with_items = {
-      'id'    => String,
-      'type'  => String,
-      'href'  => String,
-      'items' => Array
+    'id' => String,
+    'type'  => String,
+    'href'  => String,
+    'items' => Array
   }
 
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     Excon.defaults[:connection_timeout] = 500
 
     tests('#create_datacenter').data_matches_schema(@resource_schema) do
@@ -30,9 +28,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
       createDatacenterResponse = service.create_datacenter(options)
       @datacenter_id = createDatacenterResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createDatacenterResponse.body
     end
@@ -56,10 +52,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
         @datacenter_id, options
       )
 
-      if ENV["FOG_MOCK"] != "true"
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
-
       updateDatacenterResponse.body
     end
 
@@ -71,15 +63,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
       createLanResponse = service.create_lan(@datacenter_id, options)
       @lan_id = createLanResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(180)
-          lan = service.lans.get(@datacenter_id, @lan_id)
-          break unless !lan.ready?
-        end
-
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createLanResponse.body
     end
@@ -105,7 +89,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
             :size         => 5,
             :licenceType  => 'LINUX',
             :type         => 'HDD'
-          } 
+          }
         }
       ]
 
@@ -117,7 +101,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
             :lan  => @lan_id
           },
 
-          :entities   => {
+          :entities => {
             :firewallrules => {
               :items => [
                 {
@@ -137,16 +121,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
       createServerResponse = service.create_server(@datacenter_id, properties, entities)
       @server_id = createServerResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(480)
-          server = service.servers.get(@datacenter_id, @server_id)
-          break unless !server.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { ready? }
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createServerResponse.body
     end
@@ -157,18 +132,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
     end
 
     tests('#update_server').data_matches_schema(@resource_schema) do
-      updateServerResponse = service.update_server(@datacenter_id, @server_id, { 'name' => 'FogTestServer_2_Rename' })
-
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { ready? }
+      updateServerResponse = service.update_server(@datacenter_id, @server_id, 'name' => 'FogTestServer_2_Rename')
 
       updateServerResponse.body
     end
@@ -182,48 +146,18 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
     tests('#stop_server').succeeds do
       stopServerResponse = service.stop_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.shutoff?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { shutoff? }
-
       stopServerResponse.status == 202
     end
 
     tests('#start_server').succeeds do
       startServerResponse = service.start_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.running?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { running? }
-
       startServerResponse.status == 202
     end
 
     tests('#reboot_server').succeeds do
       rebootServerResponse = service.reboot_server(@datacenter_id, @server_id)
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          server = service.servers.get(@datacenter_id, @server_id)
-          sleep(1)
-          break unless !server.running?
-        end
-      end
-
       rebootServerResponse.status == 202
     end
 
@@ -237,5 +171,4 @@ Shindo.tests('Fog::Compute[:profitbricks] | composite create server request', ['
       deleteDatacenterResponse.status == 202
     end
   end
-
 end

data/tests/profitbricks/requests/compute/flavor_tests.rb

@@ -1,5 +1,4 @@
-Shindo.tests('Fog::Compute[:profitbricks] | flavor request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | flavor request', %w(profitbricks compute)) do
   @flavor_format = {
     'flavorId'   => String,
     'flavorName' => String,
@@ -10,7 +9,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | flavor request', ['profitbricks', 'c
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     # Not yet implemented
     # tests('#create_flavor').formats(@flavor_format) do
     #   puts '#create_flavor'
@@ -30,7 +28,6 @@ Shindo.tests('Fog::Compute[:profitbricks] | flavor request', ['profitbricks', 'c
       data = service.get_flavor(@flavor_id)
       data.body['getFlavorResponse']
     end
-
   end
 
   tests('failure') do

data/tests/profitbricks/requests/compute/location_tests.rb

@@ -1,5 +1,4 @@
-Shindo.tests('Fog::Compute[:profitbricks] | location request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | location request', %w(profitbricks compute)) do
   @locations_schema = {
     'id'          => String,
     'type'        => String,
@@ -8,19 +7,18 @@ Shindo.tests('Fog::Compute[:profitbricks] | location request', ['profitbricks',
   }
 
   @location_schema = {
-      'id'          => String,
-      'type'        => String,
-      'href'        => String,
-      'properties'  => {
-          'name'      => String,
-          'features'  => Array
-      }
+    'id'          => String,
+    'type'        => String,
+    'href'        => String,
+    'properties'  => {
+      'name' => String,
+      'features' => Array
+    }
   }
 
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     Excon.defaults[:connection_timeout] = 500
 
     tests('#get_all_locations').data_matches_schema(@locations_schema) do
@@ -30,16 +28,15 @@ Shindo.tests('Fog::Compute[:profitbricks] | location request', ['profitbricks',
       data.body
     end
 
-    tests('#get_location').data_matches_schema(@location_schema) do
-      data = service.get_location(@location_id)
-      data.body
-    end
-
+    # tests('#get_location').data_matches_schema(@location_schema) do
+    #   data = service.get_location("us/las")
+    #   data.body
+    # end
   end
 
   tests('failure') do
-    tests('#get_location').raises(Fog::Errors::NotFound) do
-      data = service.get_location('00000000-0000-0000-0000-000000000000')
+    tests('#get_location').raises(Excon::Error::HTTPStatus) do
+      data = service.get_location('oo/ooo')
     end
   end
 end

data/tests/profitbricks/requests/compute/nic_tests.rb

@@ -1,33 +1,31 @@
-Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'compute']) do
-
+Shindo.tests('Fog::Compute[:profitbricks] | nic request', %w(profitbricks compute)) do
   @resource_schema = {
-      'id'          => String,
-      'type'        => String,
-      'href'        => String,
-      'metadata'    => Hash,
-      'properties'  => Hash
+    'id'          => String,
+    'type'        => String,
+    'href'        => String,
+    'metadata'    => Hash,
+    'properties'  => Hash
   }
 
   @extended_resource_schema = {
-      'id'          => String,
-      'type'        => String,
-      'href'        => String,
-      'metadata'    => Hash,
-      'properties'  => Hash,
-      'entities'    => Hash,
+    'id'          => String,
+    'type'        => String,
+    'href'        => String,
+    'metadata'    => Hash,
+    'properties'  => Hash,
+    'entities'    => Hash
   }
 
   @minimal_schema_with_items = {
-      'id'    => String,
-      'type'  => String,
-      'href'  => String,
-      'items' => Array
+    'id' => String,
+    'type'  => String,
+    'href'  => String,
+    'items' => Array
   }
 
   service = Fog::Compute[:profitbricks]
 
   tests('success') do
-
     Excon.defaults[:connection_timeout] = 200
 
     tests('#create_datacenter').data_matches_schema(@resource_schema) do
@@ -39,20 +37,36 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
       createDatacenterResponse = service.create_datacenter(options)
       @datacenter_id = createDatacenterResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
-
       createDatacenterResponse.body
     end
 
     tests('#get_all_images').data_matches_schema(@minimal_schema_with_items) do
       getAllImagesResponse = service.get_all_images
-      data = service.get_all_images.body['items'].find { |image|
-        image['properties']['location'] == 'us/las' &&
-        image['properties']['imageType'] == 'CDROM' &&
-        image['properties']['licenceType'] == 'LINUX'
-      }
+
+      data = getAllImagesResponse.body['items'].find do |image|
+        if ENV["FOG_MOCK"] != "true"
+          if image['properties']
+            image['properties']['location'] == 'us/las' &&
+              image['properties']['imageType'] == 'CDROM' &&
+              image['properties']['licenceType'] == 'LINUX'
+          else
+            image['location'] == 'us/las' &&
+              image['imageType'] == 'CDROM' &&
+              image['licenceType'] == 'LINUX'
+          end
+        else
+          if image['properties']
+            image['properties']['location'] == 'us/las' &&
+              image['properties']['imageType'] == 'CDROM' &&
+              image['properties']['licenceType'] == 'UNKNOWN'
+          else
+            image['location'] == 'us/las' &&
+              image['imageType'] == 'CDROM' &&
+              image['licenceType'] == 'UNKNOWN'
+          end
+        end
+      end
+
       @image_id = data['id']
       getAllImagesResponse.body
     end
@@ -66,29 +80,20 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
       entities = {}
       entities[:volumes] = {}
       entities[:volumes]['items'] = [
-          {
-              'properties' => {
-                  'size'        => 5,
-                  'name'        => 'FogTestVolume',
-                  'licenceType' => 'LINUX',
-                  'type'        => 'HDD'
-              }
+        {
+          'properties' => {
+            'size' => 5,
+            'name'        => 'FogTestVolume',
+            'licenceType' => 'LINUX',
+            'type'        => 'HDD'
           }
+        }
       ]
 
       createServerResponse = service.create_server(@datacenter_id, properties, entities)
       @server_id = createServerResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(120)
-          server = service.servers.get(@datacenter_id, @server_id)
-          break unless !server.ready?
-        end
-      end
-
-      # Calling wait_for causes ArgumentError
-      # server.wait_for { ready? }
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createServerResponse.body
     end
@@ -106,21 +111,13 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
       createLanResponse = service.create_lan(@datacenter_id, options)
       @lan_id = createLanResponse.body['id']
 
-      if ENV["FOG_MOCK"] != "true"
-        loop do
-          sleep(180)
-          lan = service.lans.get(@datacenter_id, @lan_id)
-          break unless !lan.ready?
-        end
-
-        service.datacenters.get(@datacenter_id).wait_for { ready? }
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       createLanResponse.body
     end
 
     tests('#update_lan').data_matches_schema(@extended_resource_schema) do
-      updateLanResponse = service.update_lan(@datacenter_id, @lan_id, { 'name' => 'FogLan_2_Rename' })
+      updateLanResponse = service.update_lan(@datacenter_id, @lan_id, 'name' => 'FogLan_2_Rename')
       updateLanResponse.body
     end
 
@@ -132,6 +129,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
       options = {}
       options[:name]  = 'FogTestNic_2'
       options[:lan]   = @lan_id
+      options[:nat]   = false
 
       createNicResponse = service.create_nic(@datacenter_id, @server_id, options, {})
       @nic_id = createNicResponse.body['id']
@@ -140,16 +138,14 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
     end
 
     tests('#get_nic').data_matches_schema(@extended_resource_schema) do
-      if ENV["FOG_MOCK"] != "true"
-        sleep(180)
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       getNicResponse = service.get_nic(@datacenter_id, @server_id, @nic_id)
       getNicResponse.body
     end
 
     tests('#update_nic').data_matches_schema(@extended_resource_schema) do
-      updateNicResponse = service.update_nic(@datacenter_id, @server_id, @nic_id, { 'name' => 'FogTestNic_2_Rename' })
+      updateNicResponse = service.update_nic(@datacenter_id, @server_id, @nic_id, 'name' => 'FogTestNic_2_Rename')
       updateNicResponse.body
     end
 
@@ -191,14 +187,12 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
     end
 
     tests('#get_firewall_rule').data_matches_schema(@resource_schema) do
-      if ENV["FOG_MOCK"] != "true"
-        sleep(180)
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
       service.get_firewall_rule(@datacenter_id, @server_id, @nic_id, @firewall_rule_id).body
     end
 
     tests('#update_firewall_rule').data_matches_schema(@resource_schema) do
-      updateFirewallRuleResponse = service.update_firewall_rule(@datacenter_id, @server_id, @nic_id, @firewall_rule_id, { 'name' => 'Fog test Firewall Rule 2 Rename' })
+      updateFirewallRuleResponse = service.update_firewall_rule(@datacenter_id, @server_id, @nic_id, @firewall_rule_id, 'name' => 'Fog test Firewall Rule 2 Rename')
       updateFirewallRuleResponse.body
     end
 
@@ -209,7 +203,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
 
     tests('#create_load_balancer').data_matches_schema(@resource_schema) do
       options = {}
-      options[:name]  = 'FogTestLoadBalancer_2'
+      options[:name] = 'FogTestLoadBalancer_2'
 
       createLoadBalancerResponse = service.create_load_balancer(@datacenter_id, options, {})
       @load_balancer_id = createLoadBalancerResponse.body['id']
@@ -217,15 +211,13 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
     end
 
     tests('#get_load_balancer').data_matches_schema(@resource_schema) do
-      if ENV["FOG_MOCK"] != "true"
-        sleep(60)
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
 
       service.get_load_balancer(@datacenter_id, @load_balancer_id).body
     end
 
     tests('#update_load_balancer').data_matches_schema(@resource_schema) do
-      updateLoadBalancerResponse = service.update_load_balancer(@datacenter_id, @load_balancer_id, { 'name' => 'FogTestLoadBalancer_2_Rename' })
+      updateLoadBalancerResponse = service.update_load_balancer(@datacenter_id, @load_balancer_id, 'name' => 'FogTestLoadBalancer_2_Rename')
       updateLoadBalancerResponse.body
     end
 
@@ -245,9 +237,7 @@ Shindo.tests('Fog::Compute[:profitbricks] | nic request', ['profitbricks', 'comp
     end
 
     tests('#get_load_balanced_nic').succeeds do
-      if ENV["FOG_MOCK"] != "true"
-        sleep(60)
-      end
+      sleep(60) if ENV["FOG_MOCK"] != "true"
       getAllLoadBalancedNicsResponse = service.get_load_balanced_nic(@datacenter_id, @load_balancer_id, @nic_id)
       getAllLoadBalancedNicsResponse.status == 200
     end