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=17e68fdc7b818c3037fc5fc6a16ab7e166939e08;hb=a16f2d04fa1af4fe1ea993133a1d106e7fa1da3d;hp=d06aeff089dcc23b34e6ad8432185deafcf0eb06;hpb=42c6891f45dce060347b3637e72daac370fbce29;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 d06aeff0..17e68fdc 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
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,10 +54,12 @@ import org.springframework.web.client.HttpStatusCodeException;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * Proxies calls from the front end to the E2 Manager API. All methods answer
- * 502 on failure and wrap the remote details: <blockquote>HTTP server received
- * an invalid response from a server it consulted when acting as a proxy or
- * gateway.</blockquote>
+ * Proxies calls from the front end to the E2 Manager API.
+ * 
+ * If a method throws RestClientResponseException, it is handled by
+ * {@link CustomResponseEntityExceptionHandler#handleProxyMethodException(Exception, org.springframework.web.context.request.WebRequest)}
+ * which returns status 502. All other exceptions are handled by Spring which
+ * returns status 500.
  */
 @Configuration
 @RestController
@@ -68,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";
 
@@ -115,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;
@@ -175,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) {