2 files changed, 180 insertions, 139 deletions
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 b51bbdc31..f9a374948 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
@@ -21,6 +21,8 @@
 
 package org.onap.vid.controller;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
@@ -45,8 +47,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.vid.aai.AaiResponse;
+import org.onap.vid.aai.AaiResponseTranslator;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigData;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataError;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataOk;
@@ -94,7 +98,7 @@ public class AaiControllerTest {
     @Before
     public void setUp() {
         aaiController = new AaiController(aaiService, aaiRestInterface, roleProvider, systemPropertiesWrapper,
-            featureManager);
+                featureManager);
         mockMvc = MockMvcBuilders.standaloneSetup(aaiController).build();
     }
 
@@ -108,12 +112,12 @@ public class AaiControllerTest {
         given(aaiService.getAicZoneForPnf(globalCustomerId, serviceType, serviceId)).willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_get_aic_zone_for_pnf/{globalCustomerId}/{serviceType}/{serviceId}", globalCustomerId, serviceType,
-                serviceId)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
+                get("/aai_get_aic_zone_for_pnf/{globalCustomerId}/{serviceType}/{serviceId}", globalCustomerId, serviceType,
+                        serviceId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
     }
 
     @Test
@@ -124,10 +128,10 @@ public class AaiControllerTest {
         given(aaiService.getInstanceGroupsByVnfInstanceId(vnfInstanceId)).willReturn(aaiResponse);
 
         mockMvc.perform(get("/aai_get_instance_groups_by_vnf_instance_id/{vnfInstanceId}", vnfInstanceId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
     }
 
     @Test
@@ -140,17 +144,17 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(eq("VidAaiController"), anyString(), eq(Unchecked.toURI(
-            "search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:"
-                + serviceInstanceId)),
-            eq(false)).getResponse()).willReturn(response);
+                "search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:"
+                        + serviceInstanceId)),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
-                serviceInstanceType)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
+                        serviceInstanceType)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -163,17 +167,17 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(eq("VidAaiController"), anyString(), eq(Unchecked.toURI(
-            "search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:"
-                + serviceInstanceId)),
-            eq(false)).getResponse()).willReturn(response);
+                "search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:"
+                        + serviceInstanceId)),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
-                serviceInstanceType)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
+                        serviceInstanceType)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -186,21 +190,21 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(
-            eq("VidAaiController"),
-            anyString(),
-            eq(Unchecked.toURI(
-                "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
-                    + serviceSubscriptionId + "?depth=0")),
-            eq(false)).getResponse()).willReturn(response);
+                eq("VidAaiController"),
+                anyString(),
+                eq(Unchecked.toURI(
+                        "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
+                                + serviceSubscriptionId + "?depth=0")),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(
-                get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
-                    serviceSubscriptionId)
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(
+                        get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
+                                serviceSubscriptionId)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -209,21 +213,21 @@ public class AaiControllerTest {
         String serviceSubscriptionId = "testServiceSubscriptionId";
         String expectedResponseBody = "Failed to fetch data from A&AI, check server logs for details.";
         given(aaiRestInterface.RestGet(
-            eq("VidAaiController"),
-            anyString(),
-            eq(Unchecked.toURI(
-                "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
-                    + serviceSubscriptionId + "?depth=0")),
-            eq(false)).getResponse()).willReturn(null);
+                eq("VidAaiController"),
+                anyString(),
+                eq(Unchecked.toURI(
+                        "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
+                                + serviceSubscriptionId + "?depth=0")),
+                eq(false)).getResponse()).willReturn(null);
 
         mockMvc
-            .perform(
-                get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
-                    serviceSubscriptionId)
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(
+                        get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
+                                serviceSubscriptionId)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -231,18 +235,18 @@ public class AaiControllerTest {
         PortMirroringConfigDataOk okConfigData = new PortMirroringConfigDataOk("foo");
         PortMirroringConfigDataError errorConfigData = new PortMirroringConfigDataError("bar", "{ baz: qux }");
         Map<String, PortMirroringConfigData> expectedJson = ImmutableMap.of(
-            ID_1, okConfigData,
-            ID_2, errorConfigData);
+                ID_1, okConfigData,
+                ID_2, errorConfigData);
         given(aaiService.getPortMirroringConfigData(ID_1)).willReturn(okConfigData);
         given(aaiService.getPortMirroringConfigData(ID_2)).willReturn(errorConfigData);
 
         mockMvc
-            .perform(get("/aai_getPortMirroringConfigsData")
-                .param("configurationIds", ID_1, ID_2)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(expectedJson)));
+                .perform(get("/aai_getPortMirroringConfigsData")
+                        .param("configurationIds", ID_1, ID_2)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(expectedJson)));
     }
 
     @Test
@@ -250,18 +254,18 @@ public class AaiControllerTest {
         PortDetailsOk portDetailsOk = new PortDetailsOk("foo", "testInterface", true);
         PortDetailsError portDetailsError = new PortDetailsError("bar", "{ baz: qux }");
         Multimap<String, PortDetails> expectedJson = ImmutableMultimap.of(
-            ID_1, portDetailsOk,
-            ID_2, portDetailsError);
+                ID_1, portDetailsOk,
+                ID_2, portDetailsError);
         given(aaiService.getPortMirroringSourcePorts(ID_1)).willReturn(Lists.newArrayList(portDetailsOk));
         given(aaiService.getPortMirroringSourcePorts(ID_2)).willReturn(Lists.newArrayList(portDetailsError));
 
         mockMvc
-            .perform(get("/aai_getPortMirroringSourcePorts")
-                .param("configurationIds", ID_1, ID_2)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(expectedJson.asMap())));
+                .perform(get("/aai_getPortMirroringSourcePorts")
+                        .param("configurationIds", ID_1, ID_2)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(expectedJson.asMap())));
     }
 
     @Test
@@ -275,15 +279,15 @@ public class AaiControllerTest {
         String expectedResponseBody = "myResponse";
         AaiResponse<String> aaiResponse = new AaiResponse<>(expectedResponseBody, "", HttpStatus.OK.value());
         given(aaiService
-            .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion))
-            .willReturn(aaiResponse);
+                .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion))
+                .willReturn(aaiResponse);
 
         mockMvc
-            .perform(get(urlTemplate, globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get(urlTemplate, globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -292,45 +296,45 @@ public class AaiControllerTest {
         given(aaiService.getAaiZones()).willReturn(new AaiResponse(aicZones, "", HttpStatus.OK.value()));
 
         mockMvc.perform(get("/aai_get_aic_zones")
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(aicZones)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(aicZones)));
     }
 
     @Test
     public void getAicZones_shouldReturnErrorResponse_whenAaiHttpStatusOtherThanOK() throws Exception {
         String expectedErrorMessage = "Calling AAI Failed";
         given(aaiService.getAaiZones())
-            .willReturn(new AaiResponse(null, expectedErrorMessage, HttpStatus.INTERNAL_SERVER_ERROR.value()));
+                .willReturn(new AaiResponse(null, expectedErrorMessage, HttpStatus.INTERNAL_SERVER_ERROR.value()));
 
         mockMvc.perform(get("/aai_get_aic_zones")
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedErrorMessage));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedErrorMessage));
     }
 
     @Test
     public void getSpecificPnf_shouldReturnPnfObjectForPnfId() throws Exception {
         String pnfId = "MyPnfId";
         Pnf pnf = Pnf.builder()
-            .withPnfId(pnfId)
-            .withPnfName("TestPnf")
-            .withPnfName2("pnfName2")
-            .withPnfName2Source("pnfNameSource")
-            .withEquipModel("model")
-            .withEquipType("type")
-            .withEquipVendor("vendor")
-            .build();
+                .withPnfId(pnfId)
+                .withPnfName("TestPnf")
+                .withPnfName2("pnfName2")
+                .withPnfName2Source("pnfNameSource")
+                .withEquipModel("model")
+                .withEquipType("type")
+                .withEquipVendor("vendor")
+                .build();
         AaiResponse<Pnf> aaiResponse = new AaiResponse<>(pnf, "", HttpStatus.OK.value());
         given(aaiService.getSpecificPnf(pnfId)).willReturn(aaiResponse);
 
         mockMvc.perform(get("/aai_get_pnfs/pnf/{pnf_id}", pnfId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(pnf)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(pnf)));
     }
 
     @Test
@@ -340,10 +344,10 @@ public class AaiControllerTest {
         given(aaiService.getSpecificPnf(pnfId)).willThrow(new RuntimeException(expectedErrorMessage));
 
         mockMvc.perform(get("/aai_get_pnfs/pnf/{pnf_id}", pnfId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedErrorMessage));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedErrorMessage));
     }
 
     public void getPNFInstances_shouldReturnOKResponseFromAAIService() throws Exception {
@@ -359,16 +363,16 @@ public class AaiControllerTest {
         AaiResponse<String> aaiResponse = new AaiResponse<>(expectedResponseBody, "", HttpStatus.OK.value());
 
         given(aaiService
-            .getPNFData(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion, equipVendor,
-                equipModel)).willReturn(aaiResponse);
+                .getPNFData(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion, equipVendor,
+                        equipModel)).willReturn(aaiResponse);
 
         mockMvc.perform(
-            get(urlTemplate, globalCustomerId, serviceType, modelVersionId,
-                modelInvariantId, cloudRegion, equipVendor, equipModel)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                get(urlTemplate, globalCustomerId, serviceType, modelVersionId,
+                        modelInvariantId, cloudRegion, equipVendor, equipModel)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -379,20 +383,20 @@ public class AaiControllerTest {
         Response response = mock(Response.class);
         given(response.readEntity(String.class)).willReturn(expectedResponse);
         given(aaiService
-            .getVersionByInvariantId(request.versions)).willReturn(response);
+                .getVersionByInvariantId(request.versions)).willReturn(response);
 
         mockMvc.perform(
-            post("/aai_get_version_by_invariant_id")
-                .content(objectMapper.writeValueAsString(request))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponse));
+                post("/aai_get_version_by_invariant_id")
+                        .content(objectMapper.writeValueAsString(request))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponse));
     }
 
     @Test
     public void getSubscriberDetails_shouldOmitServiceInstancesFromSubscriberData_whenFeatureEnabled_andOmitFlagIsTrue()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = true;
         boolean omitServiceInstances = true;
 
@@ -401,21 +405,21 @@ public class AaiControllerTest {
         AaiResponse<String> aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value());
         given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive);
         given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class),
-            eq(isFeatureActive && omitServiceInstances)))
-            .willReturn(aaiResponse);
+                eq(isFeatureActive && omitServiceInstances)))
+                .willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_sub_details/{subscriberId}", subscriberId)
-                .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
+                get("/aai_sub_details/{subscriberId}", subscriberId)
+                        .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
     }
 
     @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureEnabled_andOmitFlagIsFalse()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = true;
         boolean omitServiceInstances = false;
 
@@ -424,7 +428,7 @@ public class AaiControllerTest {
 
     @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureDisabled_andOmitFlagIsTrue()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = false;
         boolean omitServiceInstances = true;
 
@@ -432,30 +436,52 @@ public class AaiControllerTest {
     }
 
     @Test
+    public void getPortMirroringConfigData_givenThreeIds_ReturnsThreeResults() {
+
+        final AaiResponseTranslator.PortMirroringConfigDataOk toBeReturnedForA = new AaiResponseTranslator.PortMirroringConfigDataOk("foobar");
+        final AaiResponseTranslator.PortMirroringConfigDataError toBeReturnedForB = new AaiResponseTranslator.PortMirroringConfigDataError("foo", "{ baz: qux }");
+        final AaiResponseTranslator.PortMirroringConfigDataOk toBeReturnedForC = new AaiResponseTranslator.PortMirroringConfigDataOk("corge");
+
+        Mockito
+                .doReturn(toBeReturnedForA)
+                .doReturn(toBeReturnedForB)
+                .doReturn(toBeReturnedForC)
+                .when(aaiService).getPortMirroringConfigData(Mockito.anyString());
+
+        final Map<String, AaiResponseTranslator.PortMirroringConfigData> result = aaiController.getPortMirroringConfigsData(ImmutableList.of("a", "b", "c"));
+
+        assertThat(result, is(ImmutableMap.of(
+                "a", toBeReturnedForA,
+                "b", toBeReturnedForB,
+                "c", toBeReturnedForC
+        )));
+    }
+
+    @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureDisabled_andOmitFlagIsFalse()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = false;
         boolean omitServiceInstances = false;
         getSubscriberDetails_assertServiceInstancesInclusion(isFeatureActive, omitServiceInstances);
     }
 
     private void getSubscriberDetails_assertServiceInstancesInclusion(boolean isFeatureActive,
-        boolean omitServiceInstances) throws Exception {
+                                                                      boolean omitServiceInstances) throws Exception {
         String subscriberId = "subscriberId";
         String okResponseBody = "OK_RESPONSE";
         AaiResponse<String> aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value());
         given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive);
         given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class),
-            eq(isFeatureActive && omitServiceInstances)))
-            .willReturn(aaiResponse);
+                eq(isFeatureActive && omitServiceInstances)))
+                .willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_sub_details/{subscriberId}", subscriberId)
-                .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
+                get("/aai_sub_details/{subscriberId}", subscriberId)
+                        .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
     }
 }
 
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
index f44099569..39638c305 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
@@ -67,6 +67,21 @@ public class PromiseEcompRequestIdFilterTest {
         buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, specificTxId(someTxId));
     }
 
+
+    @Test
+    public void givenRequestIdHeaderThatIsNotAUUID_headerValueChanged() throws IOException, ServletException {
+
+        final String someTxId = "863850e28544efd94b8afba5f52b3d5";
+
+        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
+                anotherHeader, anotherValue,
+                ECOMP_REQUEST_ID, someTxId
+        );
+
+        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, UserUtils::getRequestId);
+    }
+
+
     @Test
     public void givenMixedCaseRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {