openstack/nova
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2011-11-17 15:13:55 +00:00
committed by Gerrit Code Review
parent 148bda5d8e e632d21a88
commit 64d80f97d2
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@@ -119,6 +119,7 @@ Todd Willey <todd@ansolabs.com>
Trey Morris <trey.morris@rackspace.com> Trey Morris <trey.morris@rackspace.com>
Troy Toman <troy.toman@rackspace.com> Troy Toman <troy.toman@rackspace.com>
Tushar Patil <tushar.vitthal.patil@gmail.com> Tushar Patil <tushar.vitthal.patil@gmail.com>
Unmesh Gurjar <unmesh.gurjar@vertex.co.in>
Vasiliy Shlykov <vash@vasiliyshlykov.org> Vasiliy Shlykov <vash@vasiliyshlykov.org>
Vishvananda Ishaya <vishvananda@gmail.com> Vishvananda Ishaya <vishvananda@gmail.com>
Vivek Y S <vivek.ys@gmail.com> Vivek Y S <vivek.ys@gmail.com>

1
nova/db/sqlalchemy/api.py
View File

@@ -1754,6 +1754,7 @@ def network_count_reserved_ips(context, network_id):
@require_admin_context @require_admin_context
def network_create_safe(context, values): def network_create_safe(context, values):
network_ref = models.Network() network_ref = models.Network()
network_ref['uuid'] = str(utils.gen_uuid())
network_ref.update(values) network_ref.update(values)
try: try:
network_ref.save() network_ref.save()

9
nova/tests/test_db_api.py
View File

@@ -95,3 +95,12 @@ class DbApiTestCase(test.TestCase):
self.assertEqual(result[0].id, inst2.id) self.assertEqual(result[0].id, inst2.id)
self.assertEqual(result[1].id, inst1.id) self.assertEqual(result[1].id, inst1.id)
self.assertTrue(result[1].deleted) 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)