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;
@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);
}
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;
.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));
+ }
+
}