openstack
/
fuel-nailgun-extension-cluster-upgrade
Code Issues Proposed changes

Rename ClusterUpgradeHandler 

Name ClusterUpgradeHandler should be used for handling uri
/cluster/<id>/upgrade.

Current handler performs clone of environment for upgrading. Thus, rename
ClusterUpgradeHandler to ClusterUpgradeCloneHandler.

Blueprint: upgrade-major-openstack-environment
Change-Id: I6c98e0882c300d587caa32429b49b22baa9ad82f
This commit is contained in:
Oleg Gelbukh 2015-10-30 13:54:28 +00:00 committed by Nikita Zubkov
parent 84ece08e25
commit 0e73f2122d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster_upgrade/extension.py
View File

@ -27,7 +27,7 @@ class ClusterUpgradeExtension(extensions.BaseExtension):
urls = [
{'uri': r'/clusters/(?P<cluster_id>\d+)/upgrade/clone/?$',
'handler': handlers.ClusterUpgradeHandler},
'handler': handlers.ClusterUpgradeCloneHandler},
{'uri': r'/clusters/(?P<cluster_id>\d+)/upgrade/assign/?$',
'handler': handlers.NodeReassignHandler},
]

2
cluster_upgrade/handlers.py
View File

@ -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

12
cluster_upgrade/tests/test_handlers.py
View File

@ -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,