X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FE2ManagerController.java;h=a5e3b52a12aa90af04afa2751e04da012a8fe6f8;hb=642622502dc1222af8570a3de2b0223fa5474500;hp=a8b64b32010feafdf5ba25ae9cb544ed63cefe77;hpb=7917e39428020a8f36eaf145daa10d90c5159d1a;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
index a8b64b32..a5e3b52a 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
@@ -70,15 +70,18 @@ public class E2ManagerController {
 
 	// Publish paths in constants so tests are easy to write
 	public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/e2mgr";
-	// Endpoints
+	// Dashboard only
 	public static final String HEALTH_METHOD = "health";
-	public static final String NODEB_SHUTDOWN_METHOD = "/nodebShutdownPut";
-	public static final String NODEB_LIST_METHOD = "/nodeb-ids";
-	public static final String RAN_METHOD = "/ran";
-	public static final String RESET_METHOD = "/reset";
-	public static final String ENDC_SETUP_METHOD = "/endcSetup";
-	public static final String X2_SETUP_METHOD = "/x2Setup";
 	public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
+	// Keep these consistent with the E2M implementation
+	/*package*/ static final String NODEB_PREFIX = "/nodeb";
+	public static final String RAN_METHOD = NODEB_PREFIX + "/ran";
+	public static final String NODEB_SHUTDOWN_METHOD = NODEB_PREFIX + "/shutdown";
+	public static final String NODEB_LIST_METHOD = NODEB_PREFIX + "/ids";
+	public static final String ENDC_SETUP_METHOD = NODEB_PREFIX + "/endc-setup";
+	public static final String X2_SETUP_METHOD = NODEB_PREFIX + "/x2-setup";
+	// Reset uses prefix, adds a path parameter below
+	public static final String RESET_METHOD = "/reset";
 	// Path parameters
 	private static final String PP_RANNAME = "ranName";
 
@@ -117,6 +120,7 @@ public class E2ManagerController {
 	public List<RanDetailsTransport> getRanDetails() {
 		logger.debug("getRanDetails");
 		List<NodebIdentity> nodebIdList = e2NodebApi.getNodebIdList();
+		logger.debug("getRanDetails: nodebIdList {}", nodebIdList);
 		List<RanDetailsTransport> details = new ArrayList<>();
 		for (NodebIdentity nbid : nodebIdList) {
 			GetNodebResponse nbResp = null;
@@ -177,7 +181,7 @@ public class E2ManagerController {
 	}
 
 	@ApiOperation(value = "Abort any other ongoing procedures over X2 between the RIC and the RAN.")
-	@PutMapping(RESET_METHOD + "/{" + PP_RANNAME + "}")
+	@PutMapping(NODEB_PREFIX  + "/{" + PP_RANNAME + "}"+ RESET_METHOD)
 	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void reset(@PathVariable(PP_RANNAME) String ranName, @RequestBody ResetRequest resetRequest,
 			HttpServletResponse response) {