You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by ma...@redhat.com on 2012/08/23 18:23:13 UTC
[PATCH] Fix for DTACLOUD_306 - Openstack server ID should be passed as string
From: marios <ma...@redhat.com>
https://issues.apache.org/jira/browse/DTACLOUD-306
Signed-off-by: marios <ma...@redhat.com>
---
server/lib/deltacloud/drivers/openstack/openstack_driver.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
index b7b7c65..2f67a08 100644
--- a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
+++ b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
@@ -119,7 +119,7 @@ module Deltacloud
insts = []
safely do
if opts[:id]
- server = os.get_server(opts[:id].to_i)
+ server = os.get_server(opts[:id])
insts << convert_from_server(server, os.connection.authuser)
else
insts = os.list_servers_detail.collect do |server|
@@ -137,7 +137,7 @@ module Deltacloud
#opts[:personality]: path1='server_path1'. content1='contents1', path2='server_path2', content2='contents2' etc
params = {}
params[:personality] = extract_personality(opts)
- params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : Time.now.to_s
+ params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : "server#{Time.now.to_s}"
params[:imageRef] = image_id
params[:flavorRef] = (opts[:hwp_id] && opts[:hwp_id].length>0) ?
opts[:hwp_id] : hardware_profiles(credentials).first.name
@@ -157,7 +157,7 @@ module Deltacloud
def reboot_instance(credentials, instance_id)
os = new_client(credentials)
safely do
- server = os.get_server(instance_id.to_i)
+ server = os.get_server(instance_id)
server.reboot! # sends a hard reboot (power cycle) - could instead server.reboot("SOFT")
convert_from_server(server, os.connection.authuser)
end
@@ -166,7 +166,7 @@ module Deltacloud
def destroy_instance(credentials, instance_id)
os = new_client(credentials)
safely do
- server = os.get_server(instance_id.to_i)
+ server = os.get_server(instance_id)
server.delete!
convert_from_server(server, os.connection.authuser)
end
--
1.7.11.4
Re: [PATCH] Fix for DTACLOUD_306 - Openstack server ID should be passed as string
Posted by Michal Fojtik <mf...@redhat.com>.
On Aug 23, 2012, at 6:23 PM, marios@redhat.com wrote:
ACK + shame on me that we don't have OpenStack tests yet ;(
-- Michal
> From: marios <ma...@redhat.com>
>
> https://issues.apache.org/jira/browse/DTACLOUD-306
>
> Signed-off-by: marios <ma...@redhat.com>
> ---
> server/lib/deltacloud/drivers/openstack/openstack_driver.rb | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
> index b7b7c65..2f67a08 100644
> --- a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
> +++ b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb
> @@ -119,7 +119,7 @@ module Deltacloud
> insts = []
> safely do
> if opts[:id]
> - server = os.get_server(opts[:id].to_i)
> + server = os.get_server(opts[:id])
> insts << convert_from_server(server, os.connection.authuser)
> else
> insts = os.list_servers_detail.collect do |server|
> @@ -137,7 +137,7 @@ module Deltacloud
> #opts[:personality]: path1='server_path1'. content1='contents1', path2='server_path2', content2='contents2' etc
> params = {}
> params[:personality] = extract_personality(opts)
> - params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : Time.now.to_s
> + params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : "server#{Time.now.to_s}"
> params[:imageRef] = image_id
> params[:flavorRef] = (opts[:hwp_id] && opts[:hwp_id].length>0) ?
> opts[:hwp_id] : hardware_profiles(credentials).first.name
> @@ -157,7 +157,7 @@ module Deltacloud
> def reboot_instance(credentials, instance_id)
> os = new_client(credentials)
> safely do
> - server = os.get_server(instance_id.to_i)
> + server = os.get_server(instance_id)
> server.reboot! # sends a hard reboot (power cycle) - could instead server.reboot("SOFT")
> convert_from_server(server, os.connection.authuser)
> end
> @@ -166,7 +166,7 @@ module Deltacloud
> def destroy_instance(credentials, instance_id)
> os = new_client(credentials)
> safely do
> - server = os.get_server(instance_id.to_i)
> + server = os.get_server(instance_id)
> server.delete!
> convert_from_server(server, os.connection.authuser)
> end
> --
> 1.7.11.4
>
Michal Fojtik
http://deltacloud.org
mfojtik@redhat.com