diff options
| author | matt.dietz@rackspace.com <> | 2011-03-23 21:46:29 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-23 21:46:29 +0000 |
| commit | 6912b0e1efd6ba3814d3b29beef236bfe4da52ea (patch) | |
| tree | 5e6574417b782e09adb72d7157144ea67f454dc8 /nova/api | |
| parent | b8af3522a731c64118882d7a6024f50f21407d50 (diff) | |
| parent | 98b4f0924257dcfa12e4881950472e983f08ef1d (diff) | |
Updates the previously merged xs_migration functionality to allow upsizing of the RAM and disk quotas for a XenServer instance.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/views/servers.py | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 830bc2659..d392ab57f 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -22,6 +22,7 @@ from xml.dom import minidom from webob import exc from nova import compute +from nova import context from nova import exception from nova import flags from nova import log as logging diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 261acfed0..68f712e56 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -16,7 +16,10 @@ # under the License. import hashlib + from nova.compute import power_state +import nova.compute +import nova.context from nova.api.openstack import common from nova.api.openstack.views import addresses as addresses_view from nova.api.openstack.views import flavors as flavors_view @@ -84,7 +87,12 @@ class ViewBuilder(object): for k, v in mapped_keys.iteritems(): inst_dict[k] = inst[v] + ctxt = nova.context.get_admin_context() inst_dict['status'] = power_mapping[inst_dict['status']] + compute_api = nova.compute.API() + if compute_api.has_finished_migration(ctxt, inst['id']): + inst_dict['status'] = 'resize-confirm' + inst_dict['addresses'] = self.addresses_builder.build(inst) # Return the metadata as a dictionary |