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%2FAppManagerControllerTest.java;h=52a383ec255d408493c59d6d73da49e6936fe9c3;hb=43e79e4a410e1cf377d344cae2c9a7a6e4806fe9;hp=961e69319983e63d3e8d671064b0f9c1db8f6b77;hpb=53f1fcf033e3a166d7203e0a1c5e0971f9c6bc16;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
index 961e6931..52a383ec 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java
@@ -26,10 +26,9 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
 import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.ConfigMetadata;
 import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.XAppInfo;
 import org.oransc.ric.plt.appmgr.client.model.Xapp;
+import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
 import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps;
@@ -103,8 +102,8 @@ public class AppManagerControllerTest extends AbstractControllerTest {
 		URI uri = buildUri(null, AppManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
 				RICInstanceMockConfiguration.INSTANCE_KEY_1, AppManagerController.XAPPS_METHOD);
 		logger.info("Invoking {}", uri);
-		XAppInfo info = new XAppInfo();
-		Xapp app = testRestTemplateAdminRole().postForObject(uri, info, Xapp.class);
+		XappDescriptor descr = new XappDescriptor();
+		Xapp app = testRestTemplateAdminRole().postForObject(uri, descr, Xapp.class);
 		Assertions.assertFalse(app.getName().isEmpty());
 	}
 
@@ -128,25 +127,24 @@ public class AppManagerControllerTest extends AbstractControllerTest {
 	}
 
 	@Test
-	public void createConfigTest() {
+	public void modifyConfigTest() {
 		URI uri = buildUri(null, AppManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
 				RICInstanceMockConfiguration.INSTANCE_KEY_1, AppManagerController.CONFIG_METHOD);
 		logger.info("Invoking {}", uri);
-		XAppConfig newConfig = new XAppConfig();
-		XAppConfig response = testRestTemplateAdminRole().postForObject(uri, newConfig, XAppConfig.class);
-		Assertions.assertNotNull(response.getConfig());
+		XAppConfig modConfig = new XAppConfig();
+		HttpEntity<XAppConfig> entity = new HttpEntity<>(modConfig);
+		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
+				Void.class);
+		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
 	}
 
 	@Test
-	public void deleteConfigTest() {
-		URI uri = buildUri(null, AppManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
-				RICInstanceMockConfiguration.INSTANCE_KEY_1, AppManagerController.CONFIG_METHOD, "app");
+	public void invalidInstanceTest() {
+		URI uri = buildUri(null, AppManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "bogus",
+				AppManagerController.CONFIG_METHOD);
 		logger.info("Invoking {}", uri);
-		ConfigMetadata delConfig = new ConfigMetadata();
-		HttpEntity<ConfigMetadata> entity = new HttpEntity<>(delConfig);
-		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.DELETE, entity,
-				Void.class);
-		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
+		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null, Void.class);
+		Assertions.assertTrue(voidResponse.getStatusCode().is5xxServerError());
 	}
 
 }