From 4b445f24d664d0ed720293aeeaa5a6a195e51d06 Mon Sep 17 00:00:00 2001
From: liguomin <li.guomin2@zte.com.cn>
Date: Thu, 30 Mar 2017 13:28:58 +0800
Subject: support all cluster update option
Change-Id: I0ff8951d9106535ed8ee0b1fbdba345c52a00dc8
Signed-off-by: liguomin <li.guomin2@zte.com.cn>
---
client/escalatorclient/v1/client.py | 2 +
client/escalatorclient/v1/shell.py | 25 +++++++++
client/escalatorclient/v1/update.py | 105 ++++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
create mode 100644 client/escalatorclient/v1/update.py
(limited to 'client')
diff --git a/client/escalatorclient/v1/client.py b/client/escalatorclient/v1/client.py
index 974fc4e..bda8bf9 100644
--- a/client/escalatorclient/v1/client.py
+++ b/client/escalatorclient/v1/client.py
@@ -17,6 +17,7 @@ from escalatorclient.common import http
from escalatorclient.common import utils
from escalatorclient.v1.versions import VersionManager
from escalatorclient.v1.clusters import ClusterManager
+from escalatorclient.v1.update import UpdateManager
class Client(object):
@@ -36,3 +37,4 @@ class Client(object):
self.http_client = http.HTTPClient(endpoint, *args, **kwargs)
self.versions = VersionManager(self.http_client)
self.clusters = ClusterManager(self.http_client)
+ self.update = UpdateManager(self.http_client)
diff --git a/client/escalatorclient/v1/shell.py b/client/escalatorclient/v1/shell.py
index 10aa1bc..501f01b 100644
--- a/client/escalatorclient/v1/shell.py
+++ b/client/escalatorclient/v1/shell.py
@@ -20,6 +20,7 @@ import functools
from oslo_utils import strutils
import escalatorclient.v1.versions
import escalatorclient.v1.clusters
+import escalatorclient.v1.update
from escalatorclient.common import utils
_bool_strict = functools.partial(strutils.bool_from_string, strict=True)
@@ -138,3 +139,27 @@ def do_cluster_detail(gc, args):
columns = ['ID', 'Name', 'Description', 'Nodes',
'Networks', 'Auto_scale', 'Use_dns']
utils.print_list(cluster, columns)
+
+
+@utils.arg('cluster_id', metavar='<CLUSTER_ID>',
+ help='The cluster ID to update os and TECS.')
+@utils.arg('--hosts', metavar='<HOSTS>', nargs='+',
+ help='The host ID to update')
+@utils.arg('--update-object', metavar='<UPDATE_OBJECT>',
+ help='update object:vplat or tecs or zenic......')
+@utils.arg('--version-id', metavar='<VERSION>',
+ help='if not patch, update version id is used to update.')
+@utils.arg('--version-patch-id', metavar='<VERSION_PATCH>',
+ help='if update version patch, version patch id is needed')
+@utils.arg('--update-script', metavar='<UPDATE_SCRIPT>',
+ help='update script in /var/lib/daisy/os')
+def do_update(gc, args):
+ """update TECS."""
+ fields = dict(filter(lambda x: x[1] is not None, vars(args).items()))
+
+ # Filter out values we can't use
+ CREATE_PARAMS = escalatorclient.v1.update.CREATE_PARAMS
+ fields = dict(filter(lambda x: x[0] in CREATE_PARAMS, fields.items()))
+
+ update = gc.update.update(**fields)
+ _escalator_show(update)
diff --git a/client/escalatorclient/v1/update.py b/client/escalatorclient/v1/update.py
new file mode 100644
index 0000000..6989a0a
--- /dev/null
+++ b/client/escalatorclient/v1/update.py
@@ -0,0 +1,105 @@
+# Copyright 2012 OpenStack Foundation
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import copy
+import six
+
+from escalatorclient.common import utils
+from escalatorclient.openstack.common.apiclient import base
+
+CREATE_PARAMS = (
+ 'cluster_id', 'version_id', 'version_patch_id', 'hosts',
+ 'update_object', 'update_script')
+
+OS_REQ_ID_HDR = 'x-openstack-request-id'
+
+
+class Update(base.Resource):
+ def __repr__(self):
+ return "<Update %s>" % self._info
+
+ def update(self, **fields):
+ self.manager.update(self, **fields)
+
+ def data(self, **kwargs):
+ return self.manager.data(self, **kwargs)
+
+
+class UpdateManager(base.ManagerWithFind):
+ resource_class = Update
+
+ def _Update_meta_to_headers(self, fields):
+ headers = {}
+ fields_copy = copy.deepcopy(fields)
+
+ # NOTE(flaper87): Convert to str, headers
+ # that are not instance of basestring. All
+ # headers will be encoded later, before the
+ # request is sent.
+
+ for key, value in six.iteritems(fields_copy):
+ headers['%s' % key] = utils.to_str(value)
+ return headers
+
+ @staticmethod
+ def _format_update_meta_for_user(meta):
+ for key in ['size', 'min_ram', 'min_disk']:
+ if key in meta:
+ try:
+ meta[key] = int(meta[key]) if meta[key] else 0
+ except ValueError:
+ pass
+ return meta
+
+ def list(self, **kwargs):
+ pass
+
+ def query_progress(self, **kwargs):
+ fields = {}
+ for field in kwargs:
+ if field in CREATE_PARAMS:
+ fields[field] = kwargs[field]
+ else:
+ msg = 'update() got an unexpected argument \'%s\''
+ raise TypeError(msg % field)
+
+ if "cluster" in fields:
+ url = '/v1/update/%s' % fields['cluster_id']
+
+ resp, body = self.client.get(url)
+ return Update(self, self._format_update_meta_for_user(body))
+
+ def update(self, **kwargs):
+ """Update a cluster
+
+ TODO(bcwaldon): document accepted params
+ """
+
+ fields = {}
+ for field in kwargs:
+ if field in CREATE_PARAMS:
+ fields[field] = kwargs[field]
+ elif field == 'return_req_id':
+ continue
+ else:
+ msg = 'update() got an unexpected argument \'%s\''
+ raise TypeError(msg % field)
+
+ if "cluster_id" in fields:
+ url = '/v1/update/%s' % fields['cluster_id']
+
+ hdrs = self._Update_meta_to_headers(fields)
+ resp, body = self.client.post(url, headers=None, data=hdrs)
+ return Update(self, self._format_update_meta_for_user(body))
--
cgit