Convert image functional tests into JSON format

Change-Id: Ic8eb72e8f89e5e40cf2b7594a196bb31d38e6b04

2 files changed, 59 insertions, 52 deletions

diff --git a/openstackclient/tests/functional/image/v1/test_image.py b/openstackclient/tests/functional/image/v1/test_image.py
index 2a2b5734..7e12f2c7 100644
--- a/openstackclient/tests/functional/image/v1/test_image.py
+++ b/openstackclient/tests/functional/image/v1/test_image.py
@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 import os
 import uuid
 
@@ -21,16 +22,13 @@ class ImageTests(base.TestCase):
 
     NAME = uuid.uuid4().hex
     OTHER_NAME = uuid.uuid4().hex
-    HEADERS = ['Name']
-    FIELDS = ['name']
 
     @classmethod
     def setUpClass(cls):
         os.environ['OS_IMAGE_API_VERSION'] = '1'
-        opts = cls.get_opts(cls.FIELDS)
-        raw_output = cls.openstack('image create ' + cls.NAME + opts)
-        expected = cls.NAME + '\n'
-        cls.assertOutput(expected, raw_output)
+        cmd_output = json.loads(cls.openstack(
+            'image create -f json ' + cls.NAME))
+        cls.assertOutput(cls.NAME, cmd_output['name'])
 
     @classmethod
     def tearDownClass(cls):
@@ -43,25 +41,29 @@ class ImageTests(base.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_image_list(self):
-        opts = self.get_opts(self.HEADERS)
-        raw_output = self.openstack('image list' + opts)
-        self.assertIn(self.NAME, raw_output)
+        cmd_output = json.loads(self.openstack('image list -f json'))
+        col_names = [img['Name'] for img in cmd_output]
+        self.assertIn(self.NAME, col_names)
 
     def test_image_show(self):
-        opts = self.get_opts(self.FIELDS)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\n", raw_output)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
 
     def test_image_set(self):
-        opts = self.get_opts([
-            "disk_format", "is_public", "min_disk", "min_ram", "name"])
         self.openstack('image set --min-disk 4 --min-ram 5 ' +
-                       '--disk-format qcow2  --public ' + self.NAME)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual("qcow2\nTrue\n4\n5\n" + self.NAME + '\n', raw_output)
+                       '--disk-format qcow2 --public ' + self.NAME)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertEqual(4, cmd_output['min_disk'])
+        self.assertEqual(5, cmd_output['min_ram'])
+        self.assertEqual('qcow2', cmd_output['disk_format'])
+        self.assertEqual(True, cmd_output['is_public'])
 
     def test_image_metadata(self):
-        opts = self.get_opts(["name", "properties"])
         self.openstack('image set --property a=b --property c=d ' + self.NAME)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertEqual("a='b', c='d'", cmd_output['properties'])
diff --git a/openstackclient/tests/functional/image/v2/test_image.py b/openstackclient/tests/functional/image/v2/test_image.py
index b6baf570..2a132ab7 100644
--- a/openstackclient/tests/functional/image/v2/test_image.py
+++ b/openstackclient/tests/functional/image/v2/test_image.py
@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 import os
 import uuid
 
@@ -21,16 +22,13 @@ class ImageTests(base.TestCase):
 
     NAME = uuid.uuid4().hex
     OTHER_NAME = uuid.uuid4().hex
-    HEADERS = ['Name']
-    FIELDS = ['name']
 
     @classmethod
     def setUpClass(cls):
         os.environ['OS_IMAGE_API_VERSION'] = '2'
-        opts = cls.get_opts(cls.FIELDS)
-        raw_output = cls.openstack('image create ' + cls.NAME + opts)
-        expected = cls.NAME + '\n'
-        cls.assertOutput(expected, raw_output)
+        cmd_output = json.loads(cls.openstack(
+            'image create -f json ' + cls.NAME))
+        cls.assertOutput(cls.NAME, cmd_output['name'])
 
     @classmethod
     def tearDownClass(cls):
@@ -43,56 +41,63 @@ class ImageTests(base.TestCase):
         cls.assertOutput('', raw_output)
 
     def test_image_list(self):
-        opts = self.get_opts(self.HEADERS)
-        raw_output = self.openstack('image list' + opts)
-        self.assertIn(self.NAME, raw_output)
+        cmd_output = json.loads(self.openstack('image list -f json'))
+        col_names = [x['Name'] for x in cmd_output]
+        self.assertIn(self.NAME, col_names)
 
     def test_image_show(self):
-        opts = self.get_opts(self.FIELDS)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\n", raw_output)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
 
     def test_image_set(self):
-        opts = self.get_opts([
-            "disk_format", "visibility", "min_disk", "min_ram", "name"])
-        self.openstack('image set --min-disk 4 --min-ram 5 ' +
-                       '--public ' + self.NAME)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual("raw\n4\n5\n" + self.NAME + '\npublic\n', raw_output)
+        self.openstack('image set --min-disk 4 --min-ram 5 --public '
+                       + self.NAME)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertEqual(4, cmd_output['min_disk'])
+        self.assertEqual(5, cmd_output['min_ram'])
+        self.assertEqual('raw', cmd_output['disk_format'])
+        self.assertEqual('public', cmd_output['visibility'])
 
     def test_image_metadata(self):
-        opts = self.get_opts(["name", "properties"])
         self.openstack('image set --property a=b --property c=d ' + self.NAME)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\na='b', c='d'\n", raw_output)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertEqual("a='b', c='d'", cmd_output['properties'])
 
     def test_image_unset(self):
-        opts = self.get_opts(["name", "tags", "properties"])
         self.openstack('image set --tag 01 ' + self.NAME)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual('01', cmd_output['tags'])
         self.openstack('image unset --tag 01 ' + self.NAME)
         # test_image_metadata has set image properties "a" and "c"
         self.openstack('image unset --property a --property c ' + self.NAME)
-        raw_output = self.openstack('image show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\n\n", raw_output)
+        cmd_output = json.loads(self.openstack(
+            'image show -f json ' + self.NAME))
+        self.assertEqual(self.NAME, cmd_output['name'])
+        self.assertEqual('', cmd_output['tags'])
+        self.assertNotIn('properties', cmd_output)
 
     def test_image_members(self):
-        opts = self.get_opts(['project_id'])
-        my_project_id = self.openstack('token issue' + opts).strip()
+        cmd_output = json.loads(self.openstack('token issue -f json'))
+        my_project_id = cmd_output['project_id']
         self.openstack(
             'image add project {} {}'.format(self.NAME, my_project_id))
 
         self.openstack(
             'image set --accept ' + self.NAME)
-        shared_img_list = self.parse_listing(
-            self.openstack('image list --shared')
-        )
+        shared_img_list = json.loads(self.openstack(
+            'image list --shared -f json'))
         self.assertIn(self.NAME, [img['Name'] for img in shared_img_list])
 
         self.openstack(
             'image set --reject ' + self.NAME)
-        shared_img_list = self.parse_listing(
-            self.openstack('image list --shared', self.get_opts(['name']))
-        )
+        shared_img_list = json.loads(self.openstack(
+            'image list --shared -f json'))
 
         self.openstack(
             'image remove project {} {}'.format(self.NAME, my_project_id))