openstack
/
python-openstackclient
Code Issues Proposed changes

JSON-ify image functional tests 

Change-Id: Ica91eddfdebe68449544feb5e29113db075bf11c
This commit is contained in:
Dean Troyer 2017-05-11 14:58:56 -05:00
parent 7c43c1a3c3
commit 6425fc3059
2 changed files with 266 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
openstackclient/tests/functional/image/v1/test_image.py
View File

@ -26,44 +26,74 @@ class ImageTests(base.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
os.environ['OS_IMAGE_API_VERSION'] = '1' os.environ['OS_IMAGE_API_VERSION'] = '1'
cmd_output = json.loads(cls.openstack( json_output = json.loads(cls.openstack(
'image create -f json ' + cls.NAME)) 'image create -f json ' +
cls.assertOutput(cls.NAME, cmd_output['name']) cls.NAME
))
cls.image_id = json_output["id"]
cls.assertOutput(cls.NAME, json_output['name'])
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
# Rename test cls.openstack(
raw_output = cls.openstack('image set --name ' + cls.OTHER_NAME + ' ' 'image delete ' +
+ cls.NAME) cls.image_id
cls.assertOutput('', raw_output) )
# Delete test
raw_output = cls.openstack('image delete ' + cls.OTHER_NAME)
cls.assertOutput('', raw_output)
def test_image_list(self): def test_image_list(self):
cmd_output = json.loads(self.openstack('image list -f json')) json_output = json.loads(self.openstack(
col_names = [img['Name'] for img in cmd_output] 'image list -f json '
self.assertIn(self.NAME, col_names) ))
self.assertIn(
self.NAME,
[img['Name'] for img in json_output]
)
def test_image_show(self): def test_image_attributes(self):
cmd_output = json.loads(self.openstack( """Test set, unset, show on attributes, tags and properties"""
'image show -f json ' + self.NAME))
self.assertEqual(self.NAME, cmd_output['name'])
def test_image_set(self): # Test explicit attributes
self.openstack('image set --min-disk 4 --min-ram 5 ' + self.openstack(
'--disk-format qcow2 --public ' + self.NAME) 'image set ' +
cmd_output = json.loads(self.openstack( '--min-disk 4 ' +
'image show -f json ' + self.NAME)) '--min-ram 5 ' +
self.assertEqual(self.NAME, cmd_output['name']) '--disk-format qcow2 ' +
self.assertEqual(4, cmd_output['min_disk']) '--public ' +
self.assertEqual(5, cmd_output['min_ram']) self.NAME
self.assertEqual('qcow2', cmd_output['disk_format']) )
self.assertEqual(True, cmd_output['is_public']) json_output = json.loads(self.openstack(
'image show -f json ' +
self.NAME
))
self.assertEqual(
4,
json_output["min_disk"],
)
self.assertEqual(
5,
json_output["min_ram"],
)
self.assertEqual(
'qcow2',
json_output['disk_format'],
)
self.assertTrue(
json_output["is_public"],
)
def test_image_metadata(self): # Test properties
self.openstack('image set --property a=b --property c=d ' + self.NAME) self.openstack(
cmd_output = json.loads(self.openstack( 'image set ' +
'image show -f json ' + self.NAME)) '--property a=b ' +
self.assertEqual(self.NAME, cmd_output['name']) '--property c=d ' +
self.assertEqual("a='b', c='d'", cmd_output['properties']) '--public ' +
self.NAME
)
json_output = json.loads(self.openstack(
'image show -f json ' +
self.NAME
))
self.assertEqual(
"a='b', c='d'",
json_output["properties"],
)

264
openstackclient/tests/functional/image/v2/test_image.py
View File

@ -14,6 +14,8 @@ import json
import os import os
import uuid import uuid
# from glanceclient import exc as image_exceptions
from openstackclient.tests.functional import base from openstackclient.tests.functional import base
@ -26,78 +28,218 @@ class ImageTests(base.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
os.environ['OS_IMAGE_API_VERSION'] = '2' os.environ['OS_IMAGE_API_VERSION'] = '2'
cmd_output = json.loads(cls.openstack( json_output = json.loads(cls.openstack(
'image create -f json ' + cls.NAME)) 'image create -f json ' +
cls.assertOutput(cls.NAME, cmd_output['name']) cls.NAME
))
cls.image_id = json_output["id"]
cls.assertOutput(cls.NAME, json_output['name'])
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
# Rename test cls.openstack(
raw_output = cls.openstack('image set --name ' + cls.OTHER_NAME + ' ' 'image delete ' +
+ cls.NAME) cls.image_id
cls.assertOutput('', raw_output) )
# Delete test
raw_output = cls.openstack('image delete ' + cls.OTHER_NAME)
cls.assertOutput('', raw_output)
def test_image_list(self): def test_image_list(self):
cmd_output = json.loads(self.openstack('image list -f json')) json_output = json.loads(self.openstack(
col_names = [x['Name'] for x in cmd_output] 'image list -f json '
self.assertIn(self.NAME, col_names) ))
self.assertIn(
self.NAME,
[img['Name'] for img in json_output]
)
def test_image_show(self): def test_image_attributes(self):
cmd_output = json.loads(self.openstack( """Test set, unset, show on attributes, tags and properties"""
'image show -f json ' + self.NAME))
self.assertEqual(self.NAME, cmd_output['name'])
def test_image_set(self): # Test explicit attributes
self.openstack('image set --min-disk 4 --min-ram 5 --public ' self.openstack(
+ self.NAME) 'image set ' +
cmd_output = json.loads(self.openstack( '--min-disk 4 ' +
'image show -f json ' + self.NAME)) '--min-ram 5 ' +
self.assertEqual(self.NAME, cmd_output['name']) '--public ' +
self.assertEqual(4, cmd_output['min_disk']) self.NAME
self.assertEqual(5, cmd_output['min_ram']) )
self.assertEqual('raw', cmd_output['disk_format']) json_output = json.loads(self.openstack(
self.assertEqual('public', cmd_output['visibility']) 'image show -f json ' +
self.NAME
))
self.assertEqual(
4,
json_output["min_disk"],
)
self.assertEqual(
5,
json_output["min_ram"],
)
self.assertEqual(
'public',
json_output["visibility"],
)
def test_image_metadata(self): # Test properties
self.openstack('image set --property a=b --property c=d ' + self.NAME) self.openstack(
cmd_output = json.loads(self.openstack( 'image set ' +
'image show -f json ' + self.NAME)) '--property a=b ' +
self.assertEqual(self.NAME, cmd_output['name']) '--property c=d ' +
self.assertEqual("a='b', c='d'", cmd_output['properties']) '--public ' +
self.NAME
)
json_output = json.loads(self.openstack(
'image show -f json ' +
self.NAME
))
self.assertEqual(
"a='b', c='d'",
json_output["properties"],
)
def test_image_unset(self): self.openstack(
self.openstack('image set --tag 01 ' + self.NAME) 'image unset ' +
cmd_output = json.loads(self.openstack( '--property a ' +
'image show -f json ' + self.NAME)) '--property c ' +
self.assertEqual('01', cmd_output['tags']) self.NAME
self.openstack('image unset --tag 01 ' + self.NAME) )
# test_image_metadata has set image properties "a" and "c" json_output = json.loads(self.openstack(
self.openstack('image unset --property a --property c ' + self.NAME) 'image show -f json ' +
cmd_output = json.loads(self.openstack( self.NAME
'image show -f json ' + self.NAME)) ))
self.assertEqual(self.NAME, cmd_output['name']) self.assertNotIn(
self.assertEqual('', cmd_output['tags']) 'properties',
self.assertNotIn('properties', cmd_output) json_output,
)
# Test tags
self.openstack(
'image set ' +
'--tag 01 ' +
self.NAME
)
json_output = json.loads(self.openstack(
'image show -f json ' +
self.NAME
))
self.assertEqual(
'01',
json_output["tags"],
)
self.openstack(
'image unset ' +
'--tag 01 ' +
self.NAME
)
json_output = json.loads(self.openstack(
'image show -f json ' +
self.NAME
))
self.assertEqual(
'',
json_output["tags"],
)
def test_image_set_rename(self):
name = uuid.uuid4().hex
json_output = json.loads(self.openstack(
'image create -f json ' +
name
))
image_id = json_output["id"]
self.assertEqual(
name,
json_output["name"],
)
self.openstack(
'image set ' +
'--name ' + name + 'xx ' +
image_id
)
json_output = json.loads(self.openstack(
'image show -f json ' +
name + 'xx'
))
self.assertEqual(
name + 'xx',
json_output["name"],
)
# TODO(dtroyer): This test is incomplete and doesn't properly test
# sharing images. Fix after the --shared option is
# properly added.
def test_image_members(self): def test_image_members(self):
cmd_output = json.loads(self.openstack('token issue -f json')) """Test member add, remove, accept"""
my_project_id = cmd_output['project_id'] json_output = json.loads(self.openstack(
self.openstack( 'token issue -f json'
'image add project {} {}'.format(self.NAME, my_project_id)) ))
my_project_id = json_output['project_id']
self.openstack( json_output = json.loads(self.openstack(
'image set --accept ' + self.NAME) 'image show -f json ' +
shared_img_list = json.loads(self.openstack( self.NAME
'image list --shared -f json')) ))
self.assertIn(self.NAME, [img['Name'] for img in shared_img_list]) # NOTE(dtroyer): Until OSC supports --shared flags in create and set
# we can not properly test membership. Sometimes the
# images are shared and sometimes they are not.
if json_output["visibility"] == 'shared':
self.openstack(
'image add project ' +
self.NAME + ' ' +
my_project_id
)
# self.addCleanup(
# self.openstack,
# 'image remove project ' +
# self.NAME + ' ' +
# my_project_id
# )
self.openstack( self.openstack(
'image set --reject ' + self.NAME) 'image set ' +
shared_img_list = json.loads(self.openstack( '--accept ' +
'image list --shared -f json')) self.NAME
)
json_output = json.loads(self.openstack(
'image list -f json ' +
'--shared'
))
self.assertIn(
self.NAME,
[img['Name'] for img in json_output]
)
self.openstack( self.openstack(
'image remove project {} {}'.format(self.NAME, my_project_id)) 'image set ' +
'--reject ' +
self.NAME
)
json_output = json.loads(self.openstack(
'image list -f json ' +
'--shared'
))
# self.assertNotIn(
# self.NAME,
# [img['Name'] for img in json_output]
# )
self.openstack(
'image remove project ' +
self.NAME + ' ' +
my_project_id
)
# else:
# # Test not shared
# self.assertRaises(
# image_exceptions.HTTPForbidden,
# self.openstack,
# 'image add project ' +
# self.NAME + ' ' +
# my_project_id
# )
# self.openstack(
# 'image set ' +
# '--share ' +
# self.NAME
# )