vishvananda

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index b292c93..889488c 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -2018,13 +2018,13 @@ class LibvirtConnection(driver.ComputeDriver):
         # if image has kernel and ramdisk, just download
         # following normal way.
         if instance_ref['kernel_id']:
-            libvirt_utils.fetch_image(nova_context.get_admin_context(),
+            libvirt_utils.fetch_image(ctxt,

vishvananda

diff --git a/nova/testing/fake/memcache.py b/nova/testing/fake/memcache.py
index e4f238a..6677ed3 100644
--- a/nova/testing/fake/memcache.py
+++ b/nova/testing/fake/memcache.py
@@ -30,10 +30,11 @@ class Client(object):
 
     def get(self, key):
         """Retrieves the value for a key or None."""
-        (timeout, value) = self.cache.get(key, (0, None))
-        if timeout == 0 or utils.utcnow_ts() < timeout:

vishvananda

diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index 0baa85d..45d3f7f 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -36,9 +36,9 @@ use = egg:Paste#urlmap
 
 [composite:ec2cloud]
 use = call:nova.api.auth:pipeline_factory
-noauth = ec2faultwrap logrequest ec2noauth cloudrequest authorizer validator ec2executor
+noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor

vishvananda

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 0accb91..5946750 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1983,10 +1983,6 @@ class ComputeManager(manager.SchedulerDependentManager):
         # Releasing vlan.
         # (not necessary in current implementation?)
 
-        # NOTE(tr3buchet): tear down networks on source host
-        self.network_api.setup_networks_on_host(ctxt, instance_ref,

vishvananda

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 0accb91..5cb34f8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2024,15 +2024,6 @@ class ComputeManager(manager.SchedulerDependentManager):
                       "args": {'instance_id': instance_ref['id'],
                                'block_migration': block_migration}})
 
-        # Restore instance state
-        current_power_state = self._get_power_state(ctxt, instance_ref)

vishvananda

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 92ef176..5f97e70 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -304,6 +304,11 @@ def get_networks_for_instance_from_nw_info(nw_info):
     return networks
 
 
+def get_nwinfo_for_instance(context, instance):
+    cached_nwinfo = instance['info_cache'].get('network_info') or []

vishvananda

diff --git a/horizon/horizon/api/nova.py b/horizon/horizon/api/nova.py
index 3bf4a86..1937843 100644
--- a/horizon/horizon/api/nova.py
+++ b/horizon/horizon/api/nova.py
@@ -190,6 +190,18 @@ def novaclient(request):
     return c
 
 
+def cinderclient(request):
+    LOG.debug('cinderclient connection created using token "%s" and url "%s"' %

vishvananda

diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index 6d01100..e235ad0 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -517,18 +517,20 @@ class SnapshotController(object):
 
         snapshot = body['snapshot']
         volume_id = snapshot['volume_id']
+        volume = self.volume_api.get(context, volume_id)
+

vishvananda

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 83a0222..bcb0574 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3876,18 +3876,21 @@ def sm_backend_conf_create(context, values):
 
 @require_admin_context
 def sm_backend_conf_update(context, sm_backend_id, values):
-    backend_conf = model_query(context, models.SMBackendConf,
-                               read_deleted="yes").\

vishvananda

diff --git a/nova/compute/api.py b/nova/compute/api.py
index f65b5ce..01f5488 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -29,6 +29,7 @@ from nova import flags
 import nova.image
 from nova import log as logging
 from nova import network
+from nova import policy
 from nova import quota