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=b200c9a864e98a454cb1fec9b5b8aa1c7449a93c;hb=c3b80bfed44dd12cf869d85bcda9c63583b147fb;hp=ad75c88d325981f3db689a8b41bcc3406f65f7bd;hpb=93a44cb851a49c923126f32016646860d104075c;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 ad75c88d..b200c9a8 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
@@ -29,7 +29,6 @@ import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
 import org.oransc.ric.e2mgr.client.api.NodebApi;
 import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
 import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.NodebIdentityGlobalNbId;
 import org.oransc.ric.e2mgr.client.model.SetupRequest;
 import org.oransc.ric.portal.dashboard.DashboardApplication;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
@@ -38,9 +37,9 @@ import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,9 +57,6 @@ import io.swagger.annotations.ApiOperation;
  * 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>
- * 
- * In R1 the E2 interface does not yet implement the get-ID-list method, so this
- * class mocks up some functionality.
  */
 @Configuration
 @RestController
@@ -86,34 +82,24 @@ public class E2ManagerController {
 	private final HealthCheckApi e2HealthCheckApi;
 	private final NodebApi e2NodebApi;
 
-	// TODO: remove this when E2 delivers the feature
-	private final List<NodebIdentity> mockNodebIdList;
-
 	@Autowired
-	public E2ManagerController(final HealthCheckApi e2HealthCheckApi, final NodebApi e2NodebApi,
-			@Value("${e2mgr.mock.rannames:#{null}}") final String mockRanNames) {
+	public E2ManagerController(final HealthCheckApi e2HealthCheckApi, final NodebApi e2NodebApi) {
 		Assert.notNull(e2HealthCheckApi, "API must not be null");
 		Assert.notNull(e2NodebApi, "API must not be null");
 		this.e2HealthCheckApi = e2HealthCheckApi;
 		this.e2NodebApi = e2NodebApi;
-		mockNodebIdList = new ArrayList<>();
-		if (mockRanNames != null) {
-			logger.debug("ctor: Mocking RAN names: {}", mockRanNames);
-			for (String id : mockRanNames.split(",")) {
-				NodebIdentityGlobalNbId globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId").plmnId("mockPlmId");
-				mockNodebIdList.add(new NodebIdentity().globalNbId(globalNbId).inventoryName(id.trim()));
-			}
-		}
 	}
 
 	@ApiOperation(value = "Gets the E2 manager client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
 	@GetMapping(VERSION_METHOD)
+	// No role required
 	public SuccessTransport getClientVersion() {
 		return new SuccessTransport(200, DashboardApplication.getImplementationVersion(HealthCheckApi.class));
 	}
 
 	@ApiOperation(value = "Gets the health from the E2 manager, expressed as the response code.")
 	@GetMapping(HEALTH_METHOD)
+	// No role required
 	public void healthGet(HttpServletResponse response) {
 		logger.debug("healthGet");
 		e2HealthCheckApi.healthGet();
@@ -123,10 +109,10 @@ public class E2ManagerController {
 	// This calls other methods to simplify the task of the front-end.
 	@ApiOperation(value = "Gets all RAN identities and statuses from the E2 manager.", response = RanDetailsTransport.class, responseContainer = "List")
 	@GetMapping(RAN_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public List<RanDetailsTransport> getRanDetails() {
 		logger.debug("getRanDetails");
-		// TODO: remove mock when e2mgr delivers the getNodebIdList() method
-		List<NodebIdentity> nodebIdList = mockNodebIdList.isEmpty() ? e2NodebApi.getNodebIdList() : mockNodebIdList;
+		List<NodebIdentity> nodebIdList = e2NodebApi.getNodebIdList();
 		List<RanDetailsTransport> details = new ArrayList<>();
 		for (NodebIdentity nbid : nodebIdList) {
 			GetNodebResponse nbResp = null;
@@ -145,6 +131,7 @@ public class E2ManagerController {
 
 	@ApiOperation(value = "Get RAN identities list.", response = NodebIdentity.class, responseContainer = "List")
 	@GetMapping(NODEB_LIST_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public List<NodebIdentity> getNodebIdList() {
 		logger.debug("getNodebIdList");
 		return e2NodebApi.getNodebIdList();
@@ -152,6 +139,7 @@ public class E2ManagerController {
 
 	@ApiOperation(value = "Get RAN by name.", response = GetNodebResponse.class)
 	@GetMapping(NODEB_METHOD + "/{" + PP_RANNAME + "}")
+	@Secured({ DashboardConstants.ROLE_ADMIN, DashboardConstants.ROLE_STANDARD })
 	public GetNodebResponse getNb(@PathVariable(PP_RANNAME) String ranName) {
 		logger.debug("getNb {}", ranName);
 		return e2NodebApi.getNb(ranName);
@@ -159,6 +147,7 @@ public class E2ManagerController {
 
 	@ApiOperation(value = "Close all connections to the RANs and delete the data from the nodeb-rnib DB.")
 	@DeleteMapping(NODEB_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void nodebDelete(HttpServletResponse response) {
 		logger.debug("nodebDelete");
 		e2NodebApi.nodebDelete();
@@ -167,6 +156,7 @@ public class E2ManagerController {
 
 	@ApiOperation(value = "Sets up an EN-DC RAN connection via the E2 manager.")
 	@PostMapping(ENDC_SETUP_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void endcSetup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) {
 		logger.debug("endcSetup {}", setupRequest);
 		e2NodebApi.endcSetup(setupRequest);
@@ -175,6 +165,7 @@ public class E2ManagerController {
 
 	@ApiOperation(value = "Sets up an X2 RAN connection via the E2 manager.")
 	@PostMapping(X2_SETUP_METHOD)
+	@Secured({ DashboardConstants.ROLE_ADMIN })
 	public void x2Setup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) {
 		logger.debug("x2Setup {}", setupRequest);
 		e2NodebApi.x2Setup(setupRequest);