Replace @content decorator with all that madness
Change Ia3da3bd809bcca923d53666eca54def78c995f65 broke our handlers as it incorporated destructive changes to all handlers. Change-Id: I688e833b1fb8b658f01b7f858a140c315fa513a2
This commit is contained in:
parent
ff448b2d81
commit
6150aaca88
|
@ -29,7 +29,9 @@ class ClusterUpgradeCloneHandler(base.BaseHandler):
|
||||||
single = objects.Cluster
|
single = objects.Cluster
|
||||||
validator = validators.ClusterUpgradeValidator
|
validator = validators.ClusterUpgradeValidator
|
||||||
|
|
||||||
@base.content
|
@base.handle_errors
|
||||||
|
@base.validate
|
||||||
|
@base.serialize
|
||||||
def POST(self, cluster_id):
|
def POST(self, cluster_id):
|
||||||
"""Initialize the upgrade of the cluster.
|
"""Initialize the upgrade of the cluster.
|
||||||
|
|
||||||
|
@ -50,7 +52,7 @@ class ClusterUpgradeCloneHandler(base.BaseHandler):
|
||||||
request_data = self.checked_data(cluster=orig_cluster)
|
request_data = self.checked_data(cluster=orig_cluster)
|
||||||
new_cluster = upgrade.UpgradeHelper.clone_cluster(orig_cluster,
|
new_cluster = upgrade.UpgradeHelper.clone_cluster(orig_cluster,
|
||||||
request_data)
|
request_data)
|
||||||
return new_cluster.to_json()
|
return new_cluster.to_dict()
|
||||||
|
|
||||||
|
|
||||||
class NodeReassignHandler(base.BaseHandler):
|
class NodeReassignHandler(base.BaseHandler):
|
||||||
|
@ -67,7 +69,8 @@ class NodeReassignHandler(base.BaseHandler):
|
||||||
|
|
||||||
self.raise_task(task)
|
self.raise_task(task)
|
||||||
|
|
||||||
@base.content
|
@base.handle_errors
|
||||||
|
@base.validate
|
||||||
def POST(self, cluster_id):
|
def POST(self, cluster_id):
|
||||||
"""Reassign node to the given cluster.
|
"""Reassign node to the given cluster.
|
||||||
|
|
||||||
|
@ -107,7 +110,8 @@ class CopyVIPsHandler(base.BaseHandler):
|
||||||
single = objects.Cluster
|
single = objects.Cluster
|
||||||
validator = validators.CopyVIPsValidator
|
validator = validators.CopyVIPsValidator
|
||||||
|
|
||||||
@base.content
|
@base.handle_errors
|
||||||
|
@base.validate
|
||||||
def POST(self, cluster_id):
|
def POST(self, cluster_id):
|
||||||
"""Copy VIPs from original cluster to new one
|
"""Copy VIPs from original cluster to new one
|
||||||
|
|
||||||
|
|
|
@ -74,8 +74,8 @@ class NailgunClusterAdapter(object):
|
||||||
instance=self.cluster)
|
instance=self.cluster)
|
||||||
return NailgunNetworkManager(self.cluster, net_manager)
|
return NailgunNetworkManager(self.cluster, net_manager)
|
||||||
|
|
||||||
def to_json(self):
|
def to_dict(self):
|
||||||
return objects.Cluster.to_json(self.cluster)
|
return objects.Cluster.to_dict(self.cluster)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_by_uid(cls, cluster_id):
|
def get_by_uid(cls, cluster_id):
|
||||||
|
|
Loading…
Reference in New Issue