From 697a5ac6cba6eb5c59e6b479153f4550c537ac3e Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 1 Jun 2012 11:17:30 -0500 Subject: Refactor cliff.Command.run() * All commands now perform their action in take_action(). Those producing output are derived from DisplayCommandBase. Change-Id: Ic93ba9a2ad449d84242b6aa8624b41379c4fb79a --- openstackclient/compute/v2/server.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'openstackclient/compute') diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index ab7ef93e..e72c5735 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -22,10 +22,10 @@ Server action implementations import logging import os +from cliff import command from cliff import lister from cliff import show -from openstackclient.common import command from openstackclient.common import utils @@ -44,7 +44,7 @@ def _format_servers_list_networks(server): return '; '.join(output) -class ListServer(command.OpenStackCommand, lister.Lister): +class ListServer(lister.Lister): """List server command""" api = 'compute' @@ -98,8 +98,8 @@ class ListServer(command.OpenStackCommand, lister.Lister): ) return parser - def get_data(self, parsed_args): - self.log.debug('get_data(%s)' % parsed_args) + def take_action(self, parsed_args): + self.log.debug('take_action(%s)' % parsed_args) nova_client = self.app.client_manager.compute search_opts = { 'all_tenants': parsed_args.all_tenants, @@ -125,7 +125,7 @@ class ListServer(command.OpenStackCommand, lister.Lister): ) -class ShowServer(command.OpenStackCommand, show.ShowOne): +class ShowServer(show.ShowOne): """Show server command""" api = 'compute' @@ -139,8 +139,8 @@ class ShowServer(command.OpenStackCommand, show.ShowOne): help='Name or ID of server to display') return parser - def get_data(self, parsed_args): - self.log.debug('get_data(%s)' % parsed_args) + def take_action(self, parsed_args): + self.log.debug('take_action(%s)' % parsed_args) nova_client = self.app.client_manager.compute server = utils.find_resource(nova_client.servers, parsed_args.server) -- cgit v1.2.1