From 9ad17dec99608b3738d662d91c49964b3f207d02 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 17 Aug 2011 09:57:15 -0700 Subject: Add NetworkCommandsTestCase into unit test of nova-manage --- nova/tests/test_nova_manage.py | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 9c6563f14..69e73367f 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -15,6 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. +import gettext import os import sys @@ -24,16 +25,20 @@ TOPDIR = os.path.normpath(os.path.join( os.pardir)) NOVA_MANAGE_PATH = os.path.join(TOPDIR, 'bin', 'nova-manage') +gettext.install('nova', unicode=1) + sys.dont_write_bytecode = True import imp nova_manage = imp.load_source('nova_manage.py', NOVA_MANAGE_PATH) sys.dont_write_bytecode = False import netaddr +import StringIO from nova import context from nova import db from nova import flags from nova import test +from nova import exception FLAGS = flags.FLAGS @@ -80,3 +85,71 @@ class FixedIpCommandsTestCase(test.TestCase): address = db.fixed_ip_get_by_address(context.get_admin_context(), '10.0.0.100') self.assertEqual(address['reserved'], False) + +class NetworkCommandsTestCase(test.TestCase): + def setUp(self): +# print 'piyo' + super(NetworkCommandsTestCase, self).setUp() + self.commands = nova_manage.NetworkCommands() + self.context = context.get_admin_context() + nets = db.network_get_all(self.context) + for net in nets: + db.network_delete_safe(self.context, net['id']) + + def tearDown(self): + super(NetworkCommandsTestCase, self).tearDown() + + def test_create(self): + self.commands.create( + label = 'Test', + fixed_range_v4 = '10.2.0.0/24', + fixed_range_v6 = 'fd00:2::/64', + num_networks = 1, + network_size = 256, + vlan_start = 200, + bridge_interface = 'eth0', + ) + net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + self.assertEqual(net['label'], 'Test') + self.assertEqual(net['cidr'], '10.2.0.0/24') + self.assertEqual(net['netmask'], '255.255.255.0') + self.assertEqual(net['cidr_v6'], 'fd00:2::/64') + self.assertEqual(net['bridge_interface'], 'eth0') + self.assertEqual(net['vlan'], 200) + + def test_list(self): + format = "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" + head = format % ( + _('IPv4'), + _('IPv6'), + _('start address'), + _('DNS1'), + _('DNS2'), + _('VlanID'), + _('project')) + body = format % ( + '10.2.0.0/24', + 'fd00:2::/64', + '10.2.0.3', + 'None', + 'None', + '200', + 'None',) + self.test_create() + output = StringIO.StringIO() + sys.stdout = output + self.commands.list() + sys.stdout = sys.__stdout__ + result = output.getvalue() + answer = '%s\n%s\n' % (head, body) + self.assertEqual(result, answer) + + def test_delete(self): + self.test_create() + self.commands.delete(fixed_range = '10.2.0.0/24') + net_exist = True + try: + net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + except exception.NetworkNotFoundForCidr, e: + net_exist = False + self.assertEqual(net_exist, False) -- cgit From b3d3f735a7402c49b8db0e19c9b1f8521187378b Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Fri, 19 Aug 2011 09:32:39 -0700 Subject: Fix unit test for the change of 'nova-manage network list' format --- nova/tests/test_nova_manage.py | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 69e73367f..e4914e0b1 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -103,7 +103,7 @@ class NetworkCommandsTestCase(test.TestCase): self.commands.create( label = 'Test', fixed_range_v4 = '10.2.0.0/24', - fixed_range_v6 = 'fd00:2::/64', + fixed_range_v6 = 'fd00:2::/120', num_networks = 1, network_size = 256, vlan_start = 200, @@ -113,34 +113,38 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(net['label'], 'Test') self.assertEqual(net['cidr'], '10.2.0.0/24') self.assertEqual(net['netmask'], '255.255.255.0') - self.assertEqual(net['cidr_v6'], 'fd00:2::/64') + self.assertEqual(net['cidr_v6'], 'fd00:2::/120') self.assertEqual(net['bridge_interface'], 'eth0') self.assertEqual(net['vlan'], 200) def test_list(self): - format = "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" - head = format % ( - _('IPv4'), - _('IPv6'), - _('start address'), - _('DNS1'), - _('DNS2'), - _('VlanID'), - _('project')) - body = format % ( - '10.2.0.0/24', - 'fd00:2::/64', - '10.2.0.3', - 'None', - 'None', - '200', - 'None',) self.test_create() + net = db.network_get_by_cidr(self.context, '10.2.0.0/24') output = StringIO.StringIO() sys.stdout = output self.commands.list() sys.stdout = sys.__stdout__ result = output.getvalue() + _fmt = "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" + head = _fmt % (_('id'), + _('IPv4'), + _('IPv6'), + _('start address'), + _('DNS1'), + _('DNS2'), + _('VlanID'), + _('project'), + _("uuid")) + body = _fmt % ( + net['id'], + '10.2.0.0/24', + 'fd00:2::/120', + '10.2.0.3', + 'None', + 'None', + '200', + 'None', + net['uuid'],) answer = '%s\n%s\n' % (head, body) self.assertEqual(result, answer) -- cgit From 9508bb599c15035f7afbdc80fe70d539e8598edf Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Mon, 22 Aug 2011 08:59:35 -0700 Subject: Add 'nova-manage network modify' command. --- bin/nova-manage | 30 +++++++++++++++++++++++++ nova/db/api.py | 5 +++++ nova/db/sqlalchemy/api.py | 32 +++++++++++++++++++++++++++ nova/tests/test_nova_manage.py | 50 ++++++++++++++++++++++++++++++++---------- 4 files changed, 106 insertions(+), 11 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 62504f827..0a8edb9f3 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -795,6 +795,36 @@ class NetworkCommands(object): ' before delete' % network.project_id)) db.network_delete_safe(context.get_admin_context(), network.id) + @args('--network', dest="fixed_range", metavar='', + help='Network to modify') + @args('--project', dest="project", metavar='', + help='Project name to associate/disasscociate') + @args('--host', dest="host", metavar='', + help='Host to associate/disasscociate') + def modify(self, fixed_range, project=None, host=None): + """Associate/Disasscociate Network with Project and/or Host + arguments: network project host + specify 'None' to disassociate it + leave any field blank to ignore it + """ + admin_context = context.get_admin_context() + network = db.network_get_by_cidr(admin_context, fixed_range) + 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) + else: + db.network_disassociate(admin_context, network_id=network['id']) + if host != "None": + if host: + db.network_set_host(admin_context, + network['id'], + host) + else: + db.network_set_host(admin_context, + network['id'], + None) + class VmCommands(object): """Class for mangaging VM instances.""" diff --git a/nova/db/api.py b/nova/db/api.py index 6833e6312..ec701ebdc 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -623,6 +623,11 @@ def network_associate(context, project_id, force=False): return IMPL.network_associate(context, project_id, force) +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) + + def network_count(context): """Return the number of networks.""" return IMPL.network_count(context) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2f9cab1ab..37dac1444 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1669,6 +1669,38 @@ def network_associate(context, project_id, force=False): return network_ref +@require_admin_context +def network_associate_by_id(context, network_id, project_id, force=False): + """Associate a project with a network specified by id. + + only associate if the network isn't already associated + with a project or if force is True + """ + session = get_session() + with session.begin(): + + def network_query(network_filter): + if force: + return session.query(models.Network).\ + filter_by(deleted=False).\ + filter_by(id=network_filter).\ + with_lockmode('update').\ + first() + else: + return session.query(models.Network).\ + filter_by(deleted=False).\ + filter_by(project_id=None).\ + filter_by(id=network_filter).\ + with_lockmode('update').\ + first() + network_ref = network_query(network_id) + if network_ref: + network_ref['project_id'] = project_id + session.add(network_ref) + LOG.debug("piyo: network_ref['project_id']=%s" % network_ref['project_id']) + return network_ref + + @require_admin_context def network_count(context): session = get_session() diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index e4914e0b1..4c828da16 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -39,8 +39,10 @@ from nova import db from nova import flags from nova import test from nova import exception +from nova import log as logging FLAGS = flags.FLAGS +LOG = logging.getLogger('nova.tests.nova_manage') class FixedIpCommandsTestCase(test.TestCase): @@ -88,7 +90,6 @@ class FixedIpCommandsTestCase(test.TestCase): class NetworkCommandsTestCase(test.TestCase): def setUp(self): -# print 'piyo' super(NetworkCommandsTestCase, self).setUp() self.commands = nova_manage.NetworkCommands() self.context = context.get_admin_context() @@ -100,22 +101,29 @@ class NetworkCommandsTestCase(test.TestCase): super(NetworkCommandsTestCase, self).tearDown() def test_create(self): + FLAGS.network_manager='nova.network.manager.VlanManager' self.commands.create( - label = 'Test', - fixed_range_v4 = '10.2.0.0/24', - fixed_range_v6 = 'fd00:2::/120', - num_networks = 1, - network_size = 256, - vlan_start = 200, - bridge_interface = 'eth0', - ) + label='Test', + fixed_range_v4='10.2.0.0/24', + num_networks=1, + network_size=256, + multi_host='F', + vlan_start=200, + vpn_start=2000, + fixed_range_v6='fd00:2::/120', + gateway_v6='fd00:2::22', + bridge_interface='eth0') net = db.network_get_by_cidr(self.context, '10.2.0.0/24') self.assertEqual(net['label'], 'Test') self.assertEqual(net['cidr'], '10.2.0.0/24') self.assertEqual(net['netmask'], '255.255.255.0') + self.assertEqual(net['multi_host'], False) + self.assertEqual(net['vlan'], 200) + self.assertEqual(net['bridge'], 'br200') + self.assertEqual(net['vpn_public_port'], 2000) self.assertEqual(net['cidr_v6'], 'fd00:2::/120') + self.assertEqual(net['gateway_v6'], 'fd00:2::22') self.assertEqual(net['bridge_interface'], 'eth0') - self.assertEqual(net['vlan'], 200) def test_list(self): self.test_create() @@ -150,10 +158,30 @@ class NetworkCommandsTestCase(test.TestCase): def test_delete(self): self.test_create() - self.commands.delete(fixed_range = '10.2.0.0/24') + self.commands.delete(fixed_range='10.2.0.0/24') net_exist = True try: net = db.network_get_by_cidr(self.context, '10.2.0.0/24') except exception.NetworkNotFoundForCidr, e: net_exist = False self.assertEqual(net_exist, False) + + def test_modify(self): + self.test_create() + net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + db.network_disassociate(self.context, net['id']) + 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') + 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') + self.commands.modify('10.2.0.0/24') + 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') + self.commands.modify('10.2.0.0/24', project='None', host='None') + net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + self.assertEqual(net['project_id'], None) + self.assertEqual(net['host'], None) -- cgit From 9bcd9fc5b339af97d161a65f3da84ed1bd99da2f Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Mon, 22 Aug 2011 10:27:54 -0700 Subject: delete debug code. --- nova/db/sqlalchemy/api.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 37dac1444..f87d32b63 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1697,7 +1697,6 @@ def network_associate_by_id(context, network_id, project_id, force=False): if network_ref: network_ref['project_id'] = project_id session.add(network_ref) - LOG.debug("piyo: network_ref['project_id']=%s" % network_ref['project_id']) return network_ref -- cgit From f05da72e28fac1bfc7f208ce57d4462a53f290f2 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Mon, 22 Aug 2011 11:50:44 -0700 Subject: Fix pep8 --- bin/nova-manage | 5 ++++- nova/db/api.py | 3 ++- 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') -- cgit From 0d0c8dfbf29b47aa13e18dd8861bad6ccb10cf12 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Mon, 22 Aug 2011 16:46:29 -0700 Subject: Change parameters of 'nova-manage network modify'. Move common test codes into private method. --- bin/nova-manage | 40 +++++++++++++++++++++------------------- nova/tests/test_nova_manage.py | 21 +++++++++++---------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 736e55653..349a53a5c 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -798,32 +798,34 @@ class NetworkCommands(object): @args('--network', dest="fixed_range", metavar='', help='Network to modify') @args('--project', dest="project", metavar='', - help='Project name to associate/disasscociate') + help='Project name to associate') @args('--host', dest="host", metavar='', - help='Host to associate/disasscociate') - def modify(self, fixed_range, project=None, host=None): - """Associate/Disasscociate Network with Project and/or Host + help='Host to associate') + @args('--disassociate-project', action="store_true", dest='dis_project', + default=False, help='Disassociate Network from Project') + @args('--disassociate-host', action="store_true", dest='dis_host', + default=False, help='Disassociate Host from Project') + def modify(self, fixed_range, project=None, host=None, + dis_project=None, dis_host=None): + """Associate/Disassociate Network with Project and/or Host arguments: network project host - specify 'None' to disassociate it leave any field blank to ignore it """ admin_context = context.get_admin_context() network = db.network_get_by_cidr(admin_context, fixed_range) - 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) - else: + 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) + elif dis_project: db.network_disassociate(admin_context, network_id=network['id']) - if host != "None": - if host: - db.network_set_host(admin_context, - network['id'], - host) - else: + if host: + db.network_set_host(admin_context, + network['id'], + host) + elif dis_host: db.network_set_host(admin_context, network['id'], None) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index d6edc8ba9..91130de67 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -36,10 +36,10 @@ import netaddr import StringIO from nova import context from nova import db -from nova import flags -from nova import test from nova import exception +from nova import flags from nova import log as logging +from nova import test FLAGS = flags.FLAGS LOG = logging.getLogger('nova.tests.nova_manage') @@ -101,7 +101,7 @@ class NetworkCommandsTestCase(test.TestCase): def tearDown(self): super(NetworkCommandsTestCase, self).tearDown() - def test_create(self): + def _create_network(self): FLAGS.network_manager = 'nova.network.manager.VlanManager' self.commands.create( label='Test', @@ -114,7 +114,10 @@ class NetworkCommandsTestCase(test.TestCase): fixed_range_v6='fd00:2::/120', gateway_v6='fd00:2::22', bridge_interface='eth0') - net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + return db.network_get_by_cidr(self.context, '10.2.0.0/24') + + def test_create(self): + net = self._create_network() self.assertEqual(net['label'], 'Test') self.assertEqual(net['cidr'], '10.2.0.0/24') self.assertEqual(net['netmask'], '255.255.255.0') @@ -127,8 +130,7 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(net['bridge_interface'], 'eth0') def test_list(self): - self.test_create() - net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + net = self._create_network() output = StringIO.StringIO() sys.stdout = output self.commands.list() @@ -158,7 +160,7 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(result, answer) def test_delete(self): - self.test_create() + net = self._create_network() self.commands.delete(fixed_range='10.2.0.0/24') net_exist = True try: @@ -168,8 +170,7 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(net_exist, False) def test_modify(self): - self.test_create() - net = db.network_get_by_cidr(self.context, '10.2.0.0/24') + net = self._create_network() db.network_disassociate(self.context, net['id']) net = db.network_get_by_cidr(self.context, '10.2.0.0/24') self.assertEqual(net['project_id'], None) @@ -183,7 +184,7 @@ class NetworkCommandsTestCase(test.TestCase): 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') - self.commands.modify('10.2.0.0/24', project='None', host='None') + self.commands.modify('10.2.0.0/24', dis_project=True, dis_host=True) net = db.network_get_by_cidr(self.context, '10.2.0.0/24') self.assertEqual(net['project_id'], None) self.assertEqual(net['host'], None) -- cgit From 8cd7dcca1ccac0347289d633ebd10567d6cba4c7 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Tue, 23 Aug 2011 15:06:24 -0700 Subject: Stub out the DB in unit test. Fix 'nova-manage network modify' to use db.network_update() --- bin/nova-manage | 18 ++--- nova/db/api.py | 6 -- nova/db/sqlalchemy/api.py | 31 -------- nova/tests/test_nova_manage.py | 162 +++++++++++++++++++++++++++-------------- 4 files changed, 113 insertions(+), 104 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 349a53a5c..b0322eb11 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -813,22 +813,16 @@ class NetworkCommands(object): """ admin_context = context.get_admin_context() network = db.network_get_by_cidr(admin_context, fixed_range) + net = {} 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) + net['project_id'] = project elif dis_project: - db.network_disassociate(admin_context, network_id=network['id']) + net['project_id'] = None if host: - db.network_set_host(admin_context, - network['id'], - host) + net['host'] = host elif dis_host: - db.network_set_host(admin_context, - network['id'], - None) + net['host'] = None + db.network_update(admin_context, network['id'], net) class VmCommands(object): diff --git a/nova/db/api.py b/nova/db/api.py index 7268cde7f..2d854f24c 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -621,12 +621,6 @@ def network_associate(context, project_id, force=False): return IMPL.network_associate(context, project_id, force) -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) - - def network_count(context): """Return the number of networks.""" return IMPL.network_count(context) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index e5fffa784..04b5405f6 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1662,37 +1662,6 @@ def network_associate(context, project_id, force=False): return network_ref -@require_admin_context -def network_associate_by_id(context, network_id, project_id, force=False): - """Associate a project with a network specified by id. - - only associate if the network isn't already associated - with a project or if force is True - """ - session = get_session() - with session.begin(): - - def network_query(network_filter): - if force: - return session.query(models.Network).\ - filter_by(deleted=False).\ - filter_by(id=network_filter).\ - with_lockmode('update').\ - first() - else: - return session.query(models.Network).\ - filter_by(deleted=False).\ - filter_by(project_id=None).\ - filter_by(id=network_filter).\ - with_lockmode('update').\ - first() - network_ref = network_query(network_id) - if network_ref: - network_ref['project_id'] = project_id - session.add(network_ref) - return network_ref - - @require_admin_context def network_count(context): session = get_session() diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 6b34a90f9..03ee1140d 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -75,17 +75,59 @@ class FixedIpCommandsTestCase(test.TestCase): class NetworkCommandsTestCase(test.TestCase): def setUp(self): super(NetworkCommandsTestCase, self).setUp() + self.stubs = stubout.StubOutForTesting() self.commands = nova_manage.NetworkCommands() self.context = context.get_admin_context() - nets = db.network_get_all(self.context) - for net in nets: - db.network_delete_safe(self.context, net['id']) + self.net = {'id': 0, + 'label': 'fake', + 'injected': False, + 'cidr': '192.168.0.0/24', + 'cidr_v6': 'dead:beef::/64', + 'multi_host': False, + 'gateway_v6': 'dead:beef::1', + 'netmask_v6': '64', + 'netmask': '255.255.255.0', + 'bridge': 'fa0', + 'bridge_interface': 'fake_fa0', + 'gateway': '192.168.0.1', + 'broadcast': '192.168.0.255', + 'dns1': '8.8.8.8', + 'dns2': '8.8.4.4', + 'vlan': 200, + 'vpn_public_address': '10.0.0.2', + 'vpn_public_port': '2222', + 'vpn_private_address': '192.168.0.2', + 'dhcp_start': '192.168.0.3', + 'project_id': 'fake_project', + 'host': 'fake_host', + 'uuid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'} + def tearDown(self): super(NetworkCommandsTestCase, self).tearDown() + self.stubs.UnsetAll() + + def test_create(self): - def _create_network(self): + def fake_create_networks(obj, context, **kwargs): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(kwargs['label'], 'Test') + self.assertEqual(kwargs['cidr'], '10.2.0.0/24') + self.assertEqual(kwargs['multi_host'], False) + self.assertEqual(kwargs['num_networks'], 1) + self.assertEqual(kwargs['network_size'], 256) + self.assertEqual(kwargs['vlan_start'], 200) + self.assertEqual(kwargs['vpn_start'], 2000) + self.assertEqual(kwargs['cidr_v6'], 'fd00:2::/120') + self.assertEqual(kwargs['gateway_v6'], 'fd00:2::22') + self.assertEqual(kwargs['bridge'], 'br200') + self.assertEqual(kwargs['bridge_interface'], 'eth0') + self.assertEqual(kwargs['dns1'], '8.8.8.8') + self.assertEqual(kwargs['dns2'], '8.8.4.4') FLAGS.network_manager = 'nova.network.manager.VlanManager' + from nova.network import manager as net_manager + self.stubs.Set(net_manager.VlanManager, 'create_networks', + fake_create_networks) self.commands.create( label='Test', fixed_range_v4='10.2.0.0/24', @@ -96,24 +138,16 @@ class NetworkCommandsTestCase(test.TestCase): vpn_start=2000, fixed_range_v6='fd00:2::/120', gateway_v6='fd00:2::22', - bridge_interface='eth0') - return db.network_get_by_cidr(self.context, '10.2.0.0/24') - - def test_create(self): - net = self._create_network() - self.assertEqual(net['label'], 'Test') - self.assertEqual(net['cidr'], '10.2.0.0/24') - self.assertEqual(net['netmask'], '255.255.255.0') - self.assertEqual(net['multi_host'], False) - self.assertEqual(net['vlan'], 200) - self.assertEqual(net['bridge'], 'br200') - self.assertEqual(net['vpn_public_port'], 2000) - self.assertEqual(net['cidr_v6'], 'fd00:2::/120') - self.assertEqual(net['gateway_v6'], 'fd00:2::22') - self.assertEqual(net['bridge_interface'], 'eth0') + bridge='br200', + bridge_interface='eth0', + dns1='8.8.8.8', + dns2='8.8.4.4') def test_list(self): - net = self._create_network() + + def fake_network_get_all(context): + return [db_fakes.FakeModel(self.net)] + self.stubs.Set(db, 'network_get_all', fake_network_get_all) output = StringIO.StringIO() sys.stdout = output self.commands.list() @@ -129,45 +163,63 @@ class NetworkCommandsTestCase(test.TestCase): _('VlanID'), _('project'), _("uuid")) - body = _fmt % ( - net['id'], - '10.2.0.0/24', - 'fd00:2::/120', - '10.2.0.3', - 'None', - 'None', - '200', - 'None', - net['uuid'],) + body = _fmt % (self.net['id'], + self.net['cidr'], + self.net['cidr_v6'], + self.net['dhcp_start'], + self.net['dns1'], + self.net['dns2'], + self.net['vlan'], + self.net['project_id'], + self.net['uuid']) answer = '%s\n%s\n' % (head, body) self.assertEqual(result, answer) def test_delete(self): - net = self._create_network() - self.commands.delete(fixed_range='10.2.0.0/24') - net_exist = True - try: - net = db.network_get_by_cidr(self.context, '10.2.0.0/24') - except exception.NetworkNotFoundForCidr, e: - net_exist = False - self.assertEqual(net_exist, False) + net_dis = self.net + net_dis['project_id'] = None + net_dis['host'] = None + + def fake_network_get_by_cidr(context, cidr): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(cidr, net_dis['cidr']) + return db_fakes.FakeModel(net_dis) + self.stubs.Set(db, 'network_get_by_cidr', fake_network_get_by_cidr) + + def fake_network_delete_safe(context, network_id): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(network_id, net_dis['id']) + self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe) + self.commands.delete(fixed_range=net_dis['cidr']) def test_modify(self): - net = self._create_network() - db.network_disassociate(self.context, net['id']) - 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', + + def fake_network_get_by_cidr(context, cidr): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(cidr, self.net['cidr']) + return db_fakes.FakeModel(self.net) + self.stubs.Set(db, 'network_get_by_cidr', fake_network_get_by_cidr) + + def fake_network_update(context, network_id, values): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(network_id, self.net['id']) + self.assertEqual(values, {'project_id': 'test_project', + 'host': 'test_host'}) + self.stubs.Set(db, 'network_update', fake_network_update) + self.commands.modify(self.net['cidr'], 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') - self.commands.modify('10.2.0.0/24') - 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') - self.commands.modify('10.2.0.0/24', dis_project=True, dis_host=True) - net = db.network_get_by_cidr(self.context, '10.2.0.0/24') - self.assertEqual(net['project_id'], None) - self.assertEqual(net['host'], None) + + def fake_network_update(context, network_id, values): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(network_id, self.net['id']) + self.assertEqual(values, {}) + self.stubs.Set(db, 'network_update', fake_network_update) + self.commands.modify(self.net['cidr']) + + def fake_network_update(context, network_id, values): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(network_id, self.net['id']) + self.assertEqual(values, {'project_id': None, + 'host': None}) + self.stubs.Set(db, 'network_update', fake_network_update) + self.commands.modify(self.net['cidr'], dis_project=True, dis_host=True) -- cgit From 9fbdfa5061dc17e43fc8a5200415e0dffc55b911 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Tue, 23 Aug 2011 15:40:28 -0700 Subject: Fix pep8 --- nova/tests/test_nova_manage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 097d2dbf5..ca4f4c894 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -112,7 +112,6 @@ class NetworkCommandsTestCase(test.TestCase): 'host': 'fake_host', 'uuid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'} - def tearDown(self): super(NetworkCommandsTestCase, self).tearDown() self.stubs.UnsetAll() -- cgit From 390f35f8e7736bfbd650c9e3f522274e92adb005 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 24 Aug 2011 09:11:57 -0700 Subject: Fix flag override in unit test --- nova/tests/test_nova_manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index ca4f4c894..ce731222c 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -133,7 +133,7 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(kwargs['bridge_interface'], 'eth0') self.assertEqual(kwargs['dns1'], '8.8.8.8') self.assertEqual(kwargs['dns2'], '8.8.4.4') - FLAGS.network_manager = 'nova.network.manager.VlanManager' + self.flags(network_manager='nova.network.manager.VlanManager') from nova.network import manager as net_manager self.stubs.Set(net_manager.VlanManager, 'create_networks', fake_create_networks) -- cgit From 5ab769daf354033f5044c88d4f899d56effd998e Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 24 Aug 2011 10:47:11 -0700 Subject: split test_modify() into specific unit tests --- nova/tests/test_nova_manage.py | 88 ++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index ce731222c..c83d773f2 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -34,18 +34,15 @@ sys.dont_write_bytecode = False import mox import stubout -import netaddr import StringIO from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import test from nova.tests.db import fakes as db_fakes FLAGS = flags.FLAGS -LOG = logging.getLogger('nova.tests.nova_manage') class FixedIpCommandsTestCase(test.TestCase): @@ -112,6 +109,18 @@ class NetworkCommandsTestCase(test.TestCase): 'host': 'fake_host', 'uuid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'} + def fake_network_get_by_cidr(context, cidr): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(cidr, self.fake_net['cidr']) + return db_fakes.FakeModel(self.fake_net) + + def fake_network_update(context, network_id, values): + self.assertTrue(context.to_dict()['is_admin']) + self.assertEqual(network_id, self.fake_net['id']) + self.assertEqual(values, self.fake_update_value) + self.fake_network_get_by_cidr = fake_network_get_by_cidr + self.fake_network_update = fake_network_update + def tearDown(self): super(NetworkCommandsTestCase, self).tearDown() self.stubs.UnsetAll() @@ -185,50 +194,37 @@ class NetworkCommandsTestCase(test.TestCase): self.assertEqual(result, answer) def test_delete(self): - net_dis = self.net - net_dis['project_id'] = None - net_dis['host'] = None - - def fake_network_get_by_cidr(context, cidr): - self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(cidr, net_dis['cidr']) - return db_fakes.FakeModel(net_dis) - self.stubs.Set(db, 'network_get_by_cidr', fake_network_get_by_cidr) + self.fake_net = self.net + self.fake_net['project_id'] = None + self.fake_net['host'] = None + self.stubs.Set(db, 'network_get_by_cidr', + self.fake_network_get_by_cidr) def fake_network_delete_safe(context, network_id): self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(network_id, net_dis['id']) + self.assertEqual(network_id, self.fake_net['id']) self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe) - self.commands.delete(fixed_range=net_dis['cidr']) - - def test_modify(self): - - def fake_network_get_by_cidr(context, cidr): - self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(cidr, self.net['cidr']) - return db_fakes.FakeModel(self.net) - self.stubs.Set(db, 'network_get_by_cidr', fake_network_get_by_cidr) - - def fake_network_update(context, network_id, values): - self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(network_id, self.net['id']) - self.assertEqual(values, {'project_id': 'test_project', - 'host': 'test_host'}) - self.stubs.Set(db, 'network_update', fake_network_update) - self.commands.modify(self.net['cidr'], project='test_project', - host='test_host') - - def fake_network_update(context, network_id, values): - self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(network_id, self.net['id']) - self.assertEqual(values, {}) - self.stubs.Set(db, 'network_update', fake_network_update) - self.commands.modify(self.net['cidr']) - - def fake_network_update(context, network_id, values): - self.assertTrue(context.to_dict()['is_admin']) - self.assertEqual(network_id, self.net['id']) - self.assertEqual(values, {'project_id': None, - 'host': None}) - self.stubs.Set(db, 'network_update', fake_network_update) - self.commands.modify(self.net['cidr'], dis_project=True, dis_host=True) + self.commands.delete(fixed_range=self.fake_net['cidr']) + + def _test_modify_base(self, update_value, project, host, dis_project=None, + dis_host=None): + self.fake_net = self.net + self.fake_update_value = update_value + self.stubs.Set(db, 'network_get_by_cidr', + self.fake_network_get_by_cidr) + self.stubs.Set(db, 'network_update', self.fake_network_update) + self.commands.modify(self.fake_net['cidr'], project=project, host=host, + dis_project=dis_project, dis_host=dis_host) + + def test_modify_associate(self): + self._test_modify_base(update_value={'project_id': 'test_project', + 'host': 'test_host'}, + project='test_project', host='test_host') + + def test_modify_unchanged(self): + self._test_modify_base(update_value={}, project=None, host=None) + + def test_modify_disassociate(self): + self._test_modify_base(update_value={'project_id': None, 'host': None}, + project=None, host=None, dis_project=True, + dis_host=True) -- cgit From e51c73a2d953103d4245cb8d456cad590be73ff5 Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 24 Aug 2011 11:10:05 -0700 Subject: Removed unused imports --- nova/tests/test_nova_manage.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index c83d773f2..70efbf651 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -15,7 +15,6 @@ # License for the specific language governing permissions and limitations # under the License. -import gettext import os import sys @@ -25,8 +24,6 @@ TOPDIR = os.path.normpath(os.path.join( os.pardir)) NOVA_MANAGE_PATH = os.path.join(TOPDIR, 'bin', 'nova-manage') -gettext.install('nova', unicode=1) - sys.dont_write_bytecode = True import imp nova_manage = imp.load_source('nova_manage.py', NOVA_MANAGE_PATH) @@ -38,12 +35,9 @@ import StringIO from nova import context from nova import db from nova import exception -from nova import flags from nova import test from nova.tests.db import fakes as db_fakes -FLAGS = flags.FLAGS - class FixedIpCommandsTestCase(test.TestCase): def setUp(self): -- cgit From 156f2fb68981bde1a24233e2648d11890a98e34a Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 24 Aug 2011 13:10:56 -0700 Subject: Add names to placeholders of formatting --- nova/tests/test_nova_manage.py | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 70efbf651..520bfbea1 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -165,25 +165,27 @@ class NetworkCommandsTestCase(test.TestCase): self.commands.list() sys.stdout = sys.__stdout__ result = output.getvalue() - _fmt = "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" - head = _fmt % (_('id'), - _('IPv4'), - _('IPv6'), - _('start address'), - _('DNS1'), - _('DNS2'), - _('VlanID'), - _('project'), - _("uuid")) - body = _fmt % (self.net['id'], - self.net['cidr'], - self.net['cidr_v6'], - self.net['dhcp_start'], - self.net['dns1'], - self.net['dns2'], - self.net['vlan'], - self.net['project_id'], - self.net['uuid']) + _fmt = "%(id)-5s\t%(cidr)-18s\t%(cidr_v6)-15s\t%(dhcp_start)-15s\t" +\ + "%(dns1)-15s\t%(dns2)-15s\t%(vlan)-15s\t%(project_id)-15s\t" +\ + "%(uuid)-15s" + head = _fmt % {'id': _('id'), + 'cidr': _('IPv4'), + 'cidr_v6': _('IPv6'), + 'dhcp_start': _('start address'), + 'dns1': _('DNS1'), + 'dns2': _('DNS2'), + 'vlan': _('VlanID'), + 'project_id': _('project'), + 'uuid': _("uuid")} + body = _fmt % {'id': self.net['id'], + 'cidr': self.net['cidr'], + 'cidr_v6': self.net['cidr_v6'], + 'dhcp_start': self.net['dhcp_start'], + 'dns1': self.net['dns1'], + 'dns2': self.net['dns2'], + 'vlan': self.net['vlan'], + 'project_id': self.net['project_id'], + 'uuid': self.net['uuid']} answer = '%s\n%s\n' % (head, body) self.assertEqual(result, answer) -- cgit From 88a2dfb582eec7b4c7547c2aa51f3b661a3b9c5d Mon Sep 17 00:00:00 2001 From: Hisaharu Ishii Date: Wed, 24 Aug 2011 14:01:33 -0700 Subject: Add comments for associate/dissociate logic --- bin/nova-manage | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/nova-manage b/bin/nova-manage index eae9e905c..890cde0b8 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -817,6 +817,10 @@ class NetworkCommands(object): admin_context = context.get_admin_context() network = db.network_get_by_cidr(admin_context, fixed_range) net = {} + #User can choose the following actions each for project and host. + #1) Associate (set not None value given by project/host parameter) + #2) Disassociate (set None by disassociate parameter) + #3) Keep unchanged (project/host key is not added to 'net') if project: net['project_id'] = project elif dis_project: -- cgit