summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java4
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java30
2 files changed, 31 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
index 388242371..563c9ff20 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
@@ -38,8 +38,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.portalsdk.core.controller.RestrictedBaseController;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.aai.AaiGetVnfResponse;
import org.onap.vid.aai.AaiResponse;
import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigData;
import org.onap.vid.aai.ServiceInstancesSearchResults;
@@ -201,7 +199,7 @@ public class AaiController extends RestrictedBaseController {
@RequestMapping(value = "/get_system_prop_vnf_prov_status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<String> getTargetProvStatus() {
- String p = SystemProperties.getProperty("aai.vnf.provstatus");
+ String p = systemPropertiesWrapper.getProperty("aai.vnf.provstatus");
return new ResponseEntity<>(p, HttpStatus.OK);
}
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
index 83cc61ea4..51bdec882 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
@@ -50,6 +50,8 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.vid.aai.AaiResponse;
import org.onap.vid.aai.AaiResponseTranslator;
import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigData;
@@ -531,5 +533,33 @@ public class AaiControllerTest {
.andExpect(content().json(objectMapper.writeValueAsString(expectedPnfs)));
}
+ @Test
+ public void getUserID_shouldReturnOKResponse_withExtractedUserId() throws Exception {
+ String userPropertyKey = "user";
+ String expectedUserLoginId = "testUserLoginId";
+ User user = new User();
+ user.setLoginId(expectedUserLoginId);
+ given(systemPropertiesWrapper.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).willReturn(userPropertyKey);
+
+ mockMvc.perform(get("/getuserID")
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_JSON)
+ .sessionAttr(userPropertyKey, user))
+ .andExpect(status().isOk())
+ .andExpect(content().string(expectedUserLoginId));
+ }
+
+ @Test
+ public void getTargetProvStatus_shouldReturnProperty() throws Exception {
+ String expectedResponse = "targetProvStatus";
+ given(systemPropertiesWrapper.getProperty("aai.vnf.provstatus")).willReturn(expectedResponse);
+
+ mockMvc.perform(get("/get_system_prop_vnf_prov_status")
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_JSON))
+ .andExpect(status().isOk())
+ .andExpect(content().string(expectedResponse));
+ }
+
}