openstack/deb-python-neutronclient
Code Issues Proposed changes

Merge "Don't allow update of ipv6-ra-mode and ipv6-address-mode"

Browse Source
This commit is contained in:
Jenkins
2014-11-18 05:37:57 +00:00
committed by Gerrit Code Review
parent 3bb51e3a1a 81fe0c776c
commit 4e8883414f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
neutronclient/neutron/v2_0/subnet.py
View File

@@ -85,17 +85,9 @@ def add_updatable_arguments(parser):
'--enable-dhcp',
action='store_true',
help=_('Enable DHCP for this subnet.'))
parser.add_argument(
'--ipv6-ra-mode',
choices=['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac'],
help=_('IPv6 RA (Router Advertisement) mode.'))
parser.add_argument(
'--ipv6-address-mode',
choices=['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac'],
help=_('IPv6 address mode.'))
def updatable_args2body(parsed_args, body):
def updatable_args2body(parsed_args, body, for_create=True):
if parsed_args.gateway and parsed_args.no_gateway:
raise exceptions.CommandError(_("--gateway option and "
"--no-gateway option can "
@@ -120,12 +112,12 @@ def updatable_args2body(parsed_args, body):
body['subnet']['host_routes'] = parsed_args.host_routes
if parsed_args.dns_nameservers:
body['subnet']['dns_nameservers'] = parsed_args.dns_nameservers
if parsed_args.ipv6_ra_mode:
if for_create and parsed_args.ipv6_ra_mode:
if parsed_args.ip_version == 4:
raise exceptions.CommandError(_("--ipv6-ra-mode is invalid "
"when --ip-version is 4"))
body['subnet']['ipv6_ra_mode'] = parsed_args.ipv6_ra_mode
if parsed_args.ipv6_address_mode:
if for_create and parsed_args.ipv6_address_mode:
if parsed_args.ip_version == 4:
raise exceptions.CommandError(_("--ipv6-address-mode is "
"invalid when --ip-version "
@@ -174,6 +166,14 @@ class CreateSubnet(neutronV20.CreateCommand):
parser.add_argument(
'cidr', metavar='CIDR',
help=_('CIDR of subnet to create.'))
parser.add_argument(
'--ipv6-ra-mode',
choices=['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac'],
help=_('IPv6 RA (Router Advertisement) mode.'))
parser.add_argument(
'--ipv6-address-mode',
choices=['dhcpv6-stateful', 'dhcpv6-stateless', 'slaac'],
help=_('IPv6 address mode.'))
def args2body(self, parsed_args):
if parsed_args.ip_version == 4 and parsed_args.cidr.endswith('/32'):
@@ -210,5 +210,5 @@ class UpdateSubnet(neutronV20.UpdateCommand):
def args2body(self, parsed_args):
body = {'subnet': {}}
updatable_args2body(parsed_args, body)
updatable_args2body(parsed_args, body, for_create=False)
return body