diff options
| -rwxr-xr-x | bin/nova-manage | 5 | ||||
| -rw-r--r-- | nova/db/api.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_nova_manage.py | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 0a8edb9f3..736e55653 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -812,7 +812,10 @@ class NetworkCommands(object): if project != "None": if project: project_id = manager.Project.safe_id(project) - db.network_associate_by_id(admin_context, network_id=network['id'], project_id=project, force=True) + db.network_associate_by_id(admin_context, + network_id=network['id'], + project_id=project, + force=True) else: db.network_disassociate(admin_context, network_id=network['id']) if host != "None": diff --git a/nova/db/api.py b/nova/db/api.py index ec701ebdc..928c695fd 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -625,7 +625,8 @@ def network_associate(context, project_id, force=False): def network_associate_by_id(context, network_id, project_id, force=False): """Associate a project with a network specified by id.""" - return IMPL.network_associate_by_id(context, network_id, project_id, force=False) + return IMPL.network_associate_by_id(context, network_id, project_id, + force=False) def network_count(context): diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 4c828da16..d6edc8ba9 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -88,6 +88,7 @@ class FixedIpCommandsTestCase(test.TestCase): '10.0.0.100') self.assertEqual(address['reserved'], False) + class NetworkCommandsTestCase(test.TestCase): def setUp(self): super(NetworkCommandsTestCase, self).setUp() @@ -101,7 +102,7 @@ class NetworkCommandsTestCase(test.TestCase): super(NetworkCommandsTestCase, self).tearDown() def test_create(self): - FLAGS.network_manager='nova.network.manager.VlanManager' + FLAGS.network_manager = 'nova.network.manager.VlanManager' self.commands.create( label='Test', fixed_range_v4='10.2.0.0/24', @@ -173,7 +174,8 @@ class NetworkCommandsTestCase(test.TestCase): net = db.network_get_by_cidr(self.context, '10.2.0.0/24') self.assertEqual(net['project_id'], None) self.assertEqual(net['host'], None) - self.commands.modify('10.2.0.0/24', project='test_project', host='test_host') + self.commands.modify('10.2.0.0/24', project='test_project', + host='test_host') net = db.network_get_by_cidr(self.context, '10.2.0.0/24') self.assertEqual(net['project_id'], 'test_project') self.assertEqual(net['host'], 'test_host') |