From: marios <[email protected]>
---
.../drivers/rimuhosting/rimuhosting_client.rb | 10 ++++++----
.../drivers/rimuhosting/rimuhosting_driver.rb | 7 ++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
b/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
index a07c881..9235e97 100755
--- a/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
+++ b/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
@@ -31,7 +31,9 @@ class RimuHostingClient
@uri = URI.parse(baseuri)
@service = Net::HTTP.new(@uri.host, @uri.port)
@service.use_ssl = true
- if credentials.provided?
+ if credentials.nil?
+ raise Deltacloud::AuthException.new
+ else
@auth = "rimuhosting apikey=#{credentials.password}"
end
@@ -47,8 +49,9 @@ class RimuHostingClient
res = JSON.parse(r.body)
res = res[res.keys[0]]
- if(res['response_type'] == "ERROR" and res['error_info']['error_class'] ==
"PermissionException")
- raise DeltaCloud::AuthException.new
+ if(res['response_type'] == "ERROR" and ( (res['error_info']['error_class']
== "PermissionException") or
+ (res['error_info']['error_class']
== "LoginRequired") ))
+ raise Deltacloud::AuthException.new
end
res
end
@@ -58,7 +61,6 @@ class RimuHostingClient
end
def list_plans
- puts "testsdasfdsf"
request('/pricing-plans;server-type=VPS')["pricing_plan_infos"]
end
diff --git a/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
b/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
index f4640a0..2b0002b 100755
--- a/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
+++ b/server/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
@@ -51,8 +51,8 @@ class RimuHostingDriver < Deltacloud::BaseDriver
# not contained in hte pricing_plan_infos
HardwareProfile.new(plan["pricing_plan_code"]) do
memory plan["minimum_memory_mb"].to_f
- storage => plan["minimum_disk_gb"].to_i
- architecture => "x86"
+ storage plan["minimum_disk_gb"].to_i
+ architecture "x86"
end
end
filter_hardware_profiles(results, opts)
@@ -118,7 +118,8 @@ class RimuHostingDriver < Deltacloud::BaseDriver
:realm_id => "RH",
:owner_id => "root",
:instance_profile => InstanceProfile.new("none"),
- :actions => instance_actions_for("RUNNING")
+ :actions => instance_actions_for("RUNNING"),
+ :public_addresses => inst["allocated_ips"]["primary_ip"]
})
end
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
