Functional test for aggregate
Using json format output in aggregate functional tests. Remove resource create/delete from setupClass() and teardownClass() methods Change-Id: I6494ca63bfe8a51de0f65570fddcaf38f6c42dbb
This commit is contained in:
zhiyong.dai
parent
083b115d09
commit
7d8602c9bc
@ -10,6 +10,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import json
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from openstackclient.tests.functional import base
|
from openstackclient.tests.functional import base
|
||||||
@ -18,90 +19,164 @@ from openstackclient.tests.functional import base
|
|||||||
class AggregateTests(base.TestCase):
|
class AggregateTests(base.TestCase):
|
||||||
"""Functional tests for aggregate."""
|
"""Functional tests for aggregate."""
|
||||||
|
|
||||||
NAME = uuid.uuid4().hex
|
def test_aggregate_create_and_delete(self):
|
||||||
HEADERS = ['Name']
|
"""Test create, delete multiple"""
|
||||||
FIELDS = ['name']
|
name1 = uuid.uuid4().hex
|
||||||
|
cmd_output = json.loads(self.openstack(
|
||||||
@classmethod
|
'aggregate create -f json ' +
|
||||||
def setUpClass(cls):
|
'--zone nova ' +
|
||||||
opts = cls.get_opts(cls.FIELDS)
|
name1))
|
||||||
# Use the default 'nova' availability zone for the aggregate.
|
self.assertEqual(
|
||||||
raw_output = cls.openstack(
|
name1,
|
||||||
'aggregate create --zone nova ' + cls.NAME + opts
|
cmd_output['name']
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
'nova',
|
||||||
|
cmd_output['availability_zone']
|
||||||
)
|
)
|
||||||
expected = cls.NAME + '\n'
|
|
||||||
cls.assertOutput(expected, raw_output)
|
|
||||||
|
|
||||||
@classmethod
|
name2 = uuid.uuid4().hex
|
||||||
def tearDownClass(cls):
|
cmd_output = json.loads(self.openstack(
|
||||||
raw_output = cls.openstack('aggregate delete ' + cls.NAME)
|
'aggregate create -f json ' +
|
||||||
cls.assertOutput('', raw_output)
|
'--zone nova ' +
|
||||||
|
name2))
|
||||||
|
self.assertEqual(
|
||||||
|
name2,
|
||||||
|
cmd_output['name']
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
'nova',
|
||||||
|
cmd_output['availability_zone']
|
||||||
|
)
|
||||||
|
|
||||||
|
del_output = self.openstack(
|
||||||
|
'aggregate delete ' + name1 + ' ' + name2)
|
||||||
|
self.assertOutput('', del_output)
|
||||||
|
|
||||||
def test_aggregate_list(self):
|
def test_aggregate_list(self):
|
||||||
opts = self.get_opts(self.HEADERS)
|
"""Test aggregate list"""
|
||||||
raw_output = self.openstack('aggregate list' + opts)
|
name1 = uuid.uuid4().hex
|
||||||
self.assertIn(self.NAME, raw_output)
|
self.openstack(
|
||||||
|
'aggregate create ' +
|
||||||
|
'--zone nova ' +
|
||||||
|
'--property a=b ' +
|
||||||
|
name1)
|
||||||
|
self.addCleanup(self.openstack, 'aggregate delete ' + name1)
|
||||||
|
|
||||||
def test_aggregate_show(self):
|
name2 = uuid.uuid4().hex
|
||||||
opts = self.get_opts(self.FIELDS)
|
self.openstack(
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
'aggregate create ' +
|
||||||
self.assertEqual(self.NAME + "\n", raw_output)
|
'--zone internal ' +
|
||||||
|
'--property c=d ' +
|
||||||
|
name2)
|
||||||
|
self.addCleanup(self.openstack, 'aggregate delete ' + name2)
|
||||||
|
|
||||||
def test_aggregate_properties(self):
|
cmd_output = json.loads(self.openstack(
|
||||||
opts = self.get_opts(['name', 'properties'])
|
'aggregate list -f json'))
|
||||||
|
names = [x['Name'] for x in cmd_output]
|
||||||
|
self.assertIn(name1, names)
|
||||||
|
self.assertIn(name2, names)
|
||||||
|
zones = [x['Availability Zone'] for x in cmd_output]
|
||||||
|
self.assertIn('nova', zones)
|
||||||
|
self.assertIn('internal', zones)
|
||||||
|
|
||||||
|
# Test aggregate list --long
|
||||||
|
cmd_output = json.loads(self.openstack(
|
||||||
|
'aggregate list --long -f json'))
|
||||||
|
names = [x['Name'] for x in cmd_output]
|
||||||
|
self.assertIn(name1, names)
|
||||||
|
self.assertIn(name2, names)
|
||||||
|
zones = [x['Availability Zone'] for x in cmd_output]
|
||||||
|
self.assertIn('nova', zones)
|
||||||
|
self.assertIn('internal', zones)
|
||||||
|
properties = [x['Properties'] for x in cmd_output]
|
||||||
|
self.assertIn({'a': 'b'}, properties)
|
||||||
|
self.assertIn({'c': 'd'}, properties)
|
||||||
|
|
||||||
|
def test_aggregate_set_and_unset(self):
|
||||||
|
"""Test aggregate set, show and unset"""
|
||||||
|
name1 = uuid.uuid4().hex
|
||||||
|
name2 = uuid.uuid4().hex
|
||||||
|
self.openstack(
|
||||||
|
'aggregate create ' +
|
||||||
|
'--zone nova ' +
|
||||||
|
'--property a=b ' +
|
||||||
|
name1)
|
||||||
|
self.addCleanup(self.openstack, 'aggregate delete ' + name2)
|
||||||
|
|
||||||
raw_output = self.openstack(
|
raw_output = self.openstack(
|
||||||
'aggregate set --property a=b --property c=d ' + self.NAME
|
'aggregate set --name ' +
|
||||||
|
name2 +
|
||||||
|
' --zone internal ' +
|
||||||
|
'--no-property ' +
|
||||||
|
'--property c=d ' +
|
||||||
|
name1
|
||||||
)
|
)
|
||||||
self.assertEqual('', raw_output)
|
self.assertOutput('', raw_output)
|
||||||
|
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
cmd_output = json.loads(self.openstack(
|
||||||
self.assertIn(self.NAME + "\na='b', c='d'\n", raw_output)
|
'aggregate show -f json ' + name2))
|
||||||
|
self.assertEqual(
|
||||||
raw_output = self.openstack(
|
name2,
|
||||||
'aggregate unset --property a ' + self.NAME
|
cmd_output['name']
|
||||||
)
|
)
|
||||||
self.assertEqual('', raw_output)
|
self.assertEqual(
|
||||||
|
'internal',
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
cmd_output['availability_zone']
|
||||||
self.assertIn(self.NAME + "\nc='d'\n", raw_output)
|
|
||||||
|
|
||||||
raw_output = self.openstack(
|
|
||||||
'aggregate set --property a=b --property c=d ' + self.NAME
|
|
||||||
)
|
)
|
||||||
self.assertEqual('', raw_output)
|
self.assertIn(
|
||||||
|
"c='d'",
|
||||||
raw_output = self.openstack(
|
cmd_output['properties']
|
||||||
'aggregate set --no-property ' + self.NAME
|
)
|
||||||
|
self.assertNotIn(
|
||||||
|
"a='b'",
|
||||||
|
cmd_output['properties']
|
||||||
)
|
)
|
||||||
self.assertEqual('', raw_output)
|
|
||||||
|
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
|
||||||
self.assertNotIn("a='b', c='d'", raw_output)
|
|
||||||
|
|
||||||
def test_aggregate_set(self):
|
|
||||||
opts = self.get_opts(["name", "availability_zone"])
|
|
||||||
|
|
||||||
|
# Test unset
|
||||||
raw_output = self.openstack(
|
raw_output = self.openstack(
|
||||||
'aggregate set --zone Zone_1 ' + self.NAME)
|
'aggregate unset --property c ' +
|
||||||
self.assertEqual("", raw_output)
|
name2
|
||||||
|
)
|
||||||
|
self.assertOutput('', raw_output)
|
||||||
|
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
cmd_output = json.loads(self.openstack(
|
||||||
self.assertEqual("Zone_1\n" + self.NAME + "\n", raw_output)
|
'aggregate show -f json ' + name2))
|
||||||
|
self.assertNotIn(
|
||||||
|
"c='d'",
|
||||||
|
cmd_output['properties']
|
||||||
|
)
|
||||||
|
|
||||||
def test_aggregate_add_and_remove_host(self):
|
def test_aggregate_add_and_remove_host(self):
|
||||||
opts = self.get_opts(["hosts", "name"])
|
"""Test aggregate add and remove host"""
|
||||||
|
name = uuid.uuid4().hex
|
||||||
raw_output = self.openstack('host list -f value -c "Host Name"')
|
|
||||||
host_name = raw_output.split()[0]
|
|
||||||
|
|
||||||
self.openstack(
|
self.openstack(
|
||||||
'aggregate add host ' + self.NAME + ' ' + host_name)
|
'aggregate create ' + name)
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
self.addCleanup(self.openstack, 'aggregate delete ' + name)
|
||||||
self.assertEqual("[u'" + host_name + "']" + "\n" + self.NAME + "\n",
|
|
||||||
raw_output)
|
|
||||||
|
|
||||||
self.openstack(
|
# Get a host
|
||||||
'aggregate remove host ' + self.NAME + ' ' + host_name)
|
cmd_output = json.loads(self.openstack(
|
||||||
raw_output = self.openstack('aggregate show ' + self.NAME + opts)
|
'host list -f json'))
|
||||||
self.assertEqual("[]\n" + self.NAME + "\n", raw_output)
|
host_name = cmd_output[0]['Host Name']
|
||||||
|
|
||||||
|
# Test add host
|
||||||
|
cmd_output = json.loads(self.openstack(
|
||||||
|
'aggregate add host -f json ' +
|
||||||
|
name + ' ' +
|
||||||
|
host_name
|
||||||
|
))
|
||||||
|
self.assertIn(
|
||||||
|
host_name,
|
||||||
|
cmd_output['hosts']
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test remove host
|
||||||
|
cmd_output = json.loads(self.openstack(
|
||||||
|
'aggregate remove host -f json ' +
|
||||||
|
name + ' ' +
|
||||||
|
host_name
|
||||||
|
))
|
||||||
|
self.assertNotIn(
|
||||||
|
host_name,
|
||||||
|
cmd_output['hosts']
|
||||||
|
)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user