From e632d21a88665463873787edf1a56d76103ed071 Mon Sep 17 00:00:00 2001 From: Unmesh Gurjar Date: Wed, 19 Oct 2011 14:44:01 +0530 Subject: [PATCH] Fix lp:861160 -- newly created network has no uuid Implemented code review changes. Fixed issue causing pep8 build failure. (cherry picked from commit bef4ae509256683fefe8785ce62ef2e423009653) Change-Id: If2cc0e23be8d4e1558a10fa86e6ba4cdec61b7d1 --- Authors | 1 + nova/db/sqlalchemy/api.py | 1 + nova/tests/test_db_api.py | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/Authors b/Authors index cedd19981b52..bff7d1443eb0 100644 --- a/Authors +++ b/Authors @@ -117,6 +117,7 @@ Todd Willey Trey Morris Troy Toman Tushar Patil +Unmesh Gurjar Vasiliy Shlykov Vishvananda Ishaya Vivek Y S diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 6cc678a59a74..3fcba4c0d5d4 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1754,6 +1754,7 @@ def network_count_reserved_ips(context, network_id): @require_admin_context def network_create_safe(context, values): network_ref = models.Network() + network_ref['uuid'] = str(utils.gen_uuid()) network_ref.update(values) try: network_ref.save() diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 60d7abd8c21c..3e37d9a31349 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -95,3 +95,12 @@ class DbApiTestCase(test.TestCase): self.assertEqual(result[0].id, inst2.id) self.assertEqual(result[1].id, inst1.id) self.assertTrue(result[1].deleted) + + def test_network_create_safe(self): + ctxt = context.get_admin_context() + values = {'host': 'localhost', 'project_id': 'project1'} + network = db.network_create_safe(ctxt, values) + self.assertNotEqual(None, network.uuid) + self.assertEqual(36, len(network.uuid)) + db_network = db.network_get(ctxt, network.id) + self.assertEqual(network.uuid, db_network.uuid)