summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Authors1
-rw-r--r--nova/db/sqlalchemy/api.py1
-rw-r--r--nova/tests/test_db_api.py9
3 files changed, 11 insertions, 0 deletions
diff --git a/Authors b/Authors
index fc0edd3af..8bb807041 100644
--- a/Authors
+++ b/Authors
@@ -122,6 +122,7 @@ Todd Willey <todd@ansolabs.com>
Trey Morris <trey.morris@rackspace.com>
Troy Toman <troy.toman@rackspace.com>
Tushar Patil <tushar.vitthal.patil@gmail.com>
+Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Vasiliy Shlykov <vash@vasiliyshlykov.org>
Vishvananda Ishaya <vishvananda@gmail.com>
Vivek Y S <vivek.ys@gmail.com>
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 47efb9019..b49ae1801 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1792,6 +1792,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 6f6269e52..590505a23 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -147,3 +147,12 @@ class DbApiTestCase(test.TestCase):
results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
self.assertEqual(0, len(results))
db.instance_update(ctxt, instance.id, {"task_state": None})
+
+ 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)