Merge "Use cliff formattable columns in volume v2 commands"

4 files changed, 45 insertions, 49 deletions

diff --git a/openstackclient/tests/functional/volume/v2/test_qos.py b/openstackclient/tests/functional/volume/v2/test_qos.py
index 646becc1..f9f6e099 100644
--- a/openstackclient/tests/functional/volume/v2/test_qos.py
+++ b/openstackclient/tests/functional/volume/v2/test_qos.py
@@ -74,7 +74,7 @@ class QosTests(common.BaseVolumeTests):
             cmd_output['consumer']
         )
         self.assertEqual(
-            "Alpha='a'",
+            {'Alpha': 'a'},
             cmd_output['properties']
         )
 
@@ -97,7 +97,7 @@ class QosTests(common.BaseVolumeTests):
             cmd_output['name']
         )
         self.assertEqual(
-            "Alpha='c', Beta='b'",
+            {'Alpha': 'c', 'Beta': 'b'},
             cmd_output['properties']
         )
 
@@ -118,7 +118,7 @@ class QosTests(common.BaseVolumeTests):
             cmd_output['name']
         )
         self.assertEqual(
-            "Beta='b'",
+            {'Beta': 'b'},
             cmd_output['properties']
         )
 
diff --git a/openstackclient/tests/functional/volume/v2/test_volume.py b/openstackclient/tests/functional/volume/v2/test_volume.py
index 2930d483..19fd5895 100644
--- a/openstackclient/tests/functional/volume/v2/test_volume.py
+++ b/openstackclient/tests/functional/volume/v2/test_volume.py
@@ -128,7 +128,7 @@ class VolumeTests(common.BaseVolumeTests):
             cmd_output["description"],
         )
         self.assertEqual(
-            "Alpha='a'",
+            {'Alpha': 'a'},
             cmd_output["properties"],
         )
         self.assertEqual(
@@ -170,7 +170,7 @@ class VolumeTests(common.BaseVolumeTests):
             cmd_output["description"],
         )
         self.assertEqual(
-            "Beta='b', Gamma='c'",
+            {'Beta': 'b', 'Gamma': 'c'},
             cmd_output["properties"],
         )
         self.assertEqual(
@@ -196,7 +196,7 @@ class VolumeTests(common.BaseVolumeTests):
             new_name
         ))
         self.assertEqual(
-            "Gamma='c'",
+            {'Gamma': 'c'},
             cmd_output["properties"],
         )
         self.assertEqual(
diff --git a/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py
index 264f4adb..8d32d997 100644
--- a/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py
+++ b/openstackclient/tests/functional/volume/v2/test_volume_snapshot.py
@@ -182,7 +182,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             cmd_output["description"],
         )
         self.assertEqual(
-            "Alpha='a'",
+            {'Alpha': 'a'},
             cmd_output["properties"],
         )
         self.wait_for_status('volume snapshot', name, 'available')
@@ -216,7 +216,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             cmd_output["description"],
         )
         self.assertEqual(
-            "Alpha='c', Beta='b'",
+            {'Alpha': 'c', 'Beta': 'b'},
             cmd_output["properties"],
         )
 
@@ -233,7 +233,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             new_name
         ))
         self.assertEqual(
-            "Beta='b'",
+            {'Beta': 'b'},
             cmd_output["properties"],
         )
 
@@ -249,6 +249,6 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             new_name
         ))
         self.assertNotIn(
-            "Beta='b'",
+            {'Beta': 'b'},
             cmd_output["properties"],
         )
diff --git a/openstackclient/tests/functional/volume/v2/test_volume_type.py b/openstackclient/tests/functional/volume/v2/test_volume_type.py
index d8dd5bd6..3f1a6ea8 100644
--- a/openstackclient/tests/functional/volume/v2/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v2/test_volume_type.py
@@ -65,8 +65,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json %s' % name
         ))
-        # TODO(amotoki): properties output should be machine-readable
-        self.assertEqual("a='b', c='d'", cmd_output['properties'])
+        self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
         raw_output = self.openstack(
             'volume type unset --property a %s' % name
@@ -75,7 +74,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json %s' % name
         ))
-        self.assertEqual("c='d'", cmd_output['properties'])
+        self.assertEqual({'c': 'd'}, cmd_output['properties'])
 
     def test_volume_type_set_unset_multiple_properties(self):
         name = uuid.uuid4().hex
@@ -96,7 +95,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json %s' % name
         ))
-        self.assertEqual("a='b', c='d'", cmd_output['properties'])
+        self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
         raw_output = self.openstack(
             'volume type unset --property a --property c %s' % name
@@ -105,7 +104,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json %s' % name
         ))
-        self.assertEqual("", cmd_output['properties'])
+        self.assertEqual({}, cmd_output['properties'])
 
     def test_volume_type_set_unset_project(self):
         name = uuid.uuid4().hex
@@ -155,35 +154,32 @@ class VolumeTypeTests(common.BaseVolumeTests):
             '--encryption-key-size 128 '
             '--encryption-control-location front-end ' +
             encryption_type))
-        # TODO(amotoki): encryption output should be machine-readable
-        expected = ["provider='LuksEncryptor'",
-                    "cipher='aes-xts-plain64'",
-                    "key_size='128'",
-                    "control_location='front-end'"]
-        for attr in expected:
-            self.assertIn(attr, cmd_output['encryption'])
+        expected = {'provider': 'LuksEncryptor',
+                    'cipher': 'aes-xts-plain64',
+                    'key_size': 128,
+                    'control_location': 'front-end'}
+        for attr, value in expected.items():
+            self.assertEqual(value, cmd_output['encryption'][attr])
         # test show encryption type
         cmd_output = json.loads(self.openstack(
             'volume type show -f json --encryption-type ' + encryption_type))
-        # TODO(amotoki): encryption output should be machine-readable
-        expected = ["provider='LuksEncryptor'",
-                    "cipher='aes-xts-plain64'",
-                    "key_size='128'",
-                    "control_location='front-end'"]
-        for attr in expected:
-            self.assertIn(attr, cmd_output['encryption'])
+        expected = {'provider': 'LuksEncryptor',
+                    'cipher': 'aes-xts-plain64',
+                    'key_size': 128,
+                    'control_location': 'front-end'}
+        for attr, value in expected.items():
+            self.assertEqual(value, cmd_output['encryption'][attr])
         # test list encryption type
         cmd_output = json.loads(self.openstack(
             'volume type list -f json --encryption-type'))
         encryption_output = [t['Encryption'] for t in cmd_output
                              if t['Name'] == encryption_type][0]
-        # TODO(amotoki): encryption output should be machine-readable
-        expected = ["provider='LuksEncryptor'",
-                    "cipher='aes-xts-plain64'",
-                    "key_size='128'",
-                    "control_location='front-end'"]
-        for attr in expected:
-            self.assertIn(attr, encryption_output)
+        expected = {'provider': 'LuksEncryptor',
+                    'cipher': 'aes-xts-plain64',
+                    'key_size': 128,
+                    'control_location': 'front-end'}
+        for attr, value in expected.items():
+            self.assertEqual(value, encryption_output[attr])
         # test set existing encryption type
         raw_output = self.openstack(
             'volume type set '
@@ -193,12 +189,12 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual('', raw_output)
         cmd_output = json.loads(self.openstack(
             'volume type show -f json --encryption-type ' + encryption_type))
-        expected = ["provider='LuksEncryptor'",
-                    "cipher='aes-xts-plain64'",
-                    "key_size='256'",
-                    "control_location='back-end'"]
-        for attr in expected:
-            self.assertIn(attr, cmd_output['encryption'])
+        expected = {'provider': 'LuksEncryptor',
+                    'cipher': 'aes-xts-plain64',
+                    'key_size': 256,
+                    'control_location': 'back-end'}
+        for attr, value in expected.items():
+            self.assertEqual(value, cmd_output['encryption'][attr])
         # test set new encryption type
         cmd_output = json.loads(self.openstack(
             'volume type create -f json --private ' +
@@ -222,12 +218,12 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json --encryption-type ' + name
         ))
-        expected = ["provider='LuksEncryptor'",
-                    "cipher='aes-xts-plain64'",
-                    "key_size='128'",
-                    "control_location='front-end'"]
-        for attr in expected:
-            self.assertIn(attr, cmd_output['encryption'])
+        expected = {'provider': 'LuksEncryptor',
+                    'cipher': 'aes-xts-plain64',
+                    'key_size': 128,
+                    'control_location': 'front-end'}
+        for attr, value in expected.items():
+            self.assertEqual(value, cmd_output['encryption'][attr])
         # test unset encryption type
         raw_output = self.openstack(
             'volume type unset --encryption-type ' + name
@@ -236,7 +232,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         cmd_output = json.loads(self.openstack(
             'volume type show -f json --encryption-type ' + name
         ))
-        self.assertEqual('', cmd_output['encryption'])
+        self.assertEqual({}, cmd_output['encryption'])
         # test delete encryption type
         raw_output = self.openstack('volume type delete ' + encryption_type)
         self.assertEqual('', raw_output)