Merge pull request #2 from DMTF/hypermedia-uri

Made creative URIs for top-level collections
DMTF · Oct 12, 2016 · 61eb082 · 61eb082
2 parents 4ccc0ba + c25f30c
commit 61eb082
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 40 deletions.
diff --git a/...rV1/redfish/v1/Chassis/1/Power/index.json → ...1/redfish/v1/Chassis/A33/Power/index.json b/...rV1/redfish/v1/Chassis/1/Power/index.json → ...1/redfish/v1/Chassis/A33/Power/index.json
@@ -4,7 +4,7 @@
     "Name": "Power",
     "PowerControl": [
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Power#/PowerControl/0",
+            "@odata.id": "/redfish/v1/Chassis/A33/Power#/PowerControl/0",
             "MemberId": "0",
             "Name": "System Power Control",
             "PowerConsumedWatts": 224,
@@ -23,6 +23,6 @@
     ],
     "Oem": {},
     "@odata.context": "/redfish/v1/$metadata#Power.Power",
-    "@odata.id": "/redfish/v1/Chassis/1/Power",
+    "@odata.id": "/redfish/v1/Chassis/A33/Power",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...1/redfish/v1/Chassis/1/Thermal/index.json → ...redfish/v1/Chassis/A33/Thermal/index.json b/...1/redfish/v1/Chassis/1/Thermal/index.json → ...redfish/v1/Chassis/A33/Thermal/index.json
@@ -4,7 +4,7 @@
     "Name": "Thermal",
     "Temperatures": [
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Temperatures/0",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Temperatures/0",
             "MemberId": "0",
             "Name": "Inlet Temp",
             "SensorNumber": 42,
@@ -21,7 +21,7 @@
             "PhysicalContext": "Intake"
         },
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Temperatures/1",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Temperatures/1",
             "MemberId": "1",
             "Name": "Board Temp",
             "SensorNumber": 43,
@@ -38,7 +38,7 @@
             "PhysicalContext": "SystemBoard"
         },
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Temperatures/2",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Temperatures/2",
             "MemberId": "2",
             "Name": "CPU1 Temp",
             "SensorNumber": 44,
@@ -54,7 +54,7 @@
             "PhysicalContext": "CPU"
         },
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Temperatures/3",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Temperatures/3",
             "MemberId": "3",
             "Name": "CPU2 Temp",
             "SensorNumber": 45,
@@ -72,7 +72,7 @@
     ],
     "Fans": [
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Fans/0",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Fans/0",
             "MemberId": "0",
             "Name": "BaseBoard System Fan 1",
             "PhysicalContext": "Backplane",
@@ -92,12 +92,12 @@
             "MaxReadingRange": 5000,
             "Redundancy": [
                 {
-                    "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Redundancy/0"
+                    "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Redundancy/0"
                 }
             ]
         },
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Fans/1",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Fans/1",
             "MemberId": "1",
             "Name": "BaseBoard System Fan 2",
             "PhysicalContext": "Backplane",
@@ -117,22 +117,22 @@
             "MaxReadingRange": 5000,
             "Redundancy": [
                 {
-                    "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Redundancy/0"
+                    "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Redundancy/0"
                 }
             ]
         }
     ],
     "Redundancy": [
         {
-            "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Redundancy/0",
+            "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Redundancy/0",
             "MemberId": "0",
             "Name": "BaseBoard System Fans",
             "RedundancySet": [
                 {
-                    "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Fans/0"
+                    "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Fans/0"
                 },
                 {
-                    "@odata.id": "/redfish/v1/Chassis/1/Thermal#/Fans/1"
+                    "@odata.id": "/redfish/v1/Chassis/A33/Thermal#/Fans/1"
                 }
             ],
             "Mode": "N+m",
@@ -145,6 +145,6 @@
         }
     ],
     "@odata.context": "/redfish/v1/$metadata#Thermal.Thermal",
-    "@odata.id": "/redfish/v1/Chassis/1/Thermal",
+    "@odata.id": "/redfish/v1/Chassis/A33/Thermal",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...pServerV1/redfish/v1/Chassis/1/index.json → ...erverV1/redfish/v1/Chassis/A33/index.json b/...pServerV1/redfish/v1/Chassis/1/index.json → ...erverV1/redfish/v1/Chassis/A33/index.json
@@ -1,6 +1,6 @@
 {
     "@odata.type": "#Chassis.v1_2_0.Chassis",
-    "Id": "1",
+    "Id": "A33",
     "Name": "Catfish System Chassis",
     "ChassisType": "RackMount",
     "Manufacturer": "CatfishManufacturer",
@@ -16,15 +16,15 @@
         "Health": "OK"
     },
     "Thermal": {
-        "@odata.id": "/redfish/v1/Chassis/1/Thermal"
+        "@odata.id": "/redfish/v1/Chassis/A33/Thermal"
     },
     "Power": {
-        "@odata.id": "/redfish/v1/Chassis/1/Power"
+        "@odata.id": "/redfish/v1/Chassis/A33/Power"
     },
     "Links": {
         "ComputerSystems": [
             {
-                "@odata.id": "/redfish/v1/Systems/1"
+                "@odata.id": "/redfish/v1/Systems/2M220100SL"
             }
         ],
         "ManagedBy": [
@@ -41,6 +41,6 @@
     },
     "Oem": {},
     "@odata.context": "/redfish/v1/$metadata#Chassis.Chassis",
-    "@odata.id": "/redfish/v1/Chassis/1",
+    "@odata.id": "/redfish/v1/Chassis/A33",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/MockupData/SimpleOcpServerV1/redfish/v1/Chassis/index.json b/MockupData/SimpleOcpServerV1/redfish/v1/Chassis/index.json
@@ -4,7 +4,7 @@
     "[email protected]": 1,
     "Members": [
         {
-            "@odata.id": "/redfish/v1/Chassis/1"
+            "@odata.id": "/redfish/v1/Chassis/A33"
         }
     ],
     "@odata.context": "/redfish/v1/$metadata#ChassisCollection.ChassisCollection",

diff --git a/MockupData/SimpleOcpServerV1/redfish/v1/Managers/bmc/index.json b/MockupData/SimpleOcpServerV1/redfish/v1/Managers/bmc/index.json
@@ -23,16 +23,16 @@
     "Links": {
         "ManagerForServers": [
             {
-                "@odata.id": "/redfish/v1/Systems/1"
+                "@odata.id": "/redfish/v1/Systems/2M220100SL"
             }
         ],
         "ManagerForChassis": [
             {
-                "@odata.id": "/redfish/v1/Chassis/1"
+                "@odata.id": "/redfish/v1/Chassis/A33"
             }
         ],
         "ManagerInChassis": {
-            "@odata.id": "/redfish/v1/Chassis/1"
+            "@odata.id": "/redfish/v1/Chassis/A33"
         },		
         "Oem": {}
     },

diff --git a/...ms/1/LogServices/SEL/Entries/1/index.json → ...00SL/LogServices/SEL/Entries/1/index.json b/...ms/1/LogServices/SEL/Entries/1/index.json → ...00SL/LogServices/SEL/Entries/1/index.json
@@ -23,6 +23,6 @@
     },
     "Oem": {},
     "@odata.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
-    "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries/1",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries/1",
     "@Redfish.Copyright":"Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...ms/1/LogServices/SEL/Entries/2/index.json → ...00SL/LogServices/SEL/Entries/2/index.json b/...ms/1/LogServices/SEL/Entries/2/index.json → ...00SL/LogServices/SEL/Entries/2/index.json
@@ -23,6 +23,6 @@
     },
     "Oem": {},
     "@odata.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
-    "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries/2",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries/2",
     "@Redfish.Copyright":"Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...tems/1/LogServices/SEL/Entries/index.json → ...0100SL/LogServices/SEL/Entries/index.json b/...tems/1/LogServices/SEL/Entries/index.json → ...0100SL/LogServices/SEL/Entries/index.json
@@ -28,7 +28,7 @@
                 "Oem": {}
             },
             "Oem": {},
-            "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries/1"
+            "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries/1"
         },
         {
             "@odata.type": "#LogEntry.v1_0_2.LogEntry",
@@ -54,11 +54,11 @@
                 "Oem": {}
             },
             "Oem": {},
-            "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries/2"
+            "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries/2"
         }
     ],
-    "@odata.nextLink": "/redfish/v1/Systems/1/LogServices/SEL/Entries?$skiptoken=2",
+    "@odata.nextLink": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries?$skiptoken=2",
     "@odata.context": "/redfish/v1/$metadata#LogEntryCollection.LogEntryCollection",
-    "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries",
     "@Redfish.Copyright":"Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...h/v1/Systems/1/LogServices/SEL/index.json → ...ems/2M220100SL/LogServices/SEL/index.json b/...h/v1/Systems/1/LogServices/SEL/index.json → ...ems/2M220100SL/LogServices/SEL/index.json
@@ -14,14 +14,14 @@
     "Oem": {},
     "Actions": {
         "#LogService.ClearLog": {
-            "target": "/redfish/v1/Systems/1/LogServices/SEL/Actions/LogService.Reset"
+            "target": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Actions/LogService.Reset"
         },
         "Oem": {}
     },
     "Entries": {
-        "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL/Entries"
+        "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL/Entries"
     },
     "@odata.context": "/redfish/v1/$metadata#LogService.LogService",
-    "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...dfish/v1/Systems/1/LogServices/index.json → ...Systems/2M220100SL/LogServices/index.json b/...dfish/v1/Systems/1/LogServices/index.json → ...Systems/2M220100SL/LogServices/index.json
@@ -5,11 +5,11 @@
     "[email protected]": 1,
     "Members": [
         {
-            "@odata.id": "/redfish/v1/Systems/1/LogServices/SEL"
+            "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices/SEL"
         }
     ],
     "Oem": {},
     "@odata.context": "/redfish/v1/$metadata#LogServiceCollection.LogServiceCollection",
-    "@odata.id": "/redfish/v1/Systems/1/LogServices",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/...pServerV1/redfish/v1/Systems/1/index.json → .../redfish/v1/Systems/2M220100SL/index.json b/...pServerV1/redfish/v1/Systems/1/index.json → .../redfish/v1/Systems/2M220100SL/index.json
@@ -1,6 +1,6 @@
 {
     "@odata.type": "#ComputerSystem.v1_1_0.ComputerSystem",
-    "Id": "1",
+    "Id": "2M220100SL",
     "Name": "Catfish System",
     "SystemType": "Physical",
     "AssetTag": "CATFISHASSETTAG",
@@ -35,12 +35,12 @@
         ]
     },
     "LogServices": {
-        "@odata.id": "/redfish/v1/Systems/1/LogServices"
+        "@odata.id": "/redfish/v1/Systems/2M220100SL/LogServices"
     },
     "Links": {
         "Chassis": [
             {
-                "@odata.id": "/redfish/v1/Chassis/1"
+                "@odata.id": "/redfish/v1/Chassis/A33"
             }
         ],
         "ManagedBy": [
@@ -52,7 +52,7 @@
     },
     "Actions": {
         "#ComputerSystem.Reset": {
-            "target": "/redfish/v1/Systems/1/Actions/ComputerSystem.Reset",
+            "target": "/redfish/v1/Systems/2M220100SL/Actions/ComputerSystem.Reset",
             "[email protected]": [
                 "On",
                 "ForceOff",
@@ -65,6 +65,6 @@
         }
     },
     "@odata.context": "/redfish/v1/$metadata#ComputerSystem.ComputerSystem",
-    "@odata.id": "/redfish/v1/Systems/1",
+    "@odata.id": "/redfish/v1/Systems/2M220100SL",
     "@Redfish.Copyright": "Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
diff --git a/MockupData/SimpleOcpServerV1/redfish/v1/Systems/index.json b/MockupData/SimpleOcpServerV1/redfish/v1/Systems/index.json
@@ -4,7 +4,7 @@
     "[email protected]": 1,
     "Members": [
         {
-            "@odata.id": "/redfish/v1/Systems/1"
+            "@odata.id": "/redfish/v1/Systems/2M220100SL"
         }
     ],
     "@odata.context": "/redfish/v1/$metadata#ComputerSystemCollection.ComputerSystemCollection",