fog-ecloud 0.2.0 → 0.3.0

data/lib/fog/compute/ecloud/models/support_tickets.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_support_ticket(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/tags.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_tag(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/tasks.rb

@@ -20,7 +20,8 @@ module Fog
           if data = service.get_task(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/templates.rb

@@ -32,7 +32,8 @@ module Fog
           if data = service.get_template(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/trusted_network_groups.rb

@@ -18,7 +18,8 @@ module Fog
           if data = service.get_trusted_network_group(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/users.rb

@@ -17,7 +17,8 @@ module Fog
           if data = service.get_user(uri)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/models/virtual_machine_assigned_ips.rb

@@ -9,15 +9,16 @@ module Fog
         model Fog::Compute::Ecloud::VirtualMachineAssignedIp
 
         def all
-          data = service.get_virtual_machine_assigned_ips(self.identity).body
+          data = service.get_virtual_machine_assigned_ips(identity).body
           load(data)
         end
 
-        def get(uri)
-          if data = service.get_virtual_machine_assigned_ip(self.identity)
+        def get
+          if data = service.get_virtual_machine_assigned_ip(identity)
             new(data.body)
           end
-        rescue Fog::Errors::NotFound
+        rescue ServiceError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/compute/ecloud/requests/get_admin_organization.rb

@@ -8,13 +8,15 @@ module Fog
       class Mock
         def get_admin_organization(uri)
           organization_id = id_from_uri(uri)
-          admin_organization    = self.data[:admin_organizations][organization_id]
+          admin_organization = data[:admin_organizations][organization_id]
 
           if admin_organization
             body = Fog::Ecloud.slice(admin_organization, :id, :organization_id)
 
             response(:body => body)
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_compute_pool.rb

@@ -8,11 +8,13 @@ module Fog
       class Mock
         def get_compute_pool(uri)
           compute_pool_id = id_from_uri(uri)
-          compute_pool = self.data[:compute_pools][compute_pool_id]
+          compute_pool = data[:compute_pools][compute_pool_id]
 
           if compute_pool
             response(:body => Fog::Ecloud.slice(compute_pool, :id, :environment))
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_environment.rb

@@ -8,12 +8,12 @@ module Fog
       class Mock
         def get_environment(uri)
           environment_id = id_from_uri(uri)
-          organizations = self.data[:organizations].values
+          organizations = data[:organizations].values
           environment = nil
           catch(:found) do
             organizations.each do |organization|
               organization[:Locations][:Location].each do |location|
-                environment = location[:Environments][:Environment].find{|e| e[:id] == environment_id}
+                environment = location[:Environments][:Environment].detect { |e| e[:id] == environment_id }
                 throw :found if environment
               end
             end
@@ -22,7 +22,9 @@ module Fog
             body = environment.dup
             body.delete(:id)
             response(:body => body)
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_ip_address.rb

@@ -5,13 +5,15 @@ module Fog
         basic_request :get_ip_address
       end
 
-			class Mock
+      class Mock
         def get_ip_address(uri)
           network_id, ip_address_id = uri.match(/\/networks\/(\d+)\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/).captures
-          ip_address = self.data[:networks][network_id.to_i][:IpAddresses][:IpAddress].find{|ip| ip[:name] == ip_address_id }.dup
+          ip_address = data[:networks][network_id.to_i][:IpAddresses][:IpAddress].detect { |ip| ip[:name] == ip_address_id }.dup
           if ip_address
             response(:body => ip_address)
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_network.rb

@@ -8,11 +8,13 @@ module Fog
       class Mock
         def get_network(uri)
           network_id = id_from_uri(uri)
-          network    = self.data[:networks][network_id].dup
+          network = data[:networks][network_id].dup
 
           if network
             response(:body => Fog::Ecloud.slice(network, :id, :environment_id))
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_operating_system.rb

@@ -10,12 +10,14 @@ module Fog
           os_name, compute_pool_id = uri.match(/operatingsystems\/(.*)\/computepools\/(\d+)$/).captures
           compute_pool_id          = compute_pool_id.to_i
 
-          operating_systems = self.data[:operating_systems].values.select{|os| os[:compute_pool_id] == compute_pool_id}
-          operating_system = operating_systems.find{|os| os[:short_name] == os_name}
+          operating_systems = data[:operating_systems].values.select { |os| os[:compute_pool_id] == compute_pool_id }
+          operating_system = operating_systems.detect { |os| os[:short_name] == os_name }
 
           if operating_system
             response(:body => Fog::Ecloud.slice(operating_system, :id, :compute_pool_id, :short_name))
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_ssh_key.rb

@@ -12,7 +12,9 @@ module Fog
 
           if ssh_key
             response(:body => Fog::Ecloud.slice(ssh_key, :id, :admin_organization))
-          else response(:expects => 200, :status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/get_template.rb

@@ -7,12 +7,14 @@ module Fog
 
       class Mock
         def get_template(uri)
-          template_id, compute_pool_id = uri.match(/(\d+).*\/(\d+)$/).captures
-          template    = self.data[:templates][template_id.to_i]
+          template_id, _compute_pool_id = uri.match(/(\d+).*\/(\d+)$/).captures
+          template = data[:templates][template_id.to_i]
 
           if template
             response(:body => Fog::Ecloud.slice(template, :id, :environment))
-          else response(:status => 404) # ?
+          else
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/compute/ecloud/requests/ssh_key_edit.rb

@@ -34,7 +34,8 @@ module Fog
             ssh_key = data[:ssh_keys][ssh_key_id]
             response(:body => Fog::Ecloud.slice(ssh_key, :id, :admin_organization)).body
           else
-            response(:expects => 200, :status => 404)
+            body = "<Error message=\"Resource Not Found\" majorErrorCode=\"404\" minorErrorCode=\"ResourceNotFound\" />"
+            response(:body => body, :expects => 200, :status => 404)
           end
         end
       end

data/lib/fog/ecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ecloud
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/tests/compute/livespec/auth_tests.rb

@@ -0,0 +1,101 @@
+provider = :ecloud
+
+Shindo.tests("Fog::Compute[:#{provider}] | authentication", [provider.to_s, "livespec"]) do
+  raises(ArgumentError, "No authentication tokens supplied") do
+    _service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => nil,
+      :ecloud_access_key => nil,
+      :ecloud_private_key => nil
+    )
+  end
+
+  raises(ArgumentError, "Basic Authentication only username supplied") do
+    _service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => "somebody@somewhere.com",
+      :ecloud_password => nil,
+      :ecloud_access_key => nil,
+      :ecloud_private_key => nil
+    )
+  end
+
+  raises(ArgumentError, "Basic Authentication only password supplied") do
+    _service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => "T3rr3m@rk",
+      :ecloud_access_key => nil,
+      :ecloud_private_key => nil
+    )
+  end
+
+  returns(Fog::Compute::Ecloud::Organization, "Basic Authentication, valid account") do
+    service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => "somebody@somewhere.com",
+      :ecloud_password => "T3rr3m@rk",
+      :ecloud_access_key => nil,
+      :ecloud_private_key => nil
+    )
+    foo = service.organizations(:uri => "/organizations").first
+    foo.class
+  end
+
+  raises(Fog::Compute::Ecloud::ServiceError, "Basic Authentication, invalid account") do
+    service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => "notfound@terremark.com",
+      :ecloud_password => "something",
+      :ecloud_access_key => nil,
+      :ecloud_private_key => nil
+    )
+    foo = service.organizations(:uri => "/organizations").first
+    foo.class
+  end
+
+  raises(ArgumentError, "API Key Authentication only access key supplied") do
+    _service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => nil,
+      :ecloud_access_key => 33333333333333333333333333333333,
+      :ecloud_private_key => nil
+    )
+  end
+
+  raises(ArgumentError, "API Key Authentication only private key supplied") do
+    _service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => nil,
+      :ecloud_access_key => nil,
+      :ecloud_private_key => 3333333333333333333333333333333333333333333333333333333333333333
+    )
+  end
+
+  returns(Fog::Compute::Ecloud::Organization, "API Key Authentication, valid key") do
+    service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => nil,
+      :ecloud_access_key => 33333333333333333333333333333333,
+      :ecloud_private_key => 3333333333333333333333333333333333333333333333333333333333333333
+    )
+    foo = service.organizations(:uri => "/organizations").first
+    foo.class
+  end
+
+  raises(Fog::Compute::Ecloud::ServiceError, "API Key Authentication, invalid key") do
+    service = Fog::Compute::Ecloud.new(
+      :base_path => "/cloudapi/spec",
+      :ecloud_username => nil,
+      :ecloud_password => nil,
+      :ecloud_access_key => 99999999999999999999999999999999,
+      :ecloud_private_key => 9999999999999999999999999999999999999999999999999999999999999999
+    )
+    foo = service.organizations(:uri => "/organizations").first
+    foo.class
+  end
+end

data/tests/compute/models/ssh_key_tests.rb

@@ -1,4 +1,4 @@
-provider, config = :ecloud, compute_providers[:ecloud]
+provider = :ecloud
 
 Shindo.tests("Fog::Compute[:#{provider}] | ssh_keys", [provider.to_s]) do
   connection = Fog::Compute[provider]
@@ -8,41 +8,42 @@ Shindo.tests("Fog::Compute[:#{provider}] | ssh_keys", [provider.to_s]) do
   @ssh_keys = @admin_organization.ssh_keys
 
   tests("#all").succeeds do
-    returns(false) { @ssh_keys.empty? }
+    returns(false, "#all - get all ssh keys") { @ssh_keys.empty? }
   end
 
   tests("#get").succeeds do
     ssh_key = @ssh_keys.first
 
-    returns(false) { @ssh_keys.get(ssh_key.href).nil? }
-    returns(false) { @ssh_keys.get("/notfound" + ssh_key.href).nil? }
+    returns(false, "#get - fetch an existing ssh key") { @ssh_keys.get(ssh_key.href).nil? }
+    returns(true, "#get - fetch a nonexistant ssh key") { @ssh_keys.get(ssh_key.href + "314159").nil? }
   end
 
   tests("#create").succeeds do
     new_key = @ssh_keys.create(:Name => "testing")
     @key_id = new_key.id || nil
-    returns(false) { new_key.nil? }
-    raises(ArgumentError) { @ssh_keys.create }
+    returns(false, "#create - create the testing key") { new_key.nil? }
+    raises(ArgumentError, "#create - attempt create with no args") { @ssh_keys.create }
   end
 
   tests("#edit").succeeds do
     the_key = @ssh_keys.get(@key_id)
-    returns(false) { the_key.nil? }
+    returns(false, "#edit - fetch the key") { the_key.nil? }
 
     the_key.edit(:Name => "more testing")
     the_key.reload
-    returns(false) { the_key.name != "more testing" }
+    returns(false, "#edit - change name") { the_key.name != "more testing" }
 
     the_key.edit(:Default => true)
     the_key.reload
-    returns(true) { the_key.default }
+    returns(true, "#edit - change default") { the_key.default }
   end
 
   tests("#delete").succeeds do
     the_key = @ssh_keys.get(@key_id)
-    returns(false) { the_key.nil? }
+    returns(false, "#delete - fetch the key") { the_key.nil? }
+
     the_key.delete
     the_key = @ssh_keys.get(@key_id)
-    returns(false) { !the_key.nil? }
+    returns(false, "#delete - delete the key") { !the_key.nil? }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ecloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -161,6 +161,7 @@ files:
 - gemfiles/Gemfile.1.9.3+
 - lib/fog/bin/ecloud.rb
 - lib/fog/compute/ecloud.rb
+- lib/fog/compute/ecloud/errors.rb
 - lib/fog/compute/ecloud/models/admin_organization.rb
 - lib/fog/compute/ecloud/models/admin_organizations.rb
 - lib/fog/compute/ecloud/models/api_key.rb
@@ -406,6 +407,7 @@ files:
 - lib/fog/ecloud/version.rb
 - spec/minitest_helper.rb
 - tests/compute/helper.rb
+- tests/compute/livespec/auth_tests.rb
 - tests/compute/models/admin_organization_tests.rb
 - tests/compute/models/compute_pool_tests.rb
 - tests/compute/models/detached_disk_tests.rb