openstack/rally
Code Issues Proposed changes

Merge "Fix MagnumClusters.create_and_list_clusters"

Browse Source
This commit is contained in:
Jenkins
2017-03-27 16:06:36 +00:00
committed by Gerrit Code Review
parent df2c1807a3 4ac0122e03
commit 35f9282a1a
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rally/plugins/openstack/scenarios/magnum/clusters.py
View File

@@ -61,8 +61,9 @@ class CreateAndListClusters(utils.MagnumScenario):
cluster_template_uuid = kwargs.get("cluster_template_uuid", None)
if cluster_template_uuid is None:
cluster_template_uuid = self.context["tenant"]["cluster_template"]
cluster = self._create_cluster(cluster_template_uuid,
node_count, **kwargs)
self.assertTrue(cluster)
list_clusters = self._list_clusters(**kwargs)
self.assertIn(cluster, list_clusters)
new_cluster = self._create_cluster(cluster_template_uuid,
node_count, **kwargs)
self.assertTrue(new_cluster, "Failed to create new cluster")
clusters = self._list_clusters(**kwargs)
self.assertIn(new_cluster.uuid, [cluster.uuid for cluster in clusters],
"New cluster not found in a list of clusters")

28
tests/unit/plugins/openstack/scenarios/magnum/test_clusters.py
View File

@@ -49,11 +49,13 @@ class MagnumClustersTestCase(test.ScenarioTestCase):
scenario = clusters.CreateAndListClusters()
kwargs = {"cluster_template_uuid": "existing_cluster_template_uuid",
"fakearg": "f"}
fake_cluster = mock.Mock()
scenario._create_cluster = mock.Mock(return_value=fake_cluster)
scenario._list_clusters = mock.Mock(return_value=[fake_cluster,
mock.Mock(),
mock.Mock()])
fake_cluster1 = mock.Mock(uuid="a")
fake_cluster2 = mock.Mock(uuid="b")
fake_cluster3 = mock.Mock(uuid="c")
scenario._create_cluster = mock.Mock(return_value=fake_cluster1)
scenario._list_clusters = mock.Mock(return_value=[fake_cluster1,
fake_cluster2,
fake_cluster3])
# Positive case
scenario.run(2, **kwargs)
@@ -70,7 +72,7 @@ class MagnumClustersTestCase(test.ScenarioTestCase):
"existing_cluster_template_uuid", 2, **kwargs)
# Negative case2: created cluster not in the list of available clusters
scenario._create_cluster.return_value = mock.MagicMock()
scenario._create_cluster.return_value = mock.Mock(uuid="foo")
self.assertRaises(exceptions.RallyAssertionError,
scenario.run, 2, **kwargs)
scenario._create_cluster.assert_called_with(
@@ -80,12 +82,14 @@ class MagnumClustersTestCase(test.ScenarioTestCase):
def test_create_and_list_clusters(self):
context = self._get_context()
scenario = clusters.CreateAndListClusters(context)
fake_cluster = mock.Mock()
fake_cluster1 = mock.Mock(uuid="a")
fake_cluster2 = mock.Mock(uuid="b")
fake_cluster3 = mock.Mock(uuid="c")
kwargs = {"fakearg": "f"}
scenario._create_cluster = mock.Mock(return_value=fake_cluster)
scenario._list_clusters = mock.Mock(return_value=[fake_cluster,
mock.Mock(),
mock.Mock()])
scenario._create_cluster = mock.Mock(return_value=fake_cluster1)
scenario._list_clusters = mock.Mock(return_value=[fake_cluster1,
fake_cluster2,
fake_cluster3])
# Positive case
scenario.run(2, **kwargs)
@@ -102,7 +106,7 @@ class MagnumClustersTestCase(test.ScenarioTestCase):
"rally_cluster_template_uuid", 2, **kwargs)
# Negative case2: created cluster not in the list of available clusters
scenario._create_cluster.return_value = mock.MagicMock()
scenario._create_cluster.return_value = mock.Mock(uuid="foo")
self.assertRaises(exceptions.RallyAssertionError,
scenario.run, 2, **kwargs)
scenario._create_cluster.assert_called_with(