adapt paths to real model

legato-project · Sep 29, 2021 · 81ddb69 · 81ddb69
1 parent a5d7f30
commit 81ddb69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/applications/redfish-documentor/RedfishDocumentor.jar b/applications/redfish-documentor/RedfishDocumentor.jar
diff --git a/config/class-mapping.json b/config/class-mapping.json
@@ -11,10 +11,10 @@
 		"info.christmann.recs.tor_master.redfish.model.ErrorResource": "Object",
 		"info.christmann.recs.tor_master.redfish.model.EthernetInterfaceResource": "info.christmann.recs.model.EthernetInterface",
 		"info.christmann.recs.tor_master.redfish.model.EthernetInterfaceResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.model.EthernetInterface, info.christmann.recs.model.interfaces.IIdentifiable>",
-		"info.christmann.recs.tor_master.redfish.model.SwitchResource": "info.christmann.recs.management.AbstractSwitchManager<? extends info.christmann.recs.model.AbstractPort<?, ?>, ? extends info.christmann.recs.model.AbstractSwitch<? extends info.christmann.recs.model.AbstractPort<?, ?>>>",
-		"info.christmann.recs.tor_master.redfish.model.SwitchResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.management.AbstractSwitchManager<? extends info.christmann.recs.model.AbstractPort<?, ?>, ? extends info.christmann.recs.model.AbstractSwitch<? extends info.christmann.recs.model.AbstractPort<?, ?>>>, info.christmann.recs.model.interfaces.IIdentifiable>",
-		"info.christmann.recs.tor_master.redfish.model.PortResource": "info.christmann.recs.model.AbstractPort<?, ?>",
-		"info.christmann.recs.tor_master.redfish.model.PortResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.model.AbstractPort<?, ?>, info.christmann.recs.model.interfaces.IIdentifiable>",
+		"info.christmann.recs.tor_master.redfish.model.SwitchResource": "info.christmann.recs.model.util.AbstractSwitchManager<? extends info.christmann.recs.model.util.AbstractPort<?, ?>, ? extends info.christmann.recs.model.util.AbstractSwitch<? extends info.christmann.recs.model.util.AbstractPort<?, ?>>>",
+		"info.christmann.recs.tor_master.redfish.model.SwitchResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.model.util.AbstractSwitchManager<? extends info.christmann.recs.model.util.AbstractPort<?, ?>, ? extends info.christmann.recs.model.util.AbstractSwitch<? extends info.christmann.recs.model.util.AbstractPort<?, ?>>>, info.christmann.recs.model.interfaces.IIdentifiable>",
+		"info.christmann.recs.tor_master.redfish.model.PortResource": "info.christmann.recs.model.util.AbstractPort<?, ?>",
+		"info.christmann.recs.tor_master.redfish.model.PortResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.model.util.AbstractPort<?, ?>, info.christmann.recs.model.interfaces.IIdentifiable>",
 		"info.christmann.recs.tor_master.redfish.model.PowerResource": "info.christmann.recs.model.interfaces.IElectricityMonitored",
 		"info.christmann.recs.tor_master.redfish.model.HSLLConnectionResource": "info.christmann.recs.model.HSLLConnection",
 		"info.christmann.recs.tor_master.redfish.model.HSLLConnectionResourceCollection": "info.christmann.recs.tor_master.redfish.util.OwnedList<info.christmann.recs.model.HSLLConnection, info.christmann.recs.model.interfaces.IIdentifiable>",
@@ -39,11 +39,11 @@
 	"return_values": {
 		"PCIeFunction.Provider": "info.christmann.recs.model.interfaces.IPCIeFunctionProvider<? extends info.christmann.recs.model.PCIeFunction<?>>",
 		"HSLLInterface.Provider": "info.christmann.recs.model.interfaces.IHSLLInterfaceProvider",
-		"Port.Provider": "info.christmann.recs.model.interfaces.ILogicalPortProvider<info.christmann.recs.model.AbstractPort<?, ?>>",
+		"Port.Provider": "info.christmann.recs.model.interfaces.ILogicalPortProvider<info.christmann.recs.model.util.AbstractPort<?, ?>>",
 		"VLanNetworkInterface.Provider": "info.christmann.recs.model.interfaces.IVLanNetworkInterfaceProvider",
 		"EthernetInterface.ConnectedPort": "info.christmann.recs.model.EthernetSwitchPort",
 		"ComposedNode.ContainedResources": "info.christmann.recs.model.interfaces.IComposable",
-		"ComposedNode.ExposePort": "info.christmann.recs.model.AbstractPort<?, ?>",
+		"ComposedNode.ExposePort": "info.christmann.recs.model.util.AbstractPort<?, ?>",
 		"ComposedNode.Assemble": "info.christmann.recs.model.ComposedNode",
 		"ComposedNode.Reject": "info.christmann.recs.model.ComposedNode",
 		"ComposedNode.RemovePort": "info.christmann.recs.model.ComposedNode",