From 4f8403b251bf4a4f4044b9bf218f10311da06686 Mon Sep 17 00:00:00 2001 From: Uggla Date: Fri, 12 Feb 2016 15:57:28 +0100 Subject: [PATCH] Pypi distribution - Modify sources to allow Pypi distribution --- redfish-client/templates/bla.templates | 32 ---- redfish/__init__.py | 5 +- redfish/old/functions.py | 49 ------ redfish/old/types.py | 197 ------------------------- setup.cfg | 15 +- 5 files changed, 12 insertions(+), 286 deletions(-) delete mode 100644 redfish-client/templates/bla.templates delete mode 100644 redfish/old/functions.py delete mode 100644 redfish/old/types.py diff --git a/redfish-client/templates/bla.templates b/redfish-client/templates/bla.templates deleted file mode 100644 index 23b6b61..0000000 --- a/redfish-client/templates/bla.templates +++ /dev/null @@ -1,32 +0,0 @@ - #======================================================================= - # print('Redfish API version : %s' % remote_mgmt.get_api_version()) - # print(remote_mgmt.Root.get_name()) - # print('\n') - # print('Managers information :') - # print('----------------------') - # for manager_index in sorted(remote_mgmt.Managers.managers_dict): - # manager = remote_mgmt.Managers.managers_dict[manager_index] - # print('\nManager id {} :').format(manager_index) - # print('UUID : {}').format(manager.get_uuid()) - # print('Type : {}').format(manager.get_type()) - # print('Firmware version : {}').format(manager.get_firmware_version()) - # print('State : {}').format(manager.get_status()) - # print manager.get_managed_chassis() - # print manager.get_managed_systems() - # print('Ethernet interfaces :') - # try : - # for ethernetinterface_index in sorted(manager.ethernet_interfaces_collection.ethernet_interfaces_dict): - # ei = manager.ethernet_interfaces_collection.ethernet_interfaces_dict[ethernetinterface_index] - # print('\nEthernet Interface id {} :').format(ethernetinterface_index) - # print(ei.get_name()) - # print(ei.get_parameter('FQDN')) - # print ei.get_ipv4() - # print ei.get_ipv6() - # except AttributeError: - # # We don't have ethernet interfaces - # pass - #======================================================================= - - -Redfish API version : remote_mgmt.get_api_version() -remote_mgmt.Root.get_name() \ No newline at end of file diff --git a/redfish/__init__.py b/redfish/__init__.py index b1e8444..f24eeae 100644 --- a/redfish/__init__.py +++ b/redfish/__init__.py @@ -12,11 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -#import pbr.version +import pbr.version from redfish.main import * #import redfish.types -#__version__ = pbr.version.VersionInfo( -# 'redfish').version_string() +__version__ = pbr.version.VersionInfo('redfish').version_string() diff --git a/redfish/old/functions.py b/redfish/old/functions.py deleted file mode 100644 index 1de1031..0000000 --- a/redfish/old/functions.py +++ /dev/null @@ -1,49 +0,0 @@ - - # Copyright 2014 Hewlett-Packard Development Company, L.P. - # - # 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. - - -""" - -Provides functions for using the Redfish RESTful API. - -""" - -import collections -import json -import sys -from redfish import connection - -class RedfishOperation(connection.RedfishConnection): - - def reset_server(self): - (status, headers, system) = self.rest_get('/redfish/v1/Systems', None) - - memberuri = system['links']['Member'][0]['href'] - # verify expected type - # hint: don't limit to version 0 here as we will rev to 1.0 at some point hopefully with minimal changes - # assert(connection.get_type(system) == 'ComputerSystem.0' or connection.get_type(system) == 'ComputerSystem.1') - - # verify it supports POST - # assert(connection.operation_allowed(headers, 'POST')) - - action = dict() - action['Action'] = 'Reset' - action['ResetType'] = 'ForceRestart' - - # perform the POST action - print('POST ' + json.dumps(action) + ' to ' + memberuri) - (status, headers, response) = self.rest_post(memberuri, None, action) - print('POST response = ' + str(status)) - connection.print_extended_error(response) diff --git a/redfish/old/types.py b/redfish/old/types.py deleted file mode 100644 index ede311f..0000000 --- a/redfish/old/types.py +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# 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. - - -""" -Redfish Resource Types -""" - -import base64 -import gzip -import hashlib -import httplib -import json -import ssl -import StringIO -import sys -import urllib2 -from urlparse import urlparse - -#from oslo_log import log as logging -from redfish import exception - -#LOG = logging.getLogger('redfish') - - -class Base(object): - def __init__(self, obj, connection=None): - self._conn = connection - """handle to the redfish connection""" - - self._attrs = [] - """list of discovered attributes""" - - self._links = [] - """list of linked resources""" - - # parse the individual resources, appending them to - # the list of object attributes - for k in obj.keys(): - ref = k.lower() - if ref in ["links", "oem", "items"]: - continue - setattr(self, ref, obj[k]) - self._attrs.append(ref) - - # make sure the required attributes are present - if not getattr(self, 'name', False): - raise ObjectLoadException( - "Failed to load object. Reason: could not determine name.") - if not getattr(self, 'type', False): - raise ObjectLoadException( - "Failed to load object. Reason: could not determine type.") - - if getattr(self, 'serviceversion', False): - self.type = self.type.replace('.' + self.serviceversion, '') - else: - # TODO: use a regex here to strip and store the version - # instead of assuming it is 7 chars long - self.type = self.type[:-7] - - # Lastly, parse the 'links' resource. - # Note that this may have different nested structure, depending on - # what type of resource this is, or what vendor it is. - # subclasses may follow this by parsing other resources / collections - self._parse_links(obj) - - def _parse_links(self, obj): - """Map linked resources to getter functions - - The root resource returns a dict of links to top-level resources - """ - def getter(connection, href): - def _get(): - return connection.rest_get(href, {}) - return _get - - for k in obj['links']: - ref = "get_" + k.lower() - self._links.append(ref) - href = obj['links'][k]['href'] - setattr(self, ref, getter(self._conn, href)) - - def __repr__(self): - """Return this object's _attrs as a dict""" - res = {} - for a in self._attrs: - res[a] = getattr(self, a) - return res - - def __str__(self): - """Return the string representation of this object's _attrs""" - return json.dumps(self.__repr__()) - - -class BaseCollection(Base): - """Base class for collection types""" - def __init__(self, obj, connection=None): - super(BaseCollection, self).__init__(obj, connection=connection) - self._parse_items(obj) - self._attrs.append('items') - - def _parse_links(self, obj): - """links are special on a chassis; dont parse them""" - pass - - def _parse_items(self, obj): - """Map linked items to getter methods - - The chassis resource returns a list of items and corresponding - link data in a separate entity. - """ - def getter(connection, href): - def _get(): - return connection.rest_get(href, {}) - return _get - - self.items = [] - self._item_getters = [] - - if 'links' in obj and 'Member' in obj['links']: - # NOTE: this assumes the lists are ordered the same - counter = 0 - for item in obj['links']['Member']: - self.items.append(obj['Items'][counter]) - self._item_getters.append( - getter(self._conn, item['href'])) - counter+=1 - elif 'Items' in obj: - # TODO: find an example of this format and make sure it works - for item in obj['Items']: - if 'links' in item and 'self' in item['links']: - href = item['links']['self']['href'] - self.items.append(item) - - # TODO: implement paging support - # if 'links' in obj and 'NextPage' in obj['links']: - # next_page = THIS_URI + '?page=' + str(obj['links']['NextPage']['page']) - # do something with next_page URI - - def __iter__(self): - for getter in self._item_getters: - yield getter() - - -class Root(Base): - """Root '/' resource class""" - def _parse_links(self, obj): - """Map linked resources to getter functions - - The root resource returns a dict of links to top-level resources - - TODO: continue implementing customizations for top-level resources - - """ - mapping = { - 'Systems': Systems, - 'Chassis': Chassis, - 'Managers': Base, - 'Schemas': Base, - 'Registries': Base, - 'Tasks': Base, - 'AccountService': Base, - 'Sessions': Base, - 'EventService': Base, - } - - def getter(connection, href, type): - def _get(): - return mapping[type](connection.rest_get(href, {}), self._conn) - return _get - - for k in obj['links']: - ref = "get_" + k.lower() - self._links.append(ref) - href = obj['links'][k]['href'] - setattr(self, ref, getter(self._conn, href, k)) - - -class Chassis(BaseCollection): - """Chassis resource class""" - def __len__(self): - return len(self.items) - - -class Systems(Base): - pass diff --git a/setup.cfg b/setup.cfg index 0482d17..266b6df 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,10 +4,10 @@ summary = Reference implementation of Redfish standard client. description-file = README.rst author = Redfish dev team +<<<<<<< HEAD author-email = python-redfish@mondorescue.org -home-page = http://github.com/bcornec/python-redfish +home-page = https://github.com/uggla/python-redfish/tree/devel classifier = - #Environment :: OpenStack Intended Audience :: Information Technology Intended Audience :: System Administrators License :: OSI Approved :: Apache Software License @@ -15,14 +15,19 @@ classifier = Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 - Programming Language :: Python :: 2.6 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 [files] packages = - redfish + redfish + +scripts = + redfish-client/redfish-client.py + +data_files = + usr/share/redfish-client/templates = redfish-client/templates/* + [build_sphinx] source-dir = doc/source