diff options
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/utils.py | 8 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 8 | ||||
| -rw-r--r-- | openstackclient/utils.py.dt | 131 |
3 files changed, 14 insertions, 133 deletions
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py index edd71f95..9e704c97 100644 --- a/openstackclient/common/utils.py +++ b/openstackclient/common/utils.py @@ -12,13 +12,19 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +""" +Common client utilities +""" import os import uuid import prettytable -from glanceclient.common import exceptions +from openstackclient.common import exceptions # Decorator for cli-args diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 9ca3f142..b3ced543 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -12,8 +12,14 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +""" +Server action implementations +""" -from glanceclient.common import utils +from openstackclient.common import utils def _find_server(cs, server): diff --git a/openstackclient/utils.py.dt b/openstackclient/utils.py.dt deleted file mode 100644 index 3719a2a8..00000000 --- a/openstackclient/utils.py.dt +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 2011 OpenStack LLC. -# 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. -# -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -""" -Utility functions for OpenStack Client -""" - -import copy - -import prettytable - -#from novaclient import utils - - -# lifted from glance/common/utils.py -def bool_from_string(subject): - """ - Interpret a string as a boolean. - - Any string value in: - ('True', 'true', 'On', 'on', '1') - is interpreted as a boolean True. - - Useful for JSON-decoded stuff and config file parsing - """ - if isinstance(subject, bool): - return subject - elif isinstance(subject, int): - return subject == 1 - if hasattr(subject, 'startswith'): # str or unicode... - if subject.strip().lower() in ('true', 'on', '1'): - return True - return False - - -# lifted from keystoneclient/base.py -def getid(obj): - """ - Abstracts the common pattern of allowing both an object or an object's ID - (UUID) as a parameter when dealing with relationships. - """ - - # Try to return the object's UUID first, if we have a UUID. - try: - if obj.uuid: - return obj.uuid - except AttributeError: - pass - try: - return obj.id - except AttributeError: - return obj - - -def show_object(manager, id, fields=None): - """Check id, lookup object, display result fields""" - if not id: - print "no id specified" - return - obj = manager.get(id) - print_obj_fields(obj, fields) - - -def print_obj_fields(obj, fields=[]): - """Print specified object fields""" - # Select the fields to print, then passthrough to novaclient - a = {name: getattr(obj, name, '') for name in fields} - utils.print_dict(a) - - -def print_dict_fields(obj, fields=[]): - """Print specified object fields""" - # Select the fields to print, then passthrough to novaclient - a = {name: obj[name] for name in fields} - utils.print_dict(a) - - -def print_dict_list(objs, fields, formatters={}): - """Print list of dicts""" - mixed_case_fields = [] - pt = prettytable.PrettyTable([f for f in fields], caching=False) - pt.aligns = ['l' for f in fields] - - for o in objs: - row = [] - for field in fields: - if field in formatters: - row.append(formatters[field](o)) - else: - if field in mixed_case_fields: - field_name = field.replace(' ', '_') - else: - field_name = field.lower().replace(' ', '_') - data = o[field_name] - row.append(data) - pt.add_row(row) - - pt.printt(sortby=fields[0]) - - -def print_list(objs, fields, formatters={}): - """Print list of objects""" - # Passthrough to novaclient - utils.print_list(objs, fields, formatters=formatters) - - -def expand_meta(objs, field): - """Expand metadata fields in an object""" - ret = [] - for oldobj in objs: - newobj = copy.deepcopy(oldobj) - ex = getattr(newobj, field, {}) - for f in ex.keys(): - setattr(newobj, f, ex[f]) - delattr(newobj, field) - ret.append(newobj) - return ret |