Merge "Fix lp:861160 -- newly created network has no uuid" into stable/diablo

Authors

@@ -119,6 +119,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>

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()

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)