return parser
def take_action(self, parsed_args):
- self.show(client.get(self.filter_by_name(pods_url(), parsed_args)))
+ columns = (
+ "name",
+ "_id",
+ "creator",
+ "role",
+ "mode",
+ "creation_date",
+ )
+
+ data = client.get(
+ self.filter_by_name(pods_url(), parsed_args)).get('pods', [])
+
+ return self.format_output(columns, data)
class PodGetOne(command.ShowOne):
return parser
def take_action(self, parsed_args):
- self.show(client.get(pod_url(parsed_args)))
+ return self.format_output(client.get(pod_url(parsed_args)))
-class PodCreate(command.Command):
+class PodCreate(command.ShowOne):
"Handle post request for pods"
def get_parser(self, prog_name):
@identity.authenticate
def take_action(self, parsed_args):
- self.show('Create',
- client.post(pods_url(), parsed_args.pod))
+ return self.format_output(client.post(pods_url(), parsed_args.pod))
class PodDelete(command.Command):
@identity.authenticate
def take_action(self, parsed_args):
- self.show('Delete',
- client.delete(pod_url(parsed_args)))
+ return client.delete(pod_url(parsed_args))
return parser
def take_action(self, parsed_args):
- self.show(client.get(self.filter_name(projects_url(), parsed_args)))
+ columns = (
+ 'name',
+ '_id',
+ 'creator',
+ 'creation_date'
+ )
+ data = client.get(
+ self.filter_by_name(projects_url(),
+ parsed_args)).get('projects', [])
+ return self.format_output(columns, data)
class ProjectGetOne(command.ShowOne):
return parser
def take_action(self, parsed_args):
- self.show(client.get(project_url(parsed_args)))
+ return self.format_output(client.get(project_url(parsed_args)))
-class ProjectCreate(command.Command):
+class ProjectCreate(command.ShowOne):
def get_parser(self, prog_name):
parser = super(ProjectCreate, self).get_parser(prog_name)
@identity.authenticate
def take_action(self, parsed_args):
- self.show('Create',
- client.post(projects_url(), parsed_args.project))
+ return self.format_output(
+ client.post(projects_url(), parsed_args.project))
class ProjectDelete(command.Command):
@identity.authenticate
def take_action(self, parsed_args):
- self.show('Delete',
- client.delete(project_url(parsed_args)))
+ return client.delete(project_url(parsed_args))
-class ProjectPut(command.Command):
+class ProjectPut(command.ShowOne):
def get_parser(self, prog_name):
parser = super(ProjectPut, self).get_parser(prog_name)
@identity.authenticate
def take_action(self, parsed_args):
- self.show('Update',
- client.put(project_url(parsed_args), parsed_args.project))
+ return self.format_output(
+ client.put(project_url(parsed_args), parsed_args.project))
+def get_item_properties(item, fields):
+ """Return a tuple containing the item properties.
+
+ :param item: a single item resource (e.g. Server, Project, etc)
+ :param fields: tuple of strings with the desired field names
+ """
+
+ return tuple([item.get(field, '') for field in fields])
+import abc
+import logging
+
from cliff import command
+from cliff import lister
+from cliff import show
+import six
+from testapiclient import utils
from testapiclient.utils import url_parse
+class CommandMeta(abc.ABCMeta):
+
+ def __new__(mcs, name, bases, cls_dict):
+ if 'log' not in cls_dict:
+ cls_dict['log'] = logging.getLogger(
+ cls_dict['__module__'] + '.' + name)
+ return super(CommandMeta, mcs).__new__(mcs, name, bases, cls_dict)
+
+
+@six.add_metaclass(CommandMeta)
class Command(command.Command):
+
def get_parser(self, prog_name):
parser = super(Command, self).get_parser(prog_name)
parser.add_argument('-u',
parser.add_argument('-p',
type=str,
help='Password for authentication')
-
return parser
- def show(self, request, response):
- print ' '.join([request,
- 'success' if response.status_code < 300
- else 'failed: {}'.format(response.reason)])
-
+ def run(self, parsed_args):
+ self.log.debug('run(%s)', parsed_args)
+ return super(Command, self).run(parsed_args)
-class Lister(command.Command):
+class Lister(Command, lister.Lister):
@staticmethod
def filter_by_name(url, parsed_args):
def query_url():
return query_url() if parsed_args.name else url
- def show(self, response):
- print response.json() if response.status_code < 300 \
- else 'Get failed: {}'.format(response.reason)
+ @staticmethod
+ def format_output(columns, data):
+ return (columns,
+ (utils.get_item_properties(s, columns) for s in data))
-class ShowOne(command.Command):
- def show(self, response):
- print response.json() if response.status_code < 300 \
- else 'Get failed: {}'.format(response.reason)
+class ShowOne(Command, show.ShowOne):
+ @staticmethod
+ def format_output(body):
+ return zip(*sorted(six.iteritems(body)))
+import httplib
import json
import requests
HTTPClient.__instance = self
def get(self, url):
- return requests.get(url)
+ return self._parse_response('Get', requests.get(url))
def post(self, url, data):
- return self._request('post', url,
- data=json.dumps(data),
- headers=self.headers)
+ return self._parse_response('Create',
+ self._request('post', url,
+ data=json.dumps(data),
+ headers=self.headers))
def put(self, url, data):
- return self._request('put', url,
- data=json.dumps(data),
- headers=self.headers)
+ return self._parse_response('Update',
+ self._request('put', url,
+ data=json.dumps(data),
+ headers=self.headers))
def delete(self, url, *args):
data = json.dumps(args[0]) if len(args) > 0 else None
- return self._request('delete', url,
- data=data,
- headers=self.headers)
+ return self._parse_response('Delete',
+ self._request('delete', url,
+ data=data,
+ headers=self.headers))
def _request(self, method, *args, **kwargs):
return getattr(user.User.session, method)(*args, **kwargs)
+ def _raise_failure(self, op, response):
+ raise Exception('{} failed: {}'.format(op, response.reason))
+
+ def _parse_response(self, op, response):
+ if response.status_code == httplib.OK:
+ return response.json() if op != 'Delete' else None
+ else:
+ self._raise_failure(op, response)
+
def _request(method, *args, **kwargs):
- client = HTTPClient.get_Instance()
- return getattr(client, method)(*args, **kwargs)
+ return getattr(HTTPClient.get_Instance(), method)(*args, **kwargs)
def get(url):
if "login" in response.text:
print "Authentication has failed."
return
- xstep(self, parsed_args)
+ return xstep(self, parsed_args)
return wrapper
Code Review / releng-testresults.git / commitdiff