Skip to content

Commit

Permalink
Change variable name of admin_state_down to admin_state
Browse files Browse the repository at this point in the history
It is confusing that admin_state_down=False means admin-state is DOWN.
It is easy to understand if the variable name matches its value.

Also removes 'default=xxx' from options with store_true/false action
since store_true/false sets the default value implicitly.

Fixes bug 1161853

Change-Id: I3146dd8974990c94e5f9b3b5bf6a8b28a245d64e
  • Loading branch information
amotoki committed Apr 8, 2013
1 parent 00935b8 commit ad7caef
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 21 deletions.
4 changes: 2 additions & 2 deletions quantumclient/quantum/v2_0/lb/healthmonitor.py
Expand Up @@ -49,7 +49,7 @@ class CreateHealthMonitor(quantumv20.CreateCommand):
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='set admin state up to false')
parser.add_argument(
'--expected-codes',
Expand Down Expand Up @@ -92,7 +92,7 @@ def add_known_arguments(self, parser):
def args2body(self, parsed_args):
body = {
self.resource: {
'admin_state_up': parsed_args.admin_state_down,
'admin_state_up': parsed_args.admin_state,
'delay': parsed_args.delay,
'max_retries': parsed_args.max_retries,
'timeout': parsed_args.timeout,
Expand Down
4 changes: 2 additions & 2 deletions quantumclient/quantum/v2_0/lb/member.py
Expand Up @@ -54,7 +54,7 @@ def add_known_arguments(self, parser):
help='Pool id or name this vip belongs to')
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='set admin state up to false')
parser.add_argument(
'--weight',
Expand All @@ -75,7 +75,7 @@ def args2body(self, parsed_args):
body = {
self.resource: {
'pool_id': _pool_id,
'admin_state_up': parsed_args.admin_state_down,
'admin_state_up': parsed_args.admin_state,
},
}
quantumv20.update_dict(
Expand Down
4 changes: 2 additions & 2 deletions quantumclient/quantum/v2_0/lb/pool.py
Expand Up @@ -50,7 +50,7 @@ class CreatePool(quantumv20.CreateCommand):
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='set admin state up to false')
parser.add_argument(
'--description',
Expand All @@ -76,7 +76,7 @@ def add_known_arguments(self, parser):
def args2body(self, parsed_args):
body = {
self.resource: {
'admin_state_up': parsed_args.admin_state_down,
'admin_state_up': parsed_args.admin_state,
},
}
quantumv20.update_dict(parsed_args, body[self.resource],
Expand Down
4 changes: 2 additions & 2 deletions quantumclient/quantum/v2_0/lb/vip.py
Expand Up @@ -56,7 +56,7 @@ def add_known_arguments(self, parser):
help='IP address of the vip')
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='set admin state up to false')
parser.add_argument(
'--connection-limit',
Expand Down Expand Up @@ -89,7 +89,7 @@ def args2body(self, parsed_args):
body = {
self.resource: {
'pool_id': _pool_id,
'admin_state_up': parsed_args.admin_state_down,
'admin_state_up': parsed_args.admin_state,
},
}
quantumv20.update_dict(parsed_args, body[self.resource],
Expand Down
9 changes: 4 additions & 5 deletions quantumclient/quantum/v2_0/network.py
Expand Up @@ -94,16 +94,15 @@ class CreateNetwork(CreateCommand):
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='Set Admin State Up to false')
parser.add_argument(
'--admin_state_down',
action='store_false',
dest='admin_state', action='store_false',
help=argparse.SUPPRESS)
parser.add_argument(
'--shared',
action='store_true',
default=argparse.SUPPRESS,
help='Set the network as shared')
parser.add_argument(
'name', metavar='NAME',
Expand All @@ -112,10 +111,10 @@ def add_known_arguments(self, parser):
def args2body(self, parsed_args):
body = {'network': {
'name': parsed_args.name,
'admin_state_up': parsed_args.admin_state_down}, }
'admin_state_up': parsed_args.admin_state}, }
if parsed_args.tenant_id:
body['network'].update({'tenant_id': parsed_args.tenant_id})
if hasattr(parsed_args, 'shared'):
if parsed_args.shared:
body['network'].update({'shared': parsed_args.shared})
return body

Expand Down
8 changes: 4 additions & 4 deletions quantumclient/quantum/v2_0/port.py
Expand Up @@ -90,11 +90,11 @@ def add_known_arguments(self, parser):
help='name of this port')
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='set admin state up to false')
parser.add_argument(
'--admin_state_down',
action='store_false',
dest='admin_state', action='store_false',
help=argparse.SUPPRESS)
parser.add_argument(
'--mac-address',
Expand Down Expand Up @@ -130,7 +130,7 @@ def add_known_arguments(self, parser):
def args2body(self, parsed_args):
_network_id = quantumv20.find_resourceid_by_name_or_id(
self.get_client(), 'network', parsed_args.network_id)
body = {'port': {'admin_state_up': parsed_args.admin_state_down,
body = {'port': {'admin_state_up': parsed_args.admin_state,
'network_id': _network_id, }, }
if parsed_args.mac_address:
body['port'].update({'mac_address': parsed_args.mac_address})
Expand Down Expand Up @@ -179,7 +179,7 @@ class UpdatePort(UpdateCommand):
def add_known_arguments(self, parser):
parser.add_argument(
'--no-security-groups',
default=False, action='store_true',
action='store_true',
help='remove security groups from port')

def args2body(self, parsed_args):
Expand Down
6 changes: 3 additions & 3 deletions quantumclient/quantum/v2_0/router.py
Expand Up @@ -63,11 +63,11 @@ class CreateRouter(CreateCommand):
def add_known_arguments(self, parser):
parser.add_argument(
'--admin-state-down',
default=True, action='store_false',
dest='admin_state', action='store_false',
help='Set Admin State Up to false')
parser.add_argument(
'--admin_state_down',
action='store_false',
dest='admin_state', action='store_false',
help=argparse.SUPPRESS)
parser.add_argument(
'name', metavar='NAME',
Expand All @@ -76,7 +76,7 @@ def add_known_arguments(self, parser):
def args2body(self, parsed_args):
body = {'router': {
'name': parsed_args.name,
'admin_state_up': parsed_args.admin_state_down, }, }
'admin_state_up': parsed_args.admin_state, }, }
if parsed_args.tenant_id:
body['router'].update({'tenant_id': parsed_args.tenant_id})
return body
Expand Down
2 changes: 1 addition & 1 deletion quantumclient/quantum/v2_0/subnet.py
Expand Up @@ -97,7 +97,7 @@ def add_known_arguments(self, parser):
help='gateway ip of this subnet')
parser.add_argument(
'--no-gateway',
default=False, action='store_true',
action='store_true',
help='No distribution of gateway')
parser.add_argument(
'--allocation-pool', metavar='start=IP_ADDR,end=IP_ADDR',
Expand Down

0 comments on commit ad7caef

Please sign in to comment.