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. Change-Id: Idfaf58d4eee4d9bbf6bba5e0b6c9dbf82236694d Closes-bug: #1329599
This commit is contained in:
parent
7d1cd188e0
commit
94beacd7e9
|
@ -56,6 +56,7 @@ class NetworksTest(utils.TestCase):
|
|||
'multi_host': 'T',
|
||||
'priority': '1',
|
||||
'project_id': '1',
|
||||
'vlan': 5,
|
||||
'vlan_start': 1,
|
||||
'vpn_start': 1
|
||||
}
|
||||
|
|
|
@ -1743,7 +1743,14 @@ class ShellTest(utils.TestCase):
|
|||
self.run_command('network-create --fixed-range-v4 192.168.0.0/24'
|
||||
' --vlan=200 new_network')
|
||||
body = {'network': {'cidr': '192.168.0.0/24', 'label': 'new_network',
|
||||
'vlan_start': '200'}}
|
||||
'vlan': '200'}}
|
||||
self.assert_called('POST', '/os-networks', body)
|
||||
|
||||
def test_network_create_vlan_start(self):
|
||||
self.run_command('network-create --fixed-range-v4 192.168.0.0/24'
|
||||
' --vlan-start=100 new_network')
|
||||
body = {'network': {'cidr': '192.168.0.0/24', 'label': 'new_network',
|
||||
'vlan_start': '100'}}
|
||||
self.assert_called('POST', '/os-networks', body)
|
||||
|
||||
def test_add_fixed_ip(self):
|
||||
|
|
|
@ -86,6 +86,7 @@ class NetworkManager(base.ManagerWithFind):
|
|||
:param multi_host: str
|
||||
:param priority: str
|
||||
:param project_id: str
|
||||
:param vlan: int
|
||||
:param vlan_start: int
|
||||
:param vpn_start: int
|
||||
|
||||
|
|
|
@ -835,7 +835,7 @@ def _filter_network_create_options(args):
|
|||
valid_args = ['label', 'cidr', 'vlan_start', 'vpn_start', 'cidr_v6',
|
||||
'gateway', 'gateway_v6', 'bridge', 'bridge_interface',
|
||||
'multi_host', 'dns1', 'dns2', 'uuid', 'fixed_cidr',
|
||||
'project_id', 'priority']
|
||||
'project_id', 'priority', 'vlan']
|
||||
kwargs = {}
|
||||
for k, v in args.__dict__.items():
|
||||
if k in valid_args and v is not None:
|
||||
|
@ -855,9 +855,14 @@ def _filter_network_create_options(args):
|
|||
dest="cidr_v6",
|
||||
help=_('IPv6 subnet (ex: fe80::/64'))
|
||||
@utils.arg('--vlan',
|
||||
dest='vlan_start',
|
||||
dest='vlan',
|
||||
metavar='<vlan id>',
|
||||
help=_("vlan id"))
|
||||
help=_("vlan id to be assigned to project"))
|
||||
@utils.arg('--vlan-start',
|
||||
dest='vlan_start',
|
||||
metavar='<vlan start>',
|
||||
help=_('First vlan ID to be assigned to project. Subsequent vlan'
|
||||
' IDs will be assigned incrementally'))
|
||||
@utils.arg('--vpn',
|
||||
dest='vpn_start',
|
||||
metavar='<vpn start>',
|
||||
|
|
Loading…
Reference in New Issue