From 1d8bfe5435c9d08b62057dce91d04c6cce0482a7 Mon Sep 17 00:00:00 2001 From: Oleg Gelbukh Date: Fri, 30 Oct 2015 13:54:28 +0000 Subject: [PATCH] Rename ClusterUpgradeHandler Name ClusterUpgradeHandler should be used for handling uri /cluster//upgrade. Current handler performs clone of environment for upgrading. Thus, rename ClusterUpgradeHandler to ClusterUpgradeCloneHandler. Blueprint: upgrade-major-openstack-environment Change-Id: I6c98e0882c300d587caa32429b49b22baa9ad82f --- cluster_upgrade/extension.py | 2 +- cluster_upgrade/handlers.py | 2 +- cluster_upgrade/tests/test_handlers.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster_upgrade/extension.py b/cluster_upgrade/extension.py index d83df48..36243c6 100644 --- a/cluster_upgrade/extension.py +++ b/cluster_upgrade/extension.py @@ -27,7 +27,7 @@ class ClusterUpgradeExtension(extensions.BaseExtension): urls = [ {'uri': r'/clusters/(?P\d+)/upgrade/clone/?$', - 'handler': handlers.ClusterUpgradeHandler}, + 'handler': handlers.ClusterUpgradeCloneHandler}, {'uri': r'/clusters/(?P\d+)/upgrade/assign/?$', 'handler': handlers.NodeReassignHandler}, ] diff --git a/cluster_upgrade/handlers.py b/cluster_upgrade/handlers.py index 1ef1ae1..eb5f64c 100644 --- a/cluster_upgrade/handlers.py +++ b/cluster_upgrade/handlers.py @@ -25,7 +25,7 @@ from . import validators from .objects import adapters -class ClusterUpgradeHandler(base.BaseHandler): +class ClusterUpgradeCloneHandler(base.BaseHandler): single = objects.Cluster validator = validators.ClusterUpgradeValidator diff --git a/cluster_upgrade/tests/test_handlers.py b/cluster_upgrade/tests/test_handlers.py index c89ca9a..f2e521a 100644 --- a/cluster_upgrade/tests/test_handlers.py +++ b/cluster_upgrade/tests/test_handlers.py @@ -25,10 +25,10 @@ from nailgun.utils import reverse from . import base as tests_base -class TestClusterUpgradeHandler(tests_base.BaseCloneClusterTest): +class TestClusterUpgradeCloneHandler(tests_base.BaseCloneClusterTest): def test_clone(self): resp = self.app.post( - reverse("ClusterUpgradeHandler", + reverse("ClusterUpgradeCloneHandler", kwargs={"cluster_id": self.cluster_61.id}), jsonutils.dumps(self.data), headers=self.default_headers) @@ -40,7 +40,7 @@ class TestClusterUpgradeHandler(tests_base.BaseCloneClusterTest): def test_clone_cluster_not_found_error(self): resp = self.app.post( - reverse("ClusterUpgradeHandler", + reverse("ClusterUpgradeCloneHandler", kwargs={"cluster_id": 42}), jsonutils.dumps(self.data), headers=self.default_headers, @@ -50,12 +50,12 @@ class TestClusterUpgradeHandler(tests_base.BaseCloneClusterTest): def test_clone_cluster_already_in_upgrade_error(self): self.app.post( - reverse("ClusterUpgradeHandler", + reverse("ClusterUpgradeCloneHandler", kwargs={"cluster_id": self.cluster_61.id}), jsonutils.dumps(self.data), headers=self.default_headers) resp = self.app.post( - reverse("ClusterUpgradeHandler", + reverse("ClusterUpgradeCloneHandler", kwargs={"cluster_id": self.cluster_61.id}), jsonutils.dumps(self.data), headers=self.default_headers, @@ -65,7 +65,7 @@ class TestClusterUpgradeHandler(tests_base.BaseCloneClusterTest): def test_clone_cluster_name_already_exists_error(self): data = dict(self.data, name=self.cluster_61.name) resp = self.app.post( - reverse("ClusterUpgradeHandler", + reverse("ClusterUpgradeCloneHandler", kwargs={"cluster_id": self.cluster_61.id}), jsonutils.dumps(data), headers=self.default_headers,