Merge pull request #104 from rahlvers/master

Add support for $metadata returns (in text/xml) and /redfish/v1/odata

Author: mraineri

emulator.py

@@ -14,8 +14,8 @@
 import xml.etree.ElementTree as ET
 import logging
 import copy
-logging.basicConfig(level=logging.DEBUG)
 
+logging.basicConfig(level=logging.DEBUG)
 
 import g
 
@@ -32,7 +32,6 @@
 
 from infragen.populate import populate
 
-
 # Trays to load into the resource manager
 TRAYS = None
 SPEC = None
@@ -125,6 +124,12 @@ def error_response(msg, status, jsonify=False):
 class PathError(Exception):
     pass
 
+@g.api.representation('application/xml')
+def output_xml(data, code, headers=None):
+    resp = make_response(data, code)
+    resp.headers.extend(headers or {})
+    resp.headers['Content-Type'] = 'text/xml; charset=ISO-8859-1'
+    return resp
 
 @g.api.representation('application/json')
 def output_json(data, code, headers=None):
@@ -135,6 +140,8 @@ def output_json(data, code, headers=None):
     resp.headers.extend(headers or {})
     return resp
 
+
+
 # The following code provides a mechanism for the Redfish client to either
 #    - Emulator Service Root
 #    - Control the emulator
@@ -345,6 +352,67 @@ def serviceInfo():
 def browse():
     return render_template('browse.html')
 
+# Return metadata as type text/xml
+@g.app.route('/redfish/v1/$metadata')
+def get_metadata():
+    logging.info ('In get_metadata')
+    try:
+
+        md_xml = ""
+
+        if os.path.exists('Resources/$metadata/index.xml'):
+            # Use dynamic data source
+            filename = 'Resources/$metadata/index.xml'
+        else:
+            # Use static mockup
+            mockup_path = MOCKUPFOLDERS[0]
+            filename = os.path.join("api_emulator", mockup_path, 'static', '$metadata', 'index.xml')
+
+        with open(filename, 'r') as var:
+            for line in var:
+                line = line.rstrip()
+                md_xml += line
+
+        resp = make_response(md_xml, 200)
+        resp.headers['Content-Type'] = 'text/xml'
+        return resp
+
+    except Exception:
+        traceback.print_exc()
+        resp = error_response('Internal Server Error', 500, True)
+    return resp
+
+# Return odata
+@g.app.route('/redfish/v1/odata')
+def get_odata():
+    logging.info ('In get_odata')
+    try:
+
+        odata_json = ""
+
+        if os.path.exists('Resources//odata//index.json'):
+            # Use dynamic data source
+            filename = 'Resources/odata/index.json'
+            logging.info ('Resources path exists:', filename)
+        else:
+            # Use static mockup
+            mockup_path = MOCKUPFOLDERS[0]
+            filename = os.path.join("api_emulator", mockup_path, 'static', 'odata', 'index.json')
+
+        with open(filename, 'r') as var:
+            for line in var:
+                line = line.rstrip()
+                odata_json += line
+
+        resp = make_response(odata_json, 200)
+        resp.headers['Content-Type'] = 'application/json'
+        return resp
+
+    except Exception:
+        traceback.print_exc()
+        resp = error_response('Internal Server Error', 500, True)
+    return resp
+
 
 #
 # If any other RESTful request, send to RedfishAPI object for processing. Note: <path:path> specifies any path