From 72ee71bd853417415cba5926a73faae092ee83b5 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 6 Oct 2019 17:50:28 +0300 Subject: Dont filter get_vnf_data_by_globalid_and_service_type_response results Filtering happen on AAI as part of FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG. Issue-ID: VID-659 Change-Id: If43034cce545c90ac44d6d0e70bc0baa3d21283b Signed-off-by: Ittay Stern --- vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vid-automation/src/test/java/org/onap') diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java index 6709771a5..4ca01dc63 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java @@ -3,7 +3,6 @@ package org.onap.vid.api; import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsNot.not; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofL3Network; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofServiceInstance; @@ -741,6 +740,7 @@ public class AaiApiTest extends BaseApiAaiTest { getResourceAsString("serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json"), response); } + @FeatureTogglingTest(value = Features.FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, flagActive = false) @Test public void getVnfDataByGlobalIdAndServiceType() { @@ -761,9 +761,8 @@ public class AaiApiTest extends BaseApiAaiTest { ResponseEntity response = restTemplate.getForEntity(url, String.class); - assertThat(response.getBody(), not(containsString("generic-vfmodule"))); assertResponse(JsonAssert.when(Option.IGNORING_ARRAY_ORDER), - getResourceAsString("changeManagement/reduced_vnf_data_by_globalid_and_service_type.json"), + getResourceAsString("registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json"), response.getBody()); } -- cgit 1.2.3-korg