Revised cluster-create and cluster-show commands

senlinclient/common/sdk.py

@@ -104,17 +104,6 @@ class Resource(base.Resource):
             value = cls.existing(**data)
             yield value
 
-    def create(self, session):
-        '''Overriden version of the create method.
-
-        We want to know more about the object being created, so the response
-        should not be just thrown away
-        '''
-        resp = self.create_by_id(session, self._attrs, self.id, path_args=self)
-        self._attrs[self.id_attribute] = resp[self.id_attribute]
-        self._reset_dirty()
-        return self
-
 
 def create_connection(preferences, user_agent, **kwargs):
         try:

senlinclient/v1/models.py

@@ -175,6 +175,7 @@ class Policy(resource.Resource):
 
 
 class Cluster(resource.Resource):
+    resource_key = 'cluster'
     resources_key = 'clusters'
     base_path = '/clusters'
     service = clustering_service.ClusteringService()
@@ -203,8 +204,11 @@ class Cluster(resource.Resource):
     status_reason = resource.prop('status_reason')
     tags = resource.prop('tags', type=dict)
     data = resource.prop('data', type=dict)
+
     nodes = resource.prop('nodes')
+
     profile_name = resource.prop('profile_name')
+    action = resource.prop('action')
 
     def to_dict(self):
         info = {

senlinclient/v1/shell.py

@@ -256,6 +256,20 @@ def do_cluster_list(sc, args=None):
     utils.print_list(clusters, fields, sortby_index=3)
 
 
+def _show_cluster(sc, cluster_id):
+    try:
+        query = {'id': cluster_id}
+        cluster = sc.get(models.Cluster, query)
+    except exc.HTTPNotFound:
+        raise exc.CommandError(_('Cluster %s is not found') % args.id)
+
+    formatters = {
+        'tags': utils.json_formatter,
+        'nodes': utils.list_formatter,
+    }
+    utils.print_dict(cluster.to_dict(), formatters=formatters)
+
+
 @utils.arg('-p', '--profile', metavar='<PROFILE ID>',
            help=_('Profile Id used for this cluster.'))
 @utils.arg('-n', '--size', metavar='<NUMBER>',
@@ -282,11 +296,8 @@ def do_cluster_create(sc, args):
         'timeout': args.timeout
     }
 
-    cluster, resp = sc.create(models.Cluster, params)
+    cluster = sc.create(models.Cluster, params)
-    print(_('Action CLUSTER_CREATE(%(action)s) scheduled for '
+    _show_cluster(sc, cluster.id)
-            'cluster %(cluster)s') % {
-                'action': resp['action_id'],
-                'cluster': resp['id']})
 
 
 @utils.arg('id', metavar='<NAME or ID>', nargs='+',
@@ -343,17 +354,7 @@ def do_cluster_update(sc, args):
            help=_('Name or ID of cluster to show.'))
 def do_cluster_show(sc, args):
     '''Show details of the cluster.'''
-    try:
+    _show_cluster(sc, args.id)
-        query = {'id': args.id}
-        cluster = sc.get(models.Cluster, query)
-    except exc.HTTPNotFound:
-        raise exc.CommandError(_('Cluster %s is not found') % args.id)
-
-    formatters = {
-        'tags': utils.json_formatter,
-        'nodes': utils.list_formatter,
-    }
-    utils.print_dict(cluster.to_dict(), formatters=formatters)
 
 
 @utils.arg('-s', '--show-deleted', default=False, action="store_true",