Merge pull request #73 from ehaligow/ehaligow-systems-alignment-with-…

…OpenRMC1.0 Added routes for Systems
opencomputeproject · Jan 23, 2024 · d0423cd · d0423cd
2 parents 3f4660c + f8d1782
commit d0423cd
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/svc-api/router/router.go b/svc-api/router/router.go
@@ -313,10 +313,18 @@ func Router() *iris.Application {
 	systems.Get("/{id}", system.GetSystem)
 	systems.Get("/{id}/Processors", system.GetSystemResource)
 	systems.Get("/{id}/Processors/{rid}", system.GetSystemResource)
+	systems.Get("/{id}/Processors/{rid}/AccelerationFunctions", system.GetSystemResource)
+	systems.Get("/{id}/Processors/{rid}/Assembly", system.GetSystemResource)
+	systems.Get("/{id}/Processors/{rid}/Metrics", system.GetSystemResource)
+	systems.Get("/{id}/Processors/{rid}/Processors", system.GetSystemResource)
 	systems.Get("/{id}/Memory", system.GetSystemResource)
 	systems.Get("/{id}/Memory/{rid}", system.GetSystemResource)
+	systems.Get("/{id}/Memory/{id2}/Metrics", system.GetSystemResource)
 	systems.Get("/{id}/NetworkInterfaces", system.GetSystemResource)
 	systems.Get("/{id}/NetworkInterfaces/{rid}", system.GetSystemResource)
+	systems.Get("/{id}/NetworkInterfaces/{rid}/NetworkDeviceFunctions", system.GetSystemResource)
+	systems.Get("/{id}/NetworkInterfaces/{rid}/NetworkPorts", system.GetSystemResource)
+	systems.Get("/{id}/NetworkInterfaces/{rid}/Ports", system.GetSystemResource)
 	systems.Get("/{id}/MemoryDomains", system.GetSystemResource)
 	systems.Get("/{id}/EthernetInterfaces", system.GetSystemResource)
 	systems.Get("/{id}/EthernetInterfaces/{rid}", system.GetSystemResource)
@@ -331,7 +339,9 @@ func Router() *iris.Application {
 	systems.Get("/{id}/LogServices/{rid}/Entries/{rid2}", system.GetSystemResource)
 	systems.Post("/{id}/LogServices/{rid}/Actions/LogService.ClearLog", system.GetSystemResource)
 	systems.Patch("/{id}", system.ChangeBootOrderSettings)
+	systems.Get("/{id}/PCIeDevices", system.GetSystemResource)
 	systems.Get("/{id}/PCIeDevices/{rid}", system.GetSystemResource)
+	systems.Get("/{id}/PCIeDevices/{rid}/Assembly", system.GetSystemResource)
 	systems.Any("/{id}/PCIeDevices/{rid}", handle.SystemsMethodNotAllowed)
 	systems.Any("/", handle.SystemsMethodNotAllowed)
 	systems.Any("/{id}", handle.SystemsMethodNotAllowed)
@@ -350,12 +360,17 @@ func Router() *iris.Application {
 	systems.Any("/{id}/LogServices/{rid}/Entries/{rid2}", handle.SystemsMethodNotAllowed)
 	systems.Any("/{id}/LogServices/{rid}/Actions", handle.SystemsMethodNotAllowed)
 	systems.Any("/{id}/LogServices/{rid}/Actions/LogService.ClearLog", handle.SystemsMethodNotAllowed)
+	systems.Get("/{id}/Certificates", system.GetSystemResource)
 
 	systems.Get("/{id}/Bios", system.GetSystemResource)
 	systems.Get("/{id}/Bios/Settings", system.GetSystemResource)
 	systems.Patch("/{id}/Bios/Settings", system.ChangeBiosSettings)
 	systems.Any("/{id}/Bios", handle.SystemsMethodNotAllowed)
 	systems.Any("/{id}/Processors/{rid}", handle.SystemsMethodNotAllowed)
+	systems.Get("/{id}/SimpleStorage", system.GetSystemResource)
+	systems.Get("/{id}/StorageServices", system.GetSystemResource)
+	systems.Get("/{id}/Metrics", system.GetSystemResource)
+	systems.Get("/{id}/VirtualMedia", system.GetSystemResource)
 
 	storage := v1.Party("/Systems/{id}/Storage", middleware.SessionDelMiddleware)
 	storage.SetRegisterRule(iris.RouteSkip)

diff --git a/svc-device-manager/rest/server.go b/svc-device-manager/rest/server.go
@@ -40,17 +40,40 @@ func createRouting(app *iris.Application, config config.Config) {
 		systems := routes.Party("/Systems", basicAuthHandler)
 		systems.Get("", getGenericResourceHandler)
 		systems.Get("/{id}", getGenericResourceHandler)
+		systems.Get("/{id}/Certificates", getGenericResourceHandler)
+		systems.Get("/{id}/StorageServices", getGenericResourceHandler)
+		systems.Get("/{id}/Metrics", getGenericResourceHandler)
+		systems.Get("/{id}/SimpleStorage", getGenericResourceHandler)
+		systems.Get("/{id}/Storage", getGenericResourceHandler)
+		systems.Get("/{id}/VirtualMedia", getGenericResourceHandler)
 		systems.Get("/{id}/BootOptions", getGenericResourceHandler)
 		systems.Get("/{id}/BootOptions/{id2}", getGenericResourceHandler)
-		systems.Get("/{id}/Processors", getGenericResourceHandler)
-		systems.Get("/{id}/Processors/{id2}", getGenericResourceHandler)
+
+		processors := systems.Party("/{id}/Processors", basicAuthHandler)
+		processors.Get("", getGenericResourceHandler)
+		processors.Get("/{id}", getGenericResourceHandler)
+		processors.Get("/{id}/AccelerationFunctions", getGenericResourceHandler)
+		processors.Get("/{id}/Assembly", getGenericResourceHandler)
+		processors.Get("/{id}/Metrics", getGenericResourceHandler)
+		processors.Get("/{id}/Processors", getGenericResourceHandler)
+
 		systems.Get("/{id}/Memory", getGenericResourceHandler)
 		systems.Get("/{id}/Memory/{id2}", getGenericResourceHandler)
-		systems.Get("/{id}/NetworkInterfaces", getGenericResourceHandler)
-		systems.Get("/{id}/NetworkInterfaces/{id2}", getGenericResourceHandler)
+		systems.Get("/{id}/Memory/{id2}/Metrics", getGenericResourceHandler)
+
+		networkInterfaces := systems.Party("/{id}/NetworkInterfaces", basicAuthHandler)
+		networkInterfaces.Get("", getGenericResourceHandler)
+		networkInterfaces.Get("/{id}", getGenericResourceHandler)
+		networkInterfaces.Get("/{id}/NetworkDeviceFunctions", getGenericResourceHandler)
+		networkInterfaces.Get("/{id}/NetworkPorts", getGenericResourceHandler)
+		networkInterfaces.Get("/{id}/Ports", getGenericResourceHandler)
+
 		systems.Get("/{id}/MemoryDomains", getGenericResourceHandler)
 		systems.Get("/{id}/SecureBoot", getGenericResourceHandler)
-		systems.Get("/{id}/PCIeDevices/{id2}", getGenericResourceHandler)
+		pcieDevices := systems.Party("/{id}/PCIeDevices")
+		pcieDevices.Get("", getGenericResourceHandler)
+		pcieDevices.Get("/{id}", getGenericResourceHandler)
+		pcieDevices.Get("/{id}/Assembly", getGenericResourceHandler)
 		systems.Get("/{id}/Bios", getGenericResourceHandler)
 		systems.Get("/{id}/Bios/Settings", getGenericResourceHandler)
 		systems.Post("/{id}/Actions/ComputerSystem.Reset", newResetComputerSystemHandler(config))
@@ -67,7 +90,7 @@ func createRouting(app *iris.Application, config config.Config) {
 		logService.Get("/{id}/Entries", getGenericResourceHandler)
 		logService.Get("/{id}/Entries/{id2}", getGenericResourceHandler)
 
-		storage := routes.Party("/{id}/Storage")
+		storage := systems.Party("/{id}/Storage")
 		storage.Get("", getGenericResourceHandler)
 		storage.Get("/{id}", getGenericResourceHandler)
 		storage.Get("/{id}/Volumes", getGenericResourceHandler)