Skip to content

Commit f485d71

Browse files
author
Dean Troyer
committed
Revise command boolean flags
* use --enable|--disable form for boolean 'enabled' value * clean up logging strings Change-Id: Ib4016bbef1763c27ec5a9edf36b926dc0d0b265c
1 parent fa4a4a3 commit f485d71

3 files changed

Lines changed: 57 additions & 32 deletions

File tree

‎openstackclient/compute/v2/server.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def get_parser(self, prog_name):
9999
return parser
100100

101101
def get_data(self, parsed_args):
102-
self.log.debug('v2.List_Server.run(%s)' % parsed_args)
102+
self.log.debug('get_data(%s)' % parsed_args)
103103
nova_client = self.app.client_manager.compute
104104
search_opts = {
105105
'all_tenants': parsed_args.all_tenants,
@@ -140,7 +140,7 @@ def get_parser(self, prog_name):
140140
return parser
141141

142142
def get_data(self, parsed_args):
143-
self.log.debug('v2.Show_Server.run(%s)' % parsed_args)
143+
self.log.debug('get_data(%s)' % parsed_args)
144144
nova_client = self.app.client_manager.compute
145145
server = utils.find_resource(nova_client.servers, parsed_args.server)
146146

‎openstackclient/identity/v2_0/tenant.py‎

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,31 @@ def get_parser(self, prog_name):
3939
parser.add_argument(
4040
'tenant_name',
4141
metavar='<tenant-name>',
42-
help='New tenant name')
42+
help='New tenant name',
43+
)
4344
parser.add_argument(
4445
'--description',
4546
metavar='<tenant-description>',
46-
help='New tenant description')
47-
parser.add_argument(
48-
'--enabled',
49-
metavar='<true|false>',
47+
help='New tenant description',
48+
)
49+
enable_group = parser.add_mutually_exclusive_group()
50+
enable_group.add_argument(
51+
'--enable',
52+
dest='enabled',
53+
action='store_true',
5054
default=True,
51-
help='Initial tenant enabled status (default true)')
55+
help='Enable tenant',
56+
)
57+
enable_group.add_argument(
58+
'--disable',
59+
dest='enabled',
60+
action='store_false',
61+
help='Disable tenant',
62+
)
5263
return parser
5364

5465
def get_data(self, parsed_args):
55-
self.log.debug('v2_0.Create_Tenant.get_data(%s)' % parsed_args)
66+
self.log.debug('get_data(%s)' % parsed_args)
5667
identity_client = self.app.client_manager.identity
5768
tenant = identity_client.tenants.create(
5869
parsed_args.tenant_name,
@@ -79,11 +90,12 @@ def get_parser(self, prog_name):
7990
parser.add_argument(
8091
'tenant',
8192
metavar='<tenant>',
82-
help='Name or ID of tenant to delete')
93+
help='Name or ID of tenant to delete',
94+
)
8395
return parser
8496

8597
def run(self, parsed_args):
86-
self.log.debug('v2_0.Delete_Tenant.run(%s)' % parsed_args)
98+
self.log.debug('run(%s)' % parsed_args)
8799
identity_client = self.app.client_manager.identity
88100
tenant = utils.find_resource(
89101
identity_client.tenants, parsed_args.tenant)
@@ -103,11 +115,12 @@ def get_parser(self, prog_name):
103115
'--long',
104116
action='store_true',
105117
default=False,
106-
help='Additional fields are listed in output')
118+
help='Additional fields are listed in output',
119+
)
107120
return parser
108121

109122
def get_data(self, parsed_args):
110-
self.log.debug('v2_0.List_Tenant.get_data(%s)' % parsed_args)
123+
self.log.debug('get_data(%s)' % parsed_args)
111124
if parsed_args.long:
112125
columns = ('ID', 'Name', 'Description', 'Enabled')
113126
else:
@@ -132,39 +145,50 @@ def get_parser(self, prog_name):
132145
parser.add_argument(
133146
'tenant',
134147
metavar='<tenant>',
135-
help='Name or ID of tenant to change')
148+
help='Name or ID of tenant to change',
149+
)
136150
parser.add_argument(
137151
'--name',
138152
metavar='<new-tenant-name>',
139-
help='New tenant name')
153+
help='New tenant name',
154+
)
140155
parser.add_argument(
141156
'--description',
142157
metavar='<tenant-description>',
143-
help='New tenant description')
144-
parser.add_argument(
145-
'--enabled',
146-
metavar='<true|false>',
147-
help='New tenant enabled status')
158+
help='New tenant description',
159+
)
160+
enable_group = parser.add_mutually_exclusive_group()
161+
enable_group.add_argument(
162+
'--enable',
163+
dest='enabled',
164+
action='store_true',
165+
default=True,
166+
help='Enable tenant (default)',
167+
)
168+
enable_group.add_argument(
169+
'--disable',
170+
dest='enabled',
171+
action='store_false',
172+
help='Disable tenant',
173+
)
148174
return parser
149175

150176
def run(self, parsed_args):
151-
self.log.debug('v2_0.Set_Tenant.run(%s)' % parsed_args)
177+
self.log.debug('run(%s)' % parsed_args)
152178
identity_client = self.app.client_manager.identity
153179
tenant = utils.find_resource(
154180
identity_client.tenants, parsed_args.tenant)
155181
kwargs = {}
156182
if parsed_args.name:
157-
kwargs.update({'name': parsed_args.name})
183+
kwargs['name'] = parsed_args.name
158184
if parsed_args.description:
159-
kwargs.update({'description': parsed_args.description})
160-
if parsed_args.enabled:
161-
kwargs.update(
162-
{'enabled': utils.string_to_bool(parsed_args.enabled)},
163-
)
185+
kwargs['description'] = parsed_args.description
186+
if 'enabled' in parsed_args:
187+
kwargs['enabled'] = parsed_args.enabled
164188

165189
if kwargs == {}:
166-
print "Tenant not updated, no arguments present."
167-
return
190+
stdout.write("Tenant not updated, no arguments present")
191+
return 0
168192
tenant.update(**kwargs)
169193
return
170194

@@ -180,11 +204,12 @@ def get_parser(self, prog_name):
180204
parser.add_argument(
181205
'tenant',
182206
metavar='<tenant>',
183-
help='Name or ID of tenant to display')
207+
help='Name or ID of tenant to display',
208+
)
184209
return parser
185210

186211
def get_data(self, parsed_args):
187-
self.log.debug('v2_0.Show_Tenant.get_data(%s)' % parsed_args)
212+
self.log.debug('get_data(%s)' % parsed_args)
188213
identity_client = self.app.client_manager.identity
189214
tenant = utils.find_resource(
190215
identity_client.tenants, parsed_args.tenant)

‎openstackclient/shell.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def env(*vars, **kwargs):
5050

5151
class OpenStackShell(App):
5252

53-
CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(message)s'
53+
CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(name)s %(message)s'
5454

5555
log = logging.getLogger(__name__)
5656

0 commit comments

Comments
 (0)