identify macro services without instantiation type in BE by feature flag

[vid.git] / vid-automation / src / test / java / org / onap / vid / api / SdcApiTest.java

diff --git a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java
index f22b6de..8549613 100644 (file)
--- a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java
@@ -21,8 +21,10 @@
 package org.onap.vid.api;
 
 import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonPartEquals;
 import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals;
 import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNot.not;
@@ -129,7 +131,16 @@ public class SdcApiTest extends BaseApiTest {
         ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MACRO_INSTANTIATION_TYPE_UUID), String.class);
         assertEquals(response.getStatusCode(), HttpStatus.OK);
         String emptyInstantiationTypeExpectedResponse = loadResourceAsString(EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE);
-        assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(emptyInstantiationTypeExpectedResponse))));
+
+        final String body = response.getBody();
+
+        assertThat(body, jsonEquals(emptyInstantiationTypeExpectedResponse)
+            .when(IGNORING_ARRAY_ORDER)
+            .whenIgnoringPaths("service.vidNotions.instantiationUI", "service.vidNotions.instantiationType"));
+
+        assertThat(body, jsonPartEquals("service.vidNotions.instantiationType",
+            Features.FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND.isActive()
+                ? "ALaCarte" : "ClientConfig"));
     }
 
     @Test
@@ -149,7 +160,9 @@ public class SdcApiTest extends BaseApiTest {
         ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MIN_MAX_INITIAL_UUID), String.class);
         assertEquals(response.getStatusCode(), HttpStatus.OK);
         String minMaxInitialExpectedResponse = loadResourceAsString("sdcApiTest/minMaxInitialExpectedResponse.json");
-        assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(minMaxInitialExpectedResponse))));
+        assertThat(response.getBody(), jsonEquals(minMaxInitialExpectedResponse)
+            .when(IGNORING_ARRAY_ORDER)
+            .whenIgnoringPaths("service.vidNotions.instantiationUI", "service.vidNotions.instantiationType"));
     }
 
     @Test
@@ -163,12 +176,18 @@ public class SdcApiTest extends BaseApiTest {
 
     @Test
     @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING)
-    public void getServiceModelWithServiceRoleGrouping(){
+    public void getServiceModelWithServiceRoleGrouping() throws Exception {
         registerToSimulatorWithPresets(GROUPING_SERVICE_ROLE_UUID, GROUPING_SERVICE_ROLE_INVARIANT_UUID, GROUPING_SERVICE_ROLE_FILE_PATH);
         ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + GROUPING_SERVICE_ROLE_UUID), String.class);
         assertEquals(response.getStatusCode(), HttpStatus.OK);
         String groupingServiceRoleExpectedResponse = loadResourceAsString(GROUPING_SERVICE_ROLE_EXPECTED_RESPONSE);
-        assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(groupingServiceRoleExpectedResponse)));
+        assertThat(response.getBody(), jsonEquals(groupingServiceRoleExpectedResponse)
+            .when(IGNORING_ARRAY_ORDER)
+            .whenIgnoringPaths("service.vidNotions.instantiationUI"));
+
+        //assert that instantiationUI is not legacy
+        JsonNode instantiationUI = objectMapper.readValue(response.getBody(), JsonNode.class).get("service").get("vidNotions").get("instantiationUI");
+        assertThat(instantiationUI.asText(), not(equalTo("legacy")));
     }
 
     private void registerToSimulatorWithPresets(String uuid, String invariantUuid, String pathPath){
@@ -178,15 +197,6 @@ public class SdcApiTest extends BaseApiTest {
         registerExpectationFromPresets(presets, CLEAR_THEN_SET);
     }
 
-    private String turnOffInstantiationUI(String expectedJson) {
-        if (!Features.FLAG_5G_IN_NEW_INSTANTIATION_UI.isActive()) {
-            // replaces the instantiationUI field-value with "legacy", whatever it was
-            return expectedJson.replaceFirst("(\"instantiationUI\": *\")[^\"]*(\",)", "$1legacy$2");
-        } else {
-            return expectedJson;
-        }
-    }
-
     @Test
     public void withModelFromE2eWithToscaParserButNewFlow_requestModels_expectVnfRelatedVfModulesNotNull() {
 
@@ -220,7 +230,7 @@ public class SdcApiTest extends BaseApiTest {
     public void whenCallSdc_thenRequestRecordedInMetricsLog() {
 
         ModelInfo modelInfo = ModelInfo.transportWithPnfsService;
-
+        String internalPath = SDC_GET_SERVICE_MODEL + modelInfo.modelVersionId;
         registerExpectationFromPresets(ImmutableList.of(
             new PresetSDCGetServiceToscaModelGet(modelInfo),
             new PresetSDCGetServiceMetadataGet(modelInfo),
@@ -228,11 +238,12 @@ public class SdcApiTest extends BaseApiTest {
         ), CLEAR_THEN_SET);
 
         ResponseEntity<String> response = restTemplate.getForEntity(
-            buildUri(SDC_GET_SERVICE_MODEL + modelInfo.modelVersionId), String.class);
+            buildUri(internalPath), String.class);
 
         final String requestId = response.getHeaders().getFirst("X-ECOMP-RequestID-echo");
 
         LoggerFormatTest.assertHeadersAndMetricLogs(restTemplate, uri, requestId, SDC_ROOT_PATH, 2);
+        LoggerFormatTest.verifyExistenceOfIncomingReqsInAuditLogs(restTemplate, uri, requestId, internalPath);
     }
 
 }