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=f164734e337a960913fcfb35d52f80608dcfe5a3;hb=9fef9615bd5889eacbe8ddad454b7ff4b4c195c0;hp=104cb1dbf597c9d9c46507ebd4c63afa1b6e3b45;hpb=e6ee6ba3a164c8cb3c8ee259b05a838022af7ea5;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 104cb1db..f164734e 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
@@ -72,15 +72,16 @@ public class E2ManagerController {
 	public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/e2mgr";
 	// Dashboard only
 	public static final String HEALTH_METHOD = "health";
-	public static final String RAN_METHOD = "/ran";
 	public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
 	// Keep these consistent with the E2M implementation
-	public static final String NODEB_PREFIX = "/nodeb";
+	/* 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 RESET_METHOD = "/reset";
 	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";
 
@@ -119,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;
@@ -179,7 +181,7 @@ public class E2ManagerController {
 	}
 
 	@ApiOperation(value = "Abort any other ongoing procedures over X2 between the RIC and the RAN.")
-	@PutMapping(NODEB_PREFIX  + "/{" + PP_RANNAME + "}"+ RESET_METHOD)
+	@PutMapping(NODEB_PREFIX + "/{" + PP_RANNAME + "}" + RESET_METHOD)
 	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void reset(@PathVariable(PP_RANNAME) String ranName, @RequestBody ResetRequest resetRequest,
 			HttpServletResponse response) {