Various server fixes (#12)

A series of changes that fixed the below issues
- fixes #10 
- fixes #9 
- fixes #8

---------
Signed-off-by: Christian Pinto <[email protected]>

Resources/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c28/index.json

@@ -0,0 +1,22 @@
+{
+    "@Redfish.Copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright.",
+    "@odata.id": "/redfish/v1/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c28",
+    "@odata.type": "#AggregationSource.v1_2_.AggregationSource",
+    "Description": "PCIe Fabric",
+    "FabricType": "PCIe",
+    "HostName": "http://pcie-fabric-agent:5050",
+    "Id": "0fa4bc06-79a8-4fec-bea5-26dfa7678c28",
+    "Links": {
+        "ConnectionMethod": {
+            "@odata.id": "/redfish/v1/AggregationService/ConnectionMethods/CXL"
+        },
+        "ResourcesAccessed": [
+
+        ]
+    },
+    "Name": "PCIe Fabric",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    }
+}

Resources/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c29/index.json

@@ -0,0 +1,21 @@
+{
+    "@Redfish.Copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright.",
+    "@odata.id": "/redfish/v1/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c29",
+    "@odata.type": "#AggregationSource.v1_2_.AggregationSource",
+    "Description": "CXL Fabric",
+    "FabricType": "CXL",
+    "HostName": "http://h3-cxl-appliance-agent:9080",
+    "Id": "0fa4bc06-79a8-4fec-bea5-26dfa7678c29",
+    "Links": {
+        "ConnectionMethod": {
+            "@odata.id": "/redfish/v1/AggregationService/ConnectionMethods/CXL"
+        },
+        "ResourcesAccessed": [
+        ]
+    },
+    "Name": "CXL Fabric",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    }
+}

Resources/AggregationService/AggregationSources/index.json

@@ -0,0 +1,14 @@
+{
+    "@odata.id": "/redfish/v1/AggregationService/AggregationSources",
+    "@odata.type": "#AggregationService/AggregationSourcesCollection.AggregationService/AggregationSourcesCollection",
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c29"
+        },
+        {
+            "@odata.id": "/redfish/v1/AggregationService/AggregationSources/0fa4bc06-79a8-4fec-bea5-26dfa7678c28"
+        }
+    ],
+    "[email protected]": 1,
+    "Name": "AggregationService/AggregationSources Collection"
+}

Resources/AggregationService/index.json

@@ -0,0 +1,16 @@
+{
+  "@odata.context": "/redfish/v1/$metadata#CompositionService.AggregationService",
+  "@odata.type": "#CompositionService.v1_2_2.AggregationService",
+  "@odata.id": "/redfish/v1/AggregationService",
+  "Id": "AggregationService",
+  "Name": "Aggregation Service",
+  "Status": {
+    "State": "Enabled",
+    "Health": "OK"
+  },
+  "ServiceEnabled": true,
+  "AgregationSources": {
+    "@odata.id": "/redfish/v1/AggregationService/AggregationSources"
+  },
+"Oem": {}
+}

Resources/CompositionService/ResourceBlocks/index.json

@@ -0,0 +1,8 @@
+{
+  "@odata.context": "/redfish/v1/$metadata#ResourceBlockCollection.ResourceBlockCollection",
+  "@odata.id": "/redfish/v1/CompositionService/ResourceBlocks",
+  "@odata.type": "#ResourceBlockCollection.ResourceBlockCollection",
+  "Name": "Resource Block Collection",
+  "[email protected]": 20,
+  "Members": []
+}

Resources/CompositionService/index.json

@@ -0,0 +1,16 @@
+{
+  "@odata.context": "/redfish/v1/$metadata#CompositionService.CompositionService",
+  "@odata.type": "#CompositionService.v1_2_2.CompositionService",
+  "@odata.id": "/redfish/v1/CompositionService",
+  "Id": "CompositionService",
+  "Name": "Composition Service",
+  "Status": {
+    "State": "Enabled",
+    "Health": "OK"
+  },
+  "ServiceEnabled": true,
+  "ResourceBlocks": {
+    "@odata.id": "/redfish/v1/CompositionService/ResourceBlocks"
+  },
+"Oem": {}
+}

Resources/Systems/index.json

@@ -1,14 +1,8 @@
 {
     "@odata.id": "/redfish/v1/Systems",
     "@odata.type": "#SystemsCollection.SystemsCollection",
-    "Members": [
-        {
-            "@odata.id": "/redfish/v1/Systems/1"
-        },
-        {
-            "@odata.id": "/redfish/v1/Systems/1234"
-        }
-    ],
-    "[email protected]": 2,
+    "Members": [],
+    "[email protected]": 0,
+
     "Name": "Systems Collection"
 }

Resources/index.json

@@ -6,5 +6,12 @@
     "RedfishVersion": "1.14.0",
     "Systems": {
         "@odata.id": "/redfish/v1/Systems"
+    },
+    "CompositionService": {
+        "@odata.id": "/redfish/v1/CompositionService"
+    },
+    "AggregationServiceService": {
+        "@odata.id": "/redfish/v1/AggregationService"
+
     }
 }

app.py

@@ -1,45 +1,72 @@
 # Copyright IBM Corp. 2023
 # This software is available to you under a BSD 3-Clause License. 
 # The full license terms are available here: https://github.com/OpenFabrics/sunfish_server_reference/blob/main/LICENSE
+import os
+import traceback
 
-from flask import Flask, request
-from sunfishcorelib.core import Core
-from sunfishcorelib.exceptions import *
+from flask import Flask, request, render_template
+from sunfish.lib.core import Core
+from sunfish.lib.exceptions import *
+import logging
+
+FORMAT = "[%(filename)s:%(lineno)s - %(funcName)20s() ] %(message)s"
+logging.basicConfig(format=FORMAT, level=logging.DEBUG)
+
+logger = logging.getLogger("Server")
 
 conf = {
     "storage_backend": "FS",
 	"redfish_root": "/redfish/v1/",
 	"backend_conf" : {
-		"fs_root": "Resources"
+		"fs_root": "Resources",
+		"subscribers_root": "EventService/Subscriptions"
+	},
+	"handlers": {
+		"subscription_handler": "redfish",
+		"event_handler": "redfish"
+
 	}
 }
 
 # initialize flask
 
-app = Flask(__name__)
+template_dir = os.path.abspath('./templates_web')
+app = Flask(__name__, template_folder=template_dir)
 sunfish_core = Core(conf)
 
+@app.route('/browse')
+def browse():
+    return render_template('browse.html')
+
 # Usa codici http
-@app.route('/<path:resource>', methods=["GET"])
+@app.route('/<path:resource>', methods=["GET"], strict_slashes=False)
 def get(resource):
-
+	logger.debug(f"GET on: {request.path}")
 	try:
-		resp = sunfish_core.get_object(resource)
+		resp = sunfish_core.get_object(request.path)
+
 		return resp, 200
 	except ResourceNotFound as e:
 		return e.message, 404
 
-@app.route('/<path:resource>', methods=["POST"])
+@app.route('/<path:resource>', methods=["POST"], strict_slashes=False)
 def post(resource):
+	logger.debug("POST")
 	try :
-		resp = sunfish_core.create_object(request.json)
+		if resource == "EventListener":
+			resp = sunfish_core.handle_event(request.json)
+		else:
+			resp = sunfish_core.create_object(request.path, request.json)
+
 		return resp
 	except CollectionNotSupported as e:
 		return e.message, 405 # method not allowed
 	except AlreadyExists as e:
 		return e.message, 409 # Conflict
+	except PropertyNotFound as e:
+		return e.message, 400
 
-@app.route('/<path:resource>', methods=["PUT"])
+@app.route('/<path:resource>', methods=["PUT"], strict_slashes=False)
 def put(resource):
 	try:
 		data = request.json
@@ -48,19 +75,22 @@ def put(resource):
 	except ResourceNotFound as e:
 		return e.message, 404
 
-@app.route('/<path:resource>', methods=["PATCH"])
+@app.route('/<path:resource>', methods=["PATCH"], strict_slashes=False)
 def patch(resource):
 	try:
+		logger.debug("PATCH")
 		data = request.json
-		resp = sunfish_core.patch_object(data)
+		resp = sunfish_core.patch_object(path=request.path, payload=data)
 		return resp, 200
 	except ResourceNotFound as e:
 		return e.message, 404
+	except Exception:
+		traceback.print_exc()
 
-@app.route('/<path:resource>', methods=["DELETE"])
+@app.route('/<path:resource>', methods=["DELETE"], strict_slashes=False)
 def delete(resource):
 	try:
-		resp = sunfish_core.delete_object(resource)
+		resp = sunfish_core.delete_object(request.path)
 		return resp, 200
 	except ResourceNotFound as e:
 		return e.message, 404