From 760cc59c5a34133f6b34118fd4b1e3b902c7e297 Mon Sep 17 00:00:00 2001
From: Alexey Stupnikov <astupnikov@mirantis.com>
Date: Wed, 24 May 2017 12:33:57 +0300
Subject: [PATCH] Cleared type restrictions for metadata option

It turns out that it is impossible to send unicode metadata
values with some cinder commands. The reason is a type restriction
that demands all values to be a 'str' type. As a result, it is
impossible to use unicode.

Change-Id: I1213b0d3b8177b670cd3e5d587fee9dabd971923
Closes-bug: #1693151
---
 cinderclient/v2/shell.py | 5 -----
 cinderclient/v3/shell.py | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py
index 2c6fc66..9b1c234 100644
--- a/cinderclient/v2/shell.py
+++ b/cinderclient/v2/shell.py
@@ -67,7 +67,6 @@ from cinderclient.v2 import availability_zones
            help='Filters results by a migration status. Default=None. '
                 'Admin only.')
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
@@ -272,7 +271,6 @@ class CheckSizeArgForCreate(argparse.Action):
 @utils.arg('--availability_zone',
            help=argparse.SUPPRESS)
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
@@ -643,7 +641,6 @@ def do_snapshot_show(cs, args):
 @utils.arg('--display_description',
            help=argparse.SUPPRESS)
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
@@ -1979,7 +1976,6 @@ def do_set_bootable(cs, args):
            metavar='<availability-zone>',
            help='Availability zone for volume (Default=None)')
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            help='Metadata key=value pairs (Default=None)')
@@ -2365,7 +2361,6 @@ def do_get_capabilities(cs, args):
            metavar='<description>',
            help='Snapshot description (Default=None)')
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            help='Metadata key=value pairs (Default=None)')
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 4f85097..48eaa96 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -80,14 +80,12 @@ RESET_STATE_RESOURCES = {'volume': utils.find_volume,
            help='Filters results by a migration status. Default=None. '
                 'Admin only.')
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
            help='Filters results by a metadata key and value pair. '
                 'Default=None.')
 @utils.arg('--image_metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
@@ -333,7 +331,6 @@ def do_reset_state(cs, args):
 @utils.arg('--availability_zone',
            help=argparse.SUPPRESS)
 @utils.arg('--metadata',
-           type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,