From c09711d0e2dba0fa0326b5027234e9c4a81e9aac Mon Sep 17 00:00:00 2001
From: Chris Yeoh <cyeoh@au1.ibm.com>
Date: Wed, 12 Jun 2013 14:58:36 +0930
Subject: Cleanup overshadowing in test_evacuate.py

Fixes overshadowing problem of uuid in test_evacuate identified in
the v2 to v3 evacuate port but separated into a separate changeset
to fix both the v2 and v3 versions at the same time

Change-Id: If1006d86eab7198484a6d5f82a3f3f328724f4d4
---
 .../api/openstack/compute/contrib/test_evacuate.py   | 20 ++++++++++----------
 .../openstack/compute/plugins/v3/test_evacuate.py    | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/api/openstack/compute/contrib/test_evacuate.py
index 816bac565..f2ebf9d78 100644
--- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py
+++ b/nova/tests/api/openstack/compute/contrib/test_evacuate.py
@@ -76,8 +76,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -105,8 +105,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -132,8 +132,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -161,8 +161,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -184,8 +184,8 @@ class EvacuateTest(test.TestCase):
     def test_not_admin(self):
         ctxt = context.RequestContext('fake', 'fake', is_admin=False)
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py
index a9ad80ea5..72a531277 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py
@@ -76,8 +76,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v3/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -105,8 +105,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v3/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -132,8 +132,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v3/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -161,8 +161,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v3/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -184,8 +184,8 @@ class EvacuateTest(test.TestCase):
     def test_not_admin(self):
         ctxt = context.RequestContext('fake', 'fake', is_admin=False)
         app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v3/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
-- 
cgit