summaryrefslogtreecommitdiff
path: root/openstackclient/network
diff options
context:
space:
mode:
authorBernard Cafarelli <bcafarel@redhat.com>2019-01-28 14:17:46 +0100
committerBernard Cafarelli <bcafarel@redhat.com>2019-02-13 10:43:11 +0100
commit05521bf84cb108c73bb36b270569b1986ad13f53 (patch)
treeb71e048988591919e0d79c61fcbc155acfc19861 /openstackclient/network
parent1a0bef2b46c76e1c6308def709199c30c68aae47 (diff)
downloadpython-openstackclient-05521bf84cb108c73bb36b270569b1986ad13f53.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
Diffstat (limited to 'openstackclient/network')
-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 0fdf62c9..f5123932 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:
@@ -143,7 +143,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 1001e6cf..f6d6fc72 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -134,7 +134,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 1b7d6374..2ec3e2f0 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -85,7 +85,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 d252a7a5..5f8113bb 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -169,7 +169,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
attrs = {}
client = client_manager.network
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 81765ca1..d8c06eb8 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: