openstack/python-neutronclient
Code Issues Proposed changes

Merge "Fix E128 hacking check"

Browse Source
This commit is contained in:
Jenkins 2014-10-17 09:05:15 +00:00 committed by Gerrit Code Review
commit eae3211e8d
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutronclient/neutron/v2_0/networkprofile.py
View File

@ -54,9 +54,10 @@ class CreateNetworkProfile(neutronV20.CreateCommand):
help='Segment type.')
# TODO(Abhishek): Check on sub-type choices depending on segment_type
parser.add_argument('--sub_type',
help=_('Sub-type for the segment. Available sub-'
'types for overlay segments: native, enhanced; '
'For trunk segments: vlan, overlay.'))
help=_('Sub-type for the segment. Available '
'sub-types for overlay segments: '
'native, enhanced; For trunk segments: '
'vlan, overlay.'))
parser.add_argument('--segment_range',
help=_('Range for the segment.'))
parser.add_argument('--physical_network',

2
neutronclient/neutron/v2_0/nsx/networkgateway.py
View File

@ -169,7 +169,7 @@ class CreateNetworkGateway(neutronV20.CreateCommand):
'--device', metavar='id=ID,interface_name=NAME_OR_ID',
action='append',
help=_('Device info for this gateway. You can repeat this '
'option for multiple devices for HA gateways.'))
'option for multiple devices for HA gateways.'))
def args2body(self, parsed_args):
body = {self.resource: {

7
neutronclient/neutron/v2_0/router.py
View File

@ -117,9 +117,10 @@ class RouterInterfaceCommand(neutronV20.NeutronCommand):
parser.add_argument(
'interface', metavar='INTERFACE',
help=_('The format is "SUBNET|subnet=SUBNET|port=PORT". '
'Either a subnet or port must be specified. '
'Both ID and name are accepted as SUBNET or PORT. '
'Note that "subnet=" can be omitted when specifying a subnet.'))
'Either a subnet or port must be specified. '
'Both ID and name are accepted as SUBNET or PORT. '
'Note that "subnet=" can be omitted when specifying a '
'subnet.'))
return parser
def run(self, parsed_args):

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

@ -62,7 +62,7 @@ def add_updatable_arguments(parser):
'--allocation-pool', metavar='start=IP_ADDR,end=IP_ADDR',
action='append', dest='allocation_pools', type=utils.str2dict,
help=_('Allocation pool IP addresses for this subnet '
'(This option can be repeated).'))
'(This option can be repeated).'))
parser.add_argument(
'--allocation_pool',
action='append', dest='allocation_pools', type=utils.str2dict,
@ -75,7 +75,7 @@ def add_updatable_arguments(parser):
'--dns-nameserver', metavar='DNS_NAMESERVER',
action='append', dest='dns_nameservers',
help=_('DNS name server for this subnet '
'(This option can be repeated).'))
'(This option can be repeated).'))
parser.add_argument(
'--disable-dhcp',
action='store_true',
@ -97,8 +97,8 @@ def add_updatable_arguments(parser):
def updatable_args2body(parsed_args, body):
if parsed_args.gateway and parsed_args.no_gateway:
raise exceptions.CommandError(_("--gateway option and "
"--no-gateway option can "
"not be used same time"))
"--no-gateway option can "
"not be used same time"))
if parsed_args.disable_dhcp and parsed_args.enable_dhcp:
raise exceptions.CommandError(_("--enable-dhcp and --disable-dhcp can "
"not be used in the same command."))

3
tox.ini
View File

@ -37,11 +37,10 @@ downloadcache = ~/cache/pip
#
# TODO Fix the following rules from hacking 0.9.x
# E113 unexpected indentation
# E128 continuation line under-indented for visual indent
# E129 visually indented line with same indent as next logical line
# E265 block comment should start with '# '
# H405 multi line docstring summary not separated with an empty line
# H307 like imports should be grouped together
ignore = E113,E125,E128,E129,E265,H302,H307,H405
ignore = E113,E125,E129,E265,H302,H307,H405
show-source = true
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools