X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FCaasIngressControllerTest.java;h=b91c44c6dcf90dada3959080d788a1c05a86dec6;hb=refs%2Fchanges%2F58%2F2258%2F2;hp=2292b9caf7252262c4da548c71004917b95bb5df;hpb=662cc613e80c4079fdf5a54ce3135652cb9ad9a1;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
index 2292b9ca..b91c44c6 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/CaasIngressControllerTest.java
@@ -25,6 +25,8 @@ import java.net.URI;
 import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.oransc.ric.portal.dashboard.DashboardConstants;
+import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,22 +34,11 @@ public class CaasIngressControllerTest extends AbstractControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	@Test
-	public void auxTest() {
-		final String nsAux = "ricaux";
-		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
-				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_AUX, CaasIngressController.PP_NAMESPACE,
-				nsAux);
-		logger.info("Invoking {}", uri);
-		String s = testRestTemplateStandardRole().getForObject(uri, String.class);
-		Assertions.assertFalse(s.isEmpty());
-		Assertions.assertTrue(s.contains(nsAux));
-	}
-
 	@Test
 	public void pltTest() {
 		final String nsPlt = "ricplt";
-		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
+		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
 				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
 				nsPlt);
 		logger.info("Invoking {}", uri);
@@ -59,7 +50,8 @@ public class CaasIngressControllerTest extends AbstractControllerTest {
 	@Test
 	public void unknownClusterTest() {
 		final String nsPlt = "ricplt";
-		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
+		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
 				CaasIngressController.PP_CLUSTER, "cluster", CaasIngressController.PP_NAMESPACE, nsPlt);
 		logger.info("Invoking {}", uri);
 		String s = testRestTemplateStandardRole().getForObject(uri, String.class);
@@ -70,7 +62,8 @@ public class CaasIngressControllerTest extends AbstractControllerTest {
 	@Test
 	public void bogusNsTest() {
 		final String ns = "unknown";
-		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
+		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+				RICInstanceMockConfiguration.INSTANCE_KEY_1, CaasIngressController.PODS_METHOD,
 				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
 				ns);
 		logger.info("Invoking {}", uri);