Skip to content

Commit 05521bf

Browse files
committed
Remove str() when setting network objects names
Most network commands use str() on name argument, which fails on python 2 with Unicode characters. This comes from parsed arguments so does not actually need this call. Sample command failing with current code: openstack network create test_unicode™ Change-Id: Ie10b67864c912ee5c33e90b10c3d9705ee8307e7 Story: 2004356 Task: 27955
1 parent 1a0bef2 commit 05521bf

7 files changed

Lines changed: 8 additions & 8 deletions

File tree

openstackclient/network/v2/network.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def _get_columns_compute(item):
7272
def _get_attrs_network(client_manager, parsed_args):
7373
attrs = {}
7474
if parsed_args.name is not None:
75-
attrs['name'] = str(parsed_args.name)
75+
attrs['name'] = parsed_args.name
7676
if parsed_args.enable:
7777
attrs['admin_state_up'] = True
7878
if parsed_args.disable:
@@ -143,7 +143,7 @@ def _get_attrs_network(client_manager, parsed_args):
143143
def _get_attrs_compute(client_manager, parsed_args):
144144
attrs = {}
145145
if parsed_args.name is not None:
146-
attrs['name'] = str(parsed_args.name)
146+
attrs['name'] = parsed_args.name
147147
if parsed_args.share:
148148
attrs['share_subnet'] = True
149149
if parsed_args.no_share:

openstackclient/network/v2/network_agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def take_action(self, parsed_args):
351351
obj = client.get_agent(parsed_args.network_agent)
352352
attrs = {}
353353
if parsed_args.description is not None:
354-
attrs['description'] = str(parsed_args.description)
354+
attrs['description'] = parsed_args.description
355355
if parsed_args.enable:
356356
attrs['is_admin_state_up'] = True
357357
attrs['admin_state_up'] = True

openstackclient/network/v2/network_qos_policy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def _get_columns(item):
3838
def _get_attrs(client_manager, parsed_args):
3939
attrs = {}
4040
if 'name' in parsed_args and parsed_args.name is not None:
41-
attrs['name'] = str(parsed_args.name)
41+
attrs['name'] = parsed_args.name
4242
if 'description' in parsed_args and parsed_args.description is not None:
4343
attrs['description'] = parsed_args.description
4444
if parsed_args.share:

openstackclient/network/v2/port.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def _get_attrs(client_manager, parsed_args):
134134
attrs['dns_name'] = parsed_args.dns_name
135135
# It is possible that name is not updated during 'port set'
136136
if parsed_args.name is not None:
137-
attrs['name'] = str(parsed_args.name)
137+
attrs['name'] = parsed_args.name
138138
# The remaining options do not support 'port set' command, so they require
139139
# additional check
140140
if 'network' in parsed_args and parsed_args.network is not None:

openstackclient/network/v2/router.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def _get_columns(item):
8585
def _get_attrs(client_manager, parsed_args):
8686
attrs = {}
8787
if parsed_args.name is not None:
88-
attrs['name'] = str(parsed_args.name)
88+
attrs['name'] = parsed_args.name
8989
if parsed_args.enable:
9090
attrs['admin_state_up'] = True
9191
if parsed_args.disable:

openstackclient/network/v2/subnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
169169
attrs = {}
170170
client = client_manager.network
171171
if 'name' in parsed_args and parsed_args.name is not None:
172-
attrs['name'] = str(parsed_args.name)
172+
attrs['name'] = parsed_args.name
173173

174174
if is_create:
175175
if 'project' in parsed_args and parsed_args.project is not None:

openstackclient/network/v2/subnet_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _get_attrs(client_manager, parsed_args):
5252
network_client = client_manager.network
5353

5454
if parsed_args.name is not None:
55-
attrs['name'] = str(parsed_args.name)
55+
attrs['name'] = parsed_args.name
5656
if parsed_args.prefixes is not None:
5757
attrs['prefixes'] = parsed_args.prefixes
5858
if parsed_args.default_prefix_length is not None:

0 commit comments

Comments
 (0)