X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FCaasIngressControllerTest.java;h=41dfcaf8751d8d8771b5d6b07e0b9934b548c17c;hb=6dd828008e1c553b5b4ac6e45af0ccf73c2ed92e;hp=5e0a214af54db44747be2b6262b6696d7a09d473;hpb=55472d9367cf229b2b87a625a8aa1dfb822cbaad;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 5e0a214a..41dfcaf8 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
@@ -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.
@@ -22,6 +22,7 @@ package org.oransc.ric.portal.dashboard.controller;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
 
+import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -32,25 +33,38 @@ public class CaasIngressControllerTest extends AbstractControllerTest {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	@Test
-	public void auxTest() {
-		final String nsAux = "ricaux";
+	public void pltTest() {
+		final String nsPlt = "ricplt";
 		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
-				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_AUX, CaasIngressController.PP_NAMESPACE, nsAux);
+				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
+				nsPlt);
 		logger.info("Invoking {}", uri);
 		String s = testRestTemplateStandardRole().getForObject(uri, String.class);
 		Assertions.assertFalse(s.isEmpty());
-		Assertions.assertTrue(s.contains(nsAux));
+		Assertions.assertTrue(s.contains(nsPlt));
 	}
 
 	@Test
-	public void pltTest() {
+	public void unknownClusterTest() {
 		final String nsPlt = "ricplt";
 		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
-				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE, nsPlt);
+				CaasIngressController.PP_CLUSTER, "cluster", CaasIngressController.PP_NAMESPACE, nsPlt);
+		logger.info("Invoking {}", uri);
+		String s = testRestTemplateStandardRole().getForObject(uri, String.class);
+		Assert.assertNull(s);
+	}
+
+	// Unknown namespace triggers a controller exception
+	@Test
+	public void bogusNsTest() {
+		final String ns = "unknown";
+		URI uri = buildUri(null, CaasIngressController.CONTROLLER_PATH, CaasIngressController.PODS_METHOD,
+				CaasIngressController.PP_CLUSTER, CaasIngressController.CLUSTER_PLT, CaasIngressController.PP_NAMESPACE,
+				ns);
 		logger.info("Invoking {}", uri);
 		String s = testRestTemplateStandardRole().getForObject(uri, String.class);
 		Assertions.assertFalse(s.isEmpty());
-		Assertions.assertTrue(s.contains(nsPlt));
+		Assertions.assertTrue(s.contains("RIC Dashboard Error"));
 	}
 
 }