diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-18 09:57:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-18 09:57:09 +0000 |
| commit | eda2292742aec79ff5d1121ea1c53fc5feaf2a1c (patch) | |
| tree | 899009e611803f99ac3943023074d45a32d249c9 | |
| parent | bf0f41d141ebdf7ead1e3a4f34cca2a16ff75056 (diff) | |
| parent | 178e48e0ea78c4906e8f70a6567064eb4272a599 (diff) | |
| download | nova-eda2292742aec79ff5d1121ea1c53fc5feaf2a1c.tar.gz nova-eda2292742aec79ff5d1121ea1c53fc5feaf2a1c.tar.xz nova-eda2292742aec79ff5d1121ea1c53fc5feaf2a1c.zip | |
Merge "Remove _is_precooked pre-cells Zones hacks"
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/servers.py | 7 | ||||
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 7 | ||||
| -rw-r--r-- | nova/api/openstack/compute/views/servers.py | 10 |
3 files changed, 4 insertions, 20 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index b12988010..ef170fa7b 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -1019,11 +1019,8 @@ class ServersController(wsgi.Controller): req.cache_db_instances(instances) server = self._view_builder.create(req, instances[0]) - if '_is_precooked' in server['server'].keys(): - del server['server']['_is_precooked'] - else: - if CONF.enable_instance_password: - server['server']['adminPass'] = password + if CONF.enable_instance_password: + server['server']['adminPass'] = password robj = wsgi.ResponseObject(server) diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index a8e0beec7..de7a51812 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -943,11 +943,8 @@ class Controller(wsgi.Controller): req.cache_db_instances(instances) server = self._view_builder.create(req, instances[0]) - if '_is_precooked' in server['server'].keys(): - del server['server']['_is_precooked'] - else: - if CONF.enable_instance_password: - server['server']['adminPass'] = password + if CONF.enable_instance_password: + server['server']['adminPass'] = password robj = wsgi.ResponseObject(server) diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index bf7123ba7..734bb647d 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -54,14 +54,6 @@ class ViewBuilder(common.ViewBuilder): self._flavor_builder = views_flavors.ViewBuilder() self._image_builder = views_images.ViewBuilder() - def _skip_precooked(func): - def wrapped(self, request, instance): - if instance.get("_is_precooked"): - return dict(server=instance) - else: - return func(self, request, instance) - return wrapped - def create(self, request, instance): """View that should be returned when an instance is created.""" return { @@ -73,7 +65,6 @@ class ViewBuilder(common.ViewBuilder): }, } - @_skip_precooked def basic(self, request, instance): """Generic, non-detailed view of an instance.""" return { @@ -86,7 +77,6 @@ class ViewBuilder(common.ViewBuilder): }, } - @_skip_precooked def show(self, request, instance): """Detailed view of a single instance.""" server = { |