x/python-redfish
Code Issues Proposed changes

Merge pull request #7 from bcornec/master

Browse Source 
Update to redfish spec 0.95.0a
This commit is contained in:
Devananda 2015-04-14 19:36:16 -07:00
commit 96b8a38e5d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redfish/functions.py
View File

@ -28,7 +28,7 @@ from redfish import connection
class RedfishOperation(connection.RedfishConnection): class RedfishOperation(connection.RedfishConnection):
def reset_server(self): def reset_server(self):
(status, headers, system) = self.rest_get('/rest/v1/Systems', None) (status, headers, system) = self.rest_get('/redfish/v1/Systems', None)
memberuri = system['links']['Member'][0]['href'] memberuri = system['links']['Member'][0]['href']
# verify expected type # verify expected type

14
redfish/server.py
View File

@ -27,7 +27,7 @@ resources.
A URI should be treated by the client as opaque, and thus should not be A URI should be treated by the client as opaque, and thus should not be
attempted to be understood or deconstructed by the client. Only specific top attempted to be understood or deconstructed by the client. Only specific top
level URIs (any URI in this sample code) may be assumed, and even these may be level URIs (any URI in this sample code) may be assumed, and even these may be
absent based upon the implementation (e.g. there might be no /rest/v1/Systems absent based upon the implementation (e.g. there might be no /redfish/v1/Systems
collection on something that doesn't have compute nodes.) collection on something that doesn't have compute nodes.)
The other URIs must be discovered dynamically by following href links. This is The other URIs must be discovered dynamically by following href links. This is
@ -35,8 +35,8 @@ because the API will eventually be implemented on a system that breaks any
existing data model "shape" assumptions we may make now. In particular, existing data model "shape" assumptions we may make now. In particular,
clients should not make assumptions about the URIs for the resource members of clients should not make assumptions about the URIs for the resource members of
a collection. For instance, the URI of a collection member will NOT always be a collection. For instance, the URI of a collection member will NOT always be
/rest/v1/.../collection/1, or 2. On systems with multiple compute nodes per /redfish/v1/.../collection/1, or 2. On systems with multiple compute nodes per
manager, a System collection member might be /rest/v1/Systems/C1N1. manager, a System collection member might be /redfish/v1/Systems/C1N1.
This sounds very complicated, but in reality (as these examples demonstrate), This sounds very complicated, but in reality (as these examples demonstrate),
if you are looking for specific items, the traversal logic isn't too if you are looking for specific items, the traversal logic isn't too
@ -93,7 +93,7 @@ header will point to a resource with task information and status.
JSON-SCHEMA: JSON-SCHEMA:
The json-schema available at /rest/v1/Schemas governs the content of the The json-schema available at /redfish/v1/Schemas governs the content of the
resources, but keep in mind: resources, but keep in mind:
* not every property in the schema is implemented in every implementation. * not every property in the schema is implemented in every implementation.
* some properties are schemed to allow both null and anotehr type like string * some properties are schemed to allow both null and anotehr type like string
@ -170,7 +170,7 @@ class RedfishConnection(object):
LOG.debug('Initiating session with host %s', self.host) LOG.debug('Initiating session with host %s', self.host)
auth_dict = {'Password': self.password, 'UserName': self.user_name} auth_dict = {'Password': self.password, 'UserName': self.user_name}
response = self.rest_post( response = self.rest_post(
'/rest/v1/Sessions', None, json.dumps(auth_dict)) '/redfish/v1/Sessions', None, json.dumps(auth_dict))
# TODO: do some schema discovery here and cache the result # TODO: do some schema discovery here and cache the result
# self.schema = ... # self.schema = ...
@ -312,7 +312,7 @@ class RedfishConnection(object):
:param: request_body :param: request_body
""" """
# NOTE: don't assume any newly created resource is included in the # NOTE: don't assume any newly created resource is included in the
# # response. Only the Location header matters. # response. Only the Location header matters.
# the response body may be the new resource, it may be an # the response body may be the new resource, it may be an
# ExtendedError, or it may be empty. # ExtendedError, or it may be empty.
return self._op('POST', suburi, request_headers, request_body) return self._op('POST', suburi, request_headers, request_body)
@ -328,7 +328,7 @@ class RedfishConnection(object):
return self._op('DELETE', suburi, request_headers, None) return self._op('DELETE', suburi, request_headers, None)
def get_root(self): def get_root(self):
return types.Root(self.rest_get('/rest/v1', {}), connection=self) return types.Root(self.rest_get('/redfish/v1', {}), connection=self)
class Version(object): class Version(object):