diff --git a/quantumclient/quantum/v2_0/lb/healthmonitor.py b/quantumclient/quantum/v2_0/lb/healthmonitor.py index cc4695d6f..a21d8033a 100644 --- a/quantumclient/quantum/v2_0/lb/healthmonitor.py +++ b/quantumclient/quantum/v2_0/lb/healthmonitor.py @@ -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', @@ -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, diff --git a/quantumclient/quantum/v2_0/lb/member.py b/quantumclient/quantum/v2_0/lb/member.py index 5a2c71b63..af90192d9 100644 --- a/quantumclient/quantum/v2_0/lb/member.py +++ b/quantumclient/quantum/v2_0/lb/member.py @@ -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', @@ -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( diff --git a/quantumclient/quantum/v2_0/lb/pool.py b/quantumclient/quantum/v2_0/lb/pool.py index 049ac6749..50667199f 100644 --- a/quantumclient/quantum/v2_0/lb/pool.py +++ b/quantumclient/quantum/v2_0/lb/pool.py @@ -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', @@ -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], diff --git a/quantumclient/quantum/v2_0/lb/vip.py b/quantumclient/quantum/v2_0/lb/vip.py index c41fafa57..721c2801d 100644 --- a/quantumclient/quantum/v2_0/lb/vip.py +++ b/quantumclient/quantum/v2_0/lb/vip.py @@ -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', @@ -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], diff --git a/quantumclient/quantum/v2_0/network.py b/quantumclient/quantum/v2_0/network.py index 7a9a8ce4b..6dac21a3f 100644 --- a/quantumclient/quantum/v2_0/network.py +++ b/quantumclient/quantum/v2_0/network.py @@ -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', @@ -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 diff --git a/quantumclient/quantum/v2_0/port.py b/quantumclient/quantum/v2_0/port.py index e9465113e..38d625f9d 100644 --- a/quantumclient/quantum/v2_0/port.py +++ b/quantumclient/quantum/v2_0/port.py @@ -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', @@ -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}) @@ -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): diff --git a/quantumclient/quantum/v2_0/router.py b/quantumclient/quantum/v2_0/router.py index 86eaa7229..3f8ed6ccc 100644 --- a/quantumclient/quantum/v2_0/router.py +++ b/quantumclient/quantum/v2_0/router.py @@ -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', @@ -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 diff --git a/quantumclient/quantum/v2_0/subnet.py b/quantumclient/quantum/v2_0/subnet.py index 4442b721f..a711f057e 100644 --- a/quantumclient/quantum/v2_0/subnet.py +++ b/quantumclient/quantum/v2_0/subnet.py @@ -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',