projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 2316: Fix for Unable to do vertical scaling when VM is in Shutdown state
[osm/RO.git]
/
RO-VIM-openstack
/
osm_rovim_openstack
/
vimconn_openstack.py
diff --git
a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index
9d47437
..
2017d56
100644
(file)
--- a/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/
RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@
-3902,7
+3902,9
@@
class vimconnector(vimconn.VimConnector):
self.nova.servers.resize(server=vm_id, flavor=new_flavor_id)
vm_state = self.__wait_for_vm(vm_id, "VERIFY_RESIZE")
if vm_state:
self.nova.servers.resize(server=vm_id, flavor=new_flavor_id)
vm_state = self.__wait_for_vm(vm_id, "VERIFY_RESIZE")
if vm_state:
- instance_resized_status = self.confirm_resize(vm_id)
+ instance_resized_status = self.confirm_resize(
+ vm_id, instance_status
+ )
return instance_resized_status
else:
raise nvExceptions.BadRequest(
return instance_resized_status
else:
raise nvExceptions.BadRequest(
@@
-3923,7
+3925,7
@@
class vimconnector(vimconn.VimConnector):
) as e:
self._format_exception(e)
) as e:
self._format_exception(e)
- def confirm_resize(self, vm_id):
+ def confirm_resize(self, vm_id
, instance_state
):
"""
Confirm the resize of an instance
param:
"""
Confirm the resize of an instance
param:
@@
-3932,7
+3934,7
@@
class vimconnector(vimconn.VimConnector):
self._reload_connection()
self.nova.servers.confirm_resize(server=vm_id)
if self.get_vdu_state(vm_id)[0] == "VERIFY_RESIZE":
self._reload_connection()
self.nova.servers.confirm_resize(server=vm_id)
if self.get_vdu_state(vm_id)[0] == "VERIFY_RESIZE":
- self.__wait_for_vm(vm_id,
"ACTIVE"
)
+ self.__wait_for_vm(vm_id,
instance_state
)
instance_status = self.get_vdu_state(vm_id)[0]
return instance_status
instance_status = self.get_vdu_state(vm_id)[0]
return instance_status