From e251535eaa7c6a564eddb9218de177c9bea656bb Mon Sep 17 00:00:00 2001 From: gengjh Date: Fri, 30 May 2014 15:32:33 +0800 Subject: [PATCH] Fix the wrong dest of 'vlan' option and add new 'vlan_start' option * Allow to specify vlan tag when create nova network, the dest of vlan option should be 'vlan' instead of 'vlan_start' * Provide new option 'vlan_start' when create nova network * test case is updated. DocImpact Closes-Bug: #1288609 Change-Id: I8dd858e4cf17d8f689613554d1fbc3e56f220886 --- nova/cmd/manage.py | 8 +++++--- nova/tests/test_nova_manage.py | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index b41684541ae0..c60fa207d7e9 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -508,7 +508,9 @@ class NetworkCommands(object): help='Number of networks to create') @args('--network_size', metavar='', help='Number of IPs per network') - @args('--vlan', dest='vlan_start', metavar='', help='vlan id') + @args('--vlan', metavar='', help='vlan id') + @args('--vlan_start', dest='vlan_start', metavar='', + help='vlan start id') @args('--vpn', dest='vpn_start', help='vpn start') @args('--fixed_range_v6', dest='cidr_v6', help='IPv6 subnet (ex: fe80::/64') @@ -529,8 +531,8 @@ class NetworkCommands(object): help='Project id') @args('--priority', metavar="", help='Network interface priority') def create(self, label=None, cidr=None, num_networks=None, - network_size=None, multi_host=None, vlan_start=None, - vpn_start=None, cidr_v6=None, gateway=None, + network_size=None, multi_host=None, vlan=None, + vlan_start=None, vpn_start=None, cidr_v6=None, gateway=None, gateway_v6=None, bridge=None, bridge_interface=None, dns1=None, dns2=None, project_id=None, priority=None, uuid=None, fixed_cidr=None): diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py index 30e2ce6748bb..399aacbfe2bd 100644 --- a/nova/tests/test_nova_manage.py +++ b/nova/tests/test_nova_manage.py @@ -131,6 +131,7 @@ class NetworkCommandsTestCase(test.TestCase): 'dns1': '8.8.8.8', 'dns2': '8.8.4.4', 'vlan': 200, + 'vlan_start': 201, 'vpn_public_address': '10.0.0.2', 'vpn_public_port': '2222', 'vpn_private_address': '192.168.0.2', @@ -168,7 +169,8 @@ class NetworkCommandsTestCase(test.TestCase): 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['vlan'], 200) + self.assertEqual(kwargs['vlan_start'], 201) self.assertEqual(kwargs['vpn_start'], 2000) self.assertEqual(kwargs['cidr_v6'], 'fd00:2::/120') self.assertEqual(kwargs['gateway'], '10.2.0.1') @@ -187,7 +189,8 @@ class NetworkCommandsTestCase(test.TestCase): num_networks=1, network_size=256, multi_host='F', - vlan_start=200, + vlan=200, + vlan_start=201, vpn_start=2000, cidr_v6='fd00:2::/120', gateway='10.2.0.1',