From 3cda80e31af64eb182e2f5bfd976417221eefc9d Mon Sep 17 00:00:00 2001 From: Ilya Kharin Date: Mon, 7 Mar 2016 21:04:04 -0600 Subject: [PATCH] Use the 9.0 release in tests for cluster_upgrade This patch also renames names of variables in tests of the cluster_upgrade extension from more specific names that contain versions of releases to least specific names. Change-Id: Ic02b4426c1bb0bf38ba06cfeb54255043ebc8481 Closes-Bug: #1555339 --- cluster_upgrade/tests/base.py | 18 +++++------ cluster_upgrade/tests/test_handlers.py | 14 ++++----- cluster_upgrade/tests/test_upgrade.py | 38 ++++++++++++------------ cluster_upgrade/tests/test_validators.py | 38 ++++++++++++------------ 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/cluster_upgrade/tests/base.py b/cluster_upgrade/tests/base.py index 50b07c7..8d7ce10 100644 --- a/cluster_upgrade/tests/base.py +++ b/cluster_upgrade/tests/base.py @@ -26,26 +26,26 @@ class BaseCloneClusterTest(nailgun_test_base.BaseIntegrationTest): def setUp(self): super(BaseCloneClusterTest, self).setUp() - self.release_61 = self.env.create_release( + self.src_release = self.env.create_release( operating_system=consts.RELEASE_OS.ubuntu, version="2014.2.2-6.1", state=consts.RELEASE_STATES.manageonly ) - self.release_80 = self.env.create_release( + self.dst_release = self.env.create_release( operating_system=consts.RELEASE_OS.ubuntu, - version="liberty-8.0", + version="liberty-9.0", ) - self.cluster_61_db = self.env.create_cluster( + self.src_cluster_db = self.env.create_cluster( api=False, - release_id=self.release_61.id, + release_id=self.src_release.id, net_provider=consts.CLUSTER_NET_PROVIDERS.neutron, net_l23_provider=consts.NEUTRON_L23_PROVIDERS.ovs, ) - self.cluster_61 = adapters.NailgunClusterAdapter( - self.cluster_61_db) + self.src_cluster = adapters.NailgunClusterAdapter( + self.src_cluster_db) self.data = { - "name": "cluster-clone-{0}".format(self.cluster_61.id), - "release_id": self.release_80.id, + "name": "cluster-clone-{0}".format(self.src_cluster.id), + "release_id": self.dst_release.id, } diff --git a/cluster_upgrade/tests/test_handlers.py b/cluster_upgrade/tests/test_handlers.py index 736052c..d960be5 100644 --- a/cluster_upgrade/tests/test_handlers.py +++ b/cluster_upgrade/tests/test_handlers.py @@ -29,14 +29,14 @@ class TestClusterUpgradeCloneHandler(tests_base.BaseCloneClusterTest): def test_clone(self): resp = self.app.post( reverse("ClusterUpgradeCloneHandler", - kwargs={"cluster_id": self.cluster_61.id}), + kwargs={"cluster_id": self.src_cluster.id}), jsonutils.dumps(self.data), headers=self.default_headers) body = resp.json_body self.assertEqual(resp.status_code, 200) self.assertEqual(body["name"], - "cluster-clone-{0}".format(self.cluster_61.id)) - self.assertEqual(body["release_id"], self.release_80.id) + "cluster-clone-{0}".format(self.src_cluster.id)) + self.assertEqual(body["release_id"], self.dst_release.id) def test_clone_cluster_not_found_error(self): resp = self.app.post( @@ -51,22 +51,22 @@ class TestClusterUpgradeCloneHandler(tests_base.BaseCloneClusterTest): def test_clone_cluster_already_in_upgrade_error(self): self.app.post( reverse("ClusterUpgradeCloneHandler", - kwargs={"cluster_id": self.cluster_61.id}), + kwargs={"cluster_id": self.src_cluster.id}), jsonutils.dumps(self.data), headers=self.default_headers) resp = self.app.post( reverse("ClusterUpgradeCloneHandler", - kwargs={"cluster_id": self.cluster_61.id}), + kwargs={"cluster_id": self.src_cluster.id}), jsonutils.dumps(self.data), headers=self.default_headers, expect_errors=True) self.assertEqual(resp.status_code, 400) def test_clone_cluster_name_already_exists_error(self): - data = dict(self.data, name=self.cluster_61.name) + data = dict(self.data, name=self.src_cluster.name) resp = self.app.post( reverse("ClusterUpgradeCloneHandler", - kwargs={"cluster_id": self.cluster_61.id}), + kwargs={"cluster_id": self.src_cluster.id}), jsonutils.dumps(data), headers=self.default_headers, expect_errors=True) diff --git a/cluster_upgrade/tests/test_upgrade.py b/cluster_upgrade/tests/test_upgrade.py index 4eeda80..723f0ee 100644 --- a/cluster_upgrade/tests/test_upgrade.py +++ b/cluster_upgrade/tests/test_upgrade.py @@ -25,32 +25,32 @@ from ..objects import relations class TestUpgradeHelperCloneCluster(base_tests.BaseCloneClusterTest): def test_create_cluster_clone(self): - new_cluster = self.helper.create_cluster_clone(self.cluster_61, + new_cluster = self.helper.create_cluster_clone(self.src_cluster, self.data) - cluster_61_data = self.cluster_61.get_create_data() + src_cluster_data = self.src_cluster.get_create_data() new_cluster_data = new_cluster.get_create_data() - for key, value in cluster_61_data.items(): + for key, value in src_cluster_data.items(): if key in ("name", "release_id"): continue self.assertEqual(value, new_cluster_data[key]) def test_copy_attributes(self): - new_cluster = self.helper.create_cluster_clone(self.cluster_61, + new_cluster = self.helper.create_cluster_clone(self.src_cluster, self.data) - self.assertNotEqual(self.cluster_61.generated_attrs, + self.assertNotEqual(self.src_cluster.generated_attrs, new_cluster.generated_attrs) # Do some unordinary changes - attrs = copy.deepcopy(self.cluster_61.editable_attrs) + attrs = copy.deepcopy(self.src_cluster.editable_attrs) attrs["access"]["user"]["value"] = "operator" attrs["access"]["password"]["value"] = "secrete" - self.cluster_61.editable_attrs = attrs + self.src_cluster.editable_attrs = attrs - self.helper.copy_attributes(self.cluster_61, new_cluster) + self.helper.copy_attributes(self.src_cluster, new_cluster) - self.assertEqual(self.cluster_61.generated_attrs, + self.assertEqual(self.src_cluster.generated_attrs, new_cluster.generated_attrs) - editable_attrs = self.cluster_61.editable_attrs + editable_attrs = self.src_cluster.editable_attrs for section, params in six.iteritems(new_cluster.editable_attrs): if section == "repo_setup": continue @@ -61,15 +61,15 @@ class TestUpgradeHelperCloneCluster(base_tests.BaseCloneClusterTest): value["value"]) def test_copy_network_config(self): - new_cluster = self.helper.create_cluster_clone(self.cluster_61, + new_cluster = self.helper.create_cluster_clone(self.src_cluster, self.data) - orig_net_manager = self.cluster_61.get_network_manager() + orig_net_manager = self.src_cluster.get_network_manager() serialize_nets = network_configuration.\ NeutronNetworkConfigurationSerializer.\ serialize_for_cluster # Do some unordinary changes - nets = serialize_nets(self.cluster_61.cluster) + nets = serialize_nets(self.src_cluster.cluster) nets["networks"][0].update({ "cidr": "172.16.42.0/24", "gateway": "172.16.42.1", @@ -78,9 +78,9 @@ class TestUpgradeHelperCloneCluster(base_tests.BaseCloneClusterTest): orig_net_manager.update(nets) orig_net_manager.assign_vips_for_net_groups() - self.helper.copy_network_config(self.cluster_61, new_cluster) + self.helper.copy_network_config(self.src_cluster, new_cluster) - orig_nets = serialize_nets(self.cluster_61_db) + orig_nets = serialize_nets(self.src_cluster_db) new_nets = serialize_nets(new_cluster.cluster) self.assertEqual(orig_nets["management_vip"], new_nets["management_vip"]) @@ -92,10 +92,10 @@ class TestUpgradeHelperCloneCluster(base_tests.BaseCloneClusterTest): new_nets["public_vrouter_vip"]) def test_clone_cluster(self): - orig_net_manager = self.cluster_61.get_network_manager() + orig_net_manager = self.src_cluster.get_network_manager() orig_net_manager.assign_vips_for_net_groups() - new_cluster = self.helper.clone_cluster(self.cluster_61, self.data) + new_cluster = self.helper.clone_cluster(self.src_cluster, self.data) relation = relations.UpgradeRelationObject.get_cluster_relation( - self.cluster_61.id) - self.assertEqual(relation.orig_cluster_id, self.cluster_61.id) + self.src_cluster.id) + self.assertEqual(relation.orig_cluster_id, self.src_cluster.id) self.assertEqual(relation.seed_cluster_id, new_cluster.id) diff --git a/cluster_upgrade/tests/test_validators.py b/cluster_upgrade/tests/test_validators.py index c449a06..ac906f5 100644 --- a/cluster_upgrade/tests/test_validators.py +++ b/cluster_upgrade/tests/test_validators.py @@ -33,8 +33,8 @@ class TestClusterUpgradeValidator(tests_base.BaseCloneClusterTest): validator = validators.ClusterUpgradeValidator def test_validate_release_upgrade(self): - self.validator.validate_release_upgrade(self.release_61, - self.release_80) + self.validator.validate_release_upgrade(self.src_release, + self.dst_release) @mock.patch.dict(settings.VERSION, {'feature_groups': []}) def test_validate_release_upgrade_deprecated_release(self): @@ -44,53 +44,53 @@ class TestClusterUpgradeValidator(tests_base.BaseCloneClusterTest): state=consts.RELEASE_STATES.manageonly ) msg = "^Upgrade to the given release \({0}\).*is deprecated and " \ - "cannot be installed\.$".format(self.release_61.id) + "cannot be installed\.$".format(self.src_release.id) with self.assertRaisesRegexp(errors.InvalidData, msg): self.validator.validate_release_upgrade(release_511, - self.release_61) + self.src_release) def test_validate_release_upgrade_to_older_release(self): - self.release_61.state = consts.RELEASE_STATES.available + self.src_release.state = consts.RELEASE_STATES.available msg = "^Upgrade to the given release \({0}\).*release is equal or " \ "lower than the release of the original cluster\.$" \ - .format(self.release_61.id) + .format(self.src_release.id) with self.assertRaisesRegexp(errors.InvalidData, msg): - self.validator.validate_release_upgrade(self.release_80, - self.release_61) + self.validator.validate_release_upgrade(self.dst_release, + self.src_release) def test_validate_cluster_name(self): self.validator.validate_cluster_name("cluster-42") def test_validate_cluster_name_already_exists(self): msg = "^Environment with this name '{0}' already exists\.$"\ - .format(self.cluster_61.name) + .format(self.src_cluster.name) with self.assertRaisesRegexp(errors.AlreadyExists, msg): - self.validator.validate_cluster_name(self.cluster_61.name) + self.validator.validate_cluster_name(self.src_cluster.name) def test_validate_cluster_status(self): - self.validator.validate_cluster_status(self.cluster_61) + self.validator.validate_cluster_status(self.src_cluster) def test_validate_cluster_status_invalid(self): - cluster_80 = self.env.create_cluster( + dst_cluster = self.env.create_cluster( api=False, - release_id=self.release_80.id, + release_id=self.dst_release.id, ) - relations.UpgradeRelationObject.create_relation(self.cluster_61.id, - cluster_80.id) + relations.UpgradeRelationObject.create_relation(self.src_cluster.id, + dst_cluster.id) msg = "^Upgrade is not possible because of the original cluster " \ "\({0}\) is already involved in the upgrade routine\.$" \ - .format(self.cluster_61.id) + .format(self.src_cluster.id) with self.assertRaisesRegexp(errors.InvalidData, msg): - self.validator.validate_cluster_status(self.cluster_61) + self.validator.validate_cluster_status(self.src_cluster) def test_validate(self): data = jsonutils.dumps(self.data) - self.validator.validate(data, self.cluster_61) + self.validator.validate(data, self.src_cluster) def test_validate_invalid_data(self): data = "{}" with self.assertRaises(errors.InvalidData): - self.validator.validate(data, self.cluster_61) + self.validator.validate(data, self.src_cluster) class TestNodeReassignValidator(base.BaseTestCase):