summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <bcafarel@redhat.com>2019-01-28 14:17:46 +0100
committerBernard Cafarelli <bcafarel@redhat.com>2019-03-05 10:00:41 +0000
commitac65c3c0ea83568a4ea37345cabbbf1e06cb5ce6 (patch)
tree39cc1c4bcf33efbe4a3a9061ec1246511485d332
parent010da92ff3711873e40c0f5a1c262010400bf53b (diff)
downloadpython-openstackclient-ac65c3c0ea83568a4ea37345cabbbf1e06cb5ce6.tar.gz
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 (cherry picked from commit 05521bf84cb108c73bb36b270569b1986ad13f53)
-rw-r--r--openstackclient/network/v2/network.py4
-rw-r--r--openstackclient/network/v2/network_agent.py2
-rw-r--r--openstackclient/network/v2/network_qos_policy.py2
-rw-r--r--openstackclient/network/v2/port.py2
-rw-r--r--openstackclient/network/v2/router.py2
-rw-r--r--openstackclient/network/v2/subnet.py2
-rw-r--r--openstackclient/network/v2/subnet_pool.py2
7 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index d1c7f005..2ce22c2e 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -72,7 +72,7 @@ def _get_columns_compute(item):
def _get_attrs_network(client_manager, parsed_args):
attrs = {}
if parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if parsed_args.enable:
attrs['admin_state_up'] = True
if parsed_args.disable:
@@ -140,7 +140,7 @@ def _get_attrs_network(client_manager, parsed_args):
def _get_attrs_compute(client_manager, parsed_args):
attrs = {}
if parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if parsed_args.share:
attrs['share_subnet'] = True
if parsed_args.no_share:
diff --git a/openstackclient/network/v2/network_agent.py b/openstackclient/network/v2/network_agent.py
index ba2a2633..46e8d4b2 100644
--- a/openstackclient/network/v2/network_agent.py
+++ b/openstackclient/network/v2/network_agent.py
@@ -351,7 +351,7 @@ class SetNetworkAgent(command.Command):
obj = client.get_agent(parsed_args.network_agent)
attrs = {}
if parsed_args.description is not None:
- attrs['description'] = str(parsed_args.description)
+ attrs['description'] = parsed_args.description
if parsed_args.enable:
attrs['is_admin_state_up'] = True
attrs['admin_state_up'] = True
diff --git a/openstackclient/network/v2/network_qos_policy.py b/openstackclient/network/v2/network_qos_policy.py
index 2c6b841b..fd5ff937 100644
--- a/openstackclient/network/v2/network_qos_policy.py
+++ b/openstackclient/network/v2/network_qos_policy.py
@@ -38,7 +38,7 @@ def _get_columns(item):
def _get_attrs(client_manager, parsed_args):
attrs = {}
if 'name' in parsed_args and parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if 'description' in parsed_args and parsed_args.description is not None:
attrs['description'] = parsed_args.description
if parsed_args.share:
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 032e1787..cffcfd4d 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -131,7 +131,7 @@ def _get_attrs(client_manager, parsed_args):
attrs['dns_name'] = parsed_args.dns_name
# It is possible that name is not updated during 'port set'
if parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
# The remaining options do not support 'port set' command, so they require
# additional check
if 'network' in parsed_args and parsed_args.network is not None:
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index f0a51967..e656cb76 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -77,7 +77,7 @@ def _get_columns(item):
def _get_attrs(client_manager, parsed_args):
attrs = {}
if parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if parsed_args.enable:
attrs['admin_state_up'] = True
if parsed_args.disable:
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 2c71e1e0..5fd58b5e 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -168,7 +168,7 @@ def convert_entries_to_gateway(entries):
def _get_attrs(client_manager, parsed_args, is_create=True):
attrs = {}
if 'name' in parsed_args and parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if is_create:
if 'project' in parsed_args and parsed_args.project is not None:
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index a5839868..4763e29b 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -52,7 +52,7 @@ def _get_attrs(client_manager, parsed_args):
network_client = client_manager.network
if parsed_args.name is not None:
- attrs['name'] = str(parsed_args.name)
+ attrs['name'] = parsed_args.name
if parsed_args.prefixes is not None:
attrs['prefixes'] = parsed_args.prefixes
if parsed_args.default_prefix_length is not None: