Removes quantum.tests.test_api_v2._uuid()

Removed _uuid function
Defined an _uuid alias of openstack.common.uuidutils.generate_uuid

Fixes bug #1082255

Change-Id: I7d10ce3ade27eb4cdd533b5a77b9c405ad1dc174

diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py
index 4557fc0a890d67828b5ce76e0a3b758094aaca0f..7e7e7900280c02f1be339deb88394f0b546ba593 100644 (file)
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@ -38,14 +38,12 @@ from quantum.openstack.common import uuidutils
 
 LOG = logging.getLogger(__name__)
 
-
-def _uuid():
-    return uuidutils.generate_uuid()
-
 ROOTDIR = os.path.dirname(os.path.dirname(__file__))
 ETCDIR = os.path.join(ROOTDIR, 'etc')
 EXTDIR = os.path.join(ROOTDIR, 'unit/extensions')
 
+_uuid = uuidutils.generate_uuid
+
 
 def etcdir(*p):
     return os.path.join(ETCDIR, *p)

diff --git a/quantum/tests/unit/test_l3_agent.py b/quantum/tests/unit/test_l3_agent.py
index 3e6b6882ac1ea79a758d2874a63e6d451c1493a0..70b336c4764ae7a57dc61808c4440eb0171d1891 100644 (file)
--- a/quantum/tests/unit/test_l3_agent.py
+++ b/quantum/tests/unit/test_l3_agent.py
@@ -14,6 +14,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 import copy
 import time
 import unittest
@@ -24,9 +25,10 @@ from quantum.agent.common import config
 from quantum.agent import l3_agent
 from quantum.agent.linux import interface
 from quantum.db import l3_db
-from quantum.tests.unit import test_api_v2
+from quantum.openstack.common import uuidutils
+
 
-_uuid = test_api_v2._uuid
+_uuid = uuidutils.generate_uuid
 
 
 class TestBasicRouterOperations(unittest.TestCase):

diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py
index 8dd1096e1d68d7144933716af367d05ad0e24ec4..6b99b41a06fa18c4a04264f70ff70219917baff2 100644 (file)
--- a/quantum/tests/unit/test_l3_plugin.py
+++ b/quantum/tests/unit/test_l3_plugin.py
@@ -47,7 +47,7 @@ from quantum.tests.unit import test_extensions
 
 LOG = logging.getLogger(__name__)
 
-_uuid = test_api_v2._uuid
+_uuid = uuidutils.generate_uuid
 _get_path = test_api_v2._get_path