secured_cloud_api_client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6449ab212d358c4e72f0346eb3c134ea47f639
-  data.tar.gz: eccea57c73d0dd52f9c3da66dacb2e0a92faadac
+  metadata.gz: 5bf4654378de049601f6a9c21e33b73209822933
+  data.tar.gz: c08d66fbe94e1cd8559b6d390b076e56175503ce
 SHA512:
-  metadata.gz: 460772ad66e9ddac1159bccb90c7d0a8c9759e1da25802f9f7831f53a339285c379f177bd12ec7524d35342c8ea4af4e47cc4bdc8cae7efcd6a006dd62f19dcd
-  data.tar.gz: 734c5168f05e8a228478ac653c62fc81c7a13de850346417689e4e33584bb4c836e624c4b596cb185849fcc0238381c883d8a96632f4d883725494f1fa4b2215
+  metadata.gz: a50d6ba5aba45d8bb8de5eaceabe6833d45bec71154734a9b1b47e55190b6894637a71503db3b7fd09f7048f1c8e38f16b40ea25c65621772b7ba3b87d4ff9ba
+  data.tar.gz: 7e6384a6cfe6825c3a2a21c3ec542ef9d6c58fac03267865231f23fe6795295debe5c931b96fcd1e499fb3d5934ad1c229c372ec063b65471f804d4fb708242b

data/lib/secured_cloud_api_client/http_client.rb

@@ -38,6 +38,30 @@ class HttpClient
       
       errorMsg = ""
       
+      httpStatusDesc = ""
+      
+      #Add description of HTTP error code
+      if (response.code == "400") then
+        httpStatusDesc = "Bad Request"
+        
+      elsif (response.code == "403") then
+        httpStatusDesc = "Forbidden"
+        
+      elsif (response.code == "404") then
+        httpStatusDesc = "Resource Not Found"
+        
+      elsif (response.code == "405") then
+        httpStatusDesc = "Method Not Allowed"
+        
+      elsif (response.code == "405") then
+        httpStatusDesc = "Too Many Requests"
+        
+      elsif (response.code == "500") then
+        httpStatusDesc = "Internal Error"
+        
+      end
+      
+      #Add error message from SecuredCloud API if there is any
       if ((response['X-Application-Error-Reference'] != nil) && (response['X-Application-Error-Reference'] != "")) then
         errorMsg = response['X-Application-Error-Reference']
       end
@@ -45,10 +69,11 @@ class HttpClient
         errorMsg = response['X-Application-Error-Description']
       end
       
+      #Build final error message to be sent to user.
       if (errorMsg == "") then
-        errorMsg = "Error " + response.code.to_str() + " " + response.body()
+        errorMsg = "Error " + response.code.to_str() + " (" + httpStatusDesc + ") " + response.body()
       else
-        errorMsg = "Error " + response.code.to_str() +  " " + errorMsg  
+        errorMsg = "Error " + response.code.to_str() + " (" + httpStatusDesc + ") " + errorMsg  
       end
       
       raise errorMsg

data/lib/secured_cloud_api_client/task_status.rb

@@ -18,6 +18,16 @@ class TaskStatus
     @processDescription = processDescription
     @createdTimestamp = createdTimestamp
     @lastUpdatedTimeStamp = lastUpdatedTimeStamp
+    
+    #Handle bum messages
+    if (@errorMessage == "DC VCPU Allocation not defined for VDC: %s") then
+      @errorMessage = "VCPU Allocation not defined for this node"
+    elsif (@errorMessage == "VDC Memory Allocation not defined for VDC: %s") then
+      @errorMessage = "Memory Allocation not defined for this node"
+    elsif (@errorMessage == "VDC Storage Allocation not defined for VDC: %s") then
+      @errorMessage = "Storage Allocation not defined for this node"
+    end
+    
   end
   
   

data/lib/secured_cloud_api_client.rb

@@ -461,14 +461,14 @@ class SecuredCloudRestClient
     if (name == nil) then 
       name = 'null' 
     else
-      raise ArgumentError, 'name needs to be a valid string' unless name.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: name needs to be a valid string' unless name.respond_to?(:to_str)
       name = '"' + name + '"'
     end
     
     if (description == nil) then 
       description = 'null' 
     else
-      raise ArgumentError, 'description needs to be a valid string' unless description.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: description needs to be a valid string' unless description.respond_to?(:to_str)
       description = '"' + description + '"'
     end
     
@@ -477,46 +477,46 @@ class SecuredCloudRestClient
     if (storageGB == nil) then 
       storageGB = 'null'
     else 
-      raise ArgumentError, 'storageGB needs to be a valid number' unless storageGB.is_a? Numeric
+      raise ArgumentError, 'Config error: storageGB needs to be a valid number' unless storageGB.is_a? Numeric
     end
     
     if (memoryMB == nil) then 
       memoryMB = 'null' 
     else 
-      raise ArgumentError, 'memoryMB needs to be a valid number' unless memoryMB.is_a? Numeric
+      raise ArgumentError, 'Config error: memoryMB needs to be a valid number' unless memoryMB.is_a? Numeric
     end
     
     if (vCPUCount == nil) then 
       vCPUCount = 'null' 
     else 
-      raise ArgumentError, 'vCPUCount needs to be a valid number' unless vCPUCount.is_a? Numeric
+      raise ArgumentError, 'Config error: vCPUCount needs to be a valid number' unless vCPUCount.is_a? Numeric
     end
     
     if (powerStatus == nil) then 
       powerStatus = 'null' 
     else
-      raise ArgumentError, 'powerStatus needs to be a valid string' unless powerStatus.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: powerStatus needs to be a valid string' unless powerStatus.respond_to?(:to_str)
       powerStatus = '"' + powerStatus + '"'
     end
     
     if (imageResource == nil) then 
       imageResource = 'null' 
     else
-      raise ArgumentError, 'imageResource needs to be a valid string' unless imageResource.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: imageResource needs to be a valid string' unless imageResource.respond_to?(:to_str)
       imageResource = '{"resourceURL":"' + imageResource + '"}'
     end
     
     if (osTemplateResource == nil) then 
       osTemplateResource = 'null' 
     else
-      raise ArgumentError, 'osTemplateResource needs to be a valid string' unless osTemplateResource.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: osTemplateResource needs to be a valid string' unless osTemplateResource.respond_to?(:to_str)
       osTemplateResource = '{"resourceURL":"' + osTemplateResource + '"}'
     end
     
     if (osPassword == nil) then 
       osPassword = 'null' 
     else
-      raise ArgumentError, 'osPassword needs to be a valid string' unless osPassword.respond_to?(:to_str)
+      raise ArgumentError, 'Config error: osPassword needs to be a valid string' unless osPassword.respond_to?(:to_str)
       osPassword = '"' + osPassword + '"'
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secured_cloud_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alan Vella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A simple API client for the Secured Cloud
 email: alanv@ccbilleu.com