Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Require RIC instance key in controller methods
[portal/ric-dashboard.git]
/
webapp-backend
/
src
/
test
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
controller
/
A1MediatorControllerTest.java
diff --git
a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
index
f6c5f4b
..
325d869
100644
(file)
--- a/
webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
+++ b/
webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java
@@
-2,7
+2,7
@@
* ========================LICENSE_START=================================
* O-RAN-SC
* %%
* ========================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.
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,7
+26,9
@@
import java.net.URI;
import org.junit.Assert;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
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.A1MediatorMockConfiguration;
import org.oransc.ric.portal.dashboard.config.A1MediatorMockConfiguration;
+import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration;
import org.oransc.ric.portal.dashboard.model.SuccessTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oransc.ric.portal.dashboard.model.SuccessTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-43,7
+45,7
@@
public class A1MediatorControllerTest extends AbstractControllerTest {
@Test
public void versionTest() {
@Test
public void versionTest() {
- URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH,
A1MediatorController
.VERSION_METHOD);
+ URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH,
DashboardConstants
.VERSION_METHOD);
logger.info("Invoking {}", uri);
SuccessTransport st = restTemplate.getForObject(uri, SuccessTransport.class);
Assertions.assertFalse(st.getData().toString().isEmpty());
logger.info("Invoking {}", uri);
SuccessTransport st = restTemplate.getForObject(uri, SuccessTransport.class);
Assertions.assertFalse(st.getData().toString().isEmpty());
@@
-51,7
+53,8
@@
public class A1MediatorControllerTest extends AbstractControllerTest {
@Test
public void getTest() throws IOException {
@Test
public void getTest() throws IOException {
- URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH, A1MediatorController.PP_POLICIES,
+ URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+ RICInstanceMockConfiguration.INSTANCE_KEY_1, A1MediatorController.PP_POLICIES,
A1MediatorMockConfiguration.AC_CONTROL_NAME);
logger.info("Invoking {}", uri);
ResponseEntity<String> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
A1MediatorMockConfiguration.AC_CONTROL_NAME);
logger.info("Invoking {}", uri);
ResponseEntity<String> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null,
@@
-62,12
+65,13
@@
public class A1MediatorControllerTest extends AbstractControllerTest {
@Test
public void putTest() throws IOException {
@Test
public void putTest() throws IOException {
+ URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY,
+ RICInstanceMockConfiguration.INSTANCE_KEY_1, A1MediatorController.PP_POLICIES,
+ A1MediatorMockConfiguration.AC_CONTROL_NAME);
ObjectMapper mapper = new ObjectMapper();
JsonNode body = mapper.readTree("{ \"policy\" : true }");
ObjectMapper mapper = new ObjectMapper();
JsonNode body = mapper.readTree("{ \"policy\" : true }");
- URI uri = buildUri(null, A1MediatorController.CONTROLLER_PATH, A1MediatorController.PP_POLICIES,
- A1MediatorMockConfiguration.AC_CONTROL_NAME);
HttpEntity<JsonNode> entity = new HttpEntity<>(body);
HttpEntity<JsonNode> entity = new HttpEntity<>(body);
- logger.info("Invoking {}
", uri
);
+ logger.info("Invoking {}
with body {}", uri, body
);
ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
Void.class);
Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
Void.class);
Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());