tests: Convert volume tests to use 'parse_output'

Change-Id: Iec8ca873f6bc3993e0ba557f68895d9aefb6f9c6
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

Author: stephenfin

openstackclient/tests/functional/volume/base.py

@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import time
 
 from openstackclient.tests.functional import base
@@ -27,10 +26,12 @@ def wait_for_status(cls, check_type, check_name, desired_status,
             failures = ['error']
         total_sleep = 0
         while total_sleep < wait:
-            output = json.loads(cls.openstack(
-                check_type + ' show -f json ' + check_name))
+            output = cls.openstack(
+                check_type + ' show ' + check_name,
+                parse_output=True,
+            )
             current_status = output['status']
-            if (current_status == desired_status):
+            if current_status == desired_status:
                 print('{} {} now has status {}'
                       .format(check_type, check_name, current_status))
                 return
@@ -51,7 +52,7 @@ def wait_for_delete(cls, check_type, check_name, wait=120, interval=5,
         total_sleep = 0
         name_field = name_field or 'Name'
         while total_sleep < wait:
-            result = json.loads(cls.openstack(check_type + ' list -f json'))
+            result = cls.openstack(check_type + ' list', parse_output=True)
             names = [x[name_field] for x in result]
             if check_name not in names:
                 print('{} {} is now deleted'.format(check_type, check_name))

openstackclient/tests/functional/volume/v1/test_qos.py

@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import uuid
 
 from openstackclient.tests.functional.volume.v1 import common
@@ -22,29 +21,32 @@ class QosTests(common.BaseVolumeTests):
     def test_volume_qos_create_list(self):
         """Test create, list, delete multiple"""
         name1 = uuid.uuid4().hex
-        cmd_output = json.loads(self.openstack(
-            'volume qos create -f json ' +
-            name1
-        ))
+        cmd_output = self.openstack(
+            'volume qos create ' +
+            name1,
+            parse_output=True,
+        )
         self.assertEqual(
             name1,
             cmd_output['name']
         )
 
         name2 = uuid.uuid4().hex
-        cmd_output = json.loads(self.openstack(
-            'volume qos create -f json ' +
-            name2
-        ))
+        cmd_output = self.openstack(
+            'volume qos create ' +
+            name2,
+            parse_output=True,
+        )
         self.assertEqual(
             name2,
             cmd_output['name']
         )
 
         # Test list
-        cmd_output = json.loads(self.openstack(
-            'volume qos list -f json'
-        ))
+        cmd_output = self.openstack(
+            'volume qos list',
+            parse_output=True,
+        )
         names = [x["Name"] for x in cmd_output]
         self.assertIn(name1, names)
         self.assertIn(name2, names)
@@ -57,12 +59,13 @@ def test_volume_qos_set_show_unset(self):
         """Tests create volume qos, set, unset, show, delete"""
 
         name = uuid.uuid4().hex
-        cmd_output = json.loads(self.openstack(
-            'volume qos create -f json ' +
+        cmd_output = self.openstack(
+            'volume qos create ' +
             '--consumer front-end '
             '--property Alpha=a ' +
-            name
-        ))
+            name,
+            parse_output=True,
+        )
         self.addCleanup(self.openstack, 'volume qos delete ' + name)
         self.assertEqual(
             name,
@@ -84,10 +87,11 @@ def test_volume_qos_set_show_unset(self):
         self.assertOutput('', raw_output)
 
         # Test volume qos show
-        cmd_output = json.loads(self.openstack(
-            'volume qos show -f json ' +
-            name
-        ))
+        cmd_output = self.openstack(
+            'volume qos show ' +
+            name,
+            parse_output=True,
+        )
         self.assertEqual(
             name,
             cmd_output['name']
@@ -105,10 +109,11 @@ def test_volume_qos_set_show_unset(self):
         )
         self.assertOutput('', raw_output)
 
-        cmd_output = json.loads(self.openstack(
-            'volume qos show -f json ' +
-            name
-        ))
+        cmd_output = self.openstack(
+            'volume qos show ' +
+            name,
+            parse_output=True,
+        )
         self.assertEqual(
             name,
             cmd_output['name']

openstackclient/tests/functional/volume/v1/test_service.py

@@ -10,27 +10,25 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
 from openstackclient.tests.functional.volume.v1 import common
 
 
 class VolumeServiceTests(common.BaseVolumeTests):
     """Functional tests for volume service."""
 
     def test_volume_service_list(self):
-        cmd_output = json.loads(self.openstack(
-            'volume service list -f json'))
+        cmd_output = self.openstack('volume service list', parse_output=True)
 
         # Get the nonredundant services and hosts
         services = list(set([x['Binary'] for x in cmd_output]))
 
         # Test volume service list --service
-        cmd_output = json.loads(self.openstack(
-            'volume service list -f json ' +
+        cmd_output = self.openstack(
+            'volume service list ' +
             '--service ' +
-            services[0]
-        ))
+            services[0],
+            parse_output=True,
+        )
         for x in cmd_output:
             self.assertEqual(
                 services[0],
@@ -43,9 +41,10 @@ def test_volume_service_list(self):
     def test_volume_service_set(self):
 
         # Get a service and host
-        cmd_output = json.loads(self.openstack(
-            'volume service list -f json'
-        ))
+        cmd_output = self.openstack(
+            'volume service list',
+            parse_output=True,
+        )
         service_1 = cmd_output[0]['Binary']
         host_1 = cmd_output[0]['Host']
 
@@ -57,9 +56,10 @@ def test_volume_service_set(self):
         )
         self.assertOutput('', raw_output)
 
-        cmd_output = json.loads(self.openstack(
-            'volume service list -f json --long'
-        ))
+        cmd_output = self.openstack(
+            'volume service list --long',
+            parse_output=True,
+        )
         self.assertEqual(
             'enabled',
             cmd_output[0]['Status']
@@ -77,9 +77,10 @@ def test_volume_service_set(self):
         )
         self.assertOutput('', raw_output)
 
-        cmd_output = json.loads(self.openstack(
-            'volume service list -f json --long'
-        ))
+        cmd_output = self.openstack(
+            'volume service list --long',
+            parse_output=True,
+        )
         self.assertEqual(
             'disabled',
             cmd_output[0]['Status']