diff options
Diffstat (limited to 'vid-automation/src/test')
3 files changed, 18 insertions, 18 deletions
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 3d1dfb2ce..69267fd4d 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 @@ -730,7 +730,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() { @@ -836,7 +836,7 @@ public class AaiApiTest extends BaseApiAaiTest { } @Test - @FeatureTogglingTest(Features.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH) + @FeatureTogglingTest(Features.FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG) public void getVnfsWithCustomQueryNewReducedResponse() throws URISyntaxException { String globalCustomerId = "globalCustomerId1-360-as988q"; diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index 84574947e..3ec0c16e4 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -1,6 +1,14 @@ package org.onap.vid.more; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertThat; + import com.fasterxml.jackson.databind.JsonNode; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,15 +20,6 @@ import org.testng.annotations.Test; import vid.automation.test.infra.SkipTestUntil; import vid.automation.test.services.SimulatorApi; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertThat; - public class LoggerFormatTest extends BaseApiTest { private final static String logChecker = System.getProperty("EELF_LOG_CHECKER", "http://my-logchecker:8888/validate"); @@ -36,7 +35,7 @@ public class LoggerFormatTest extends BaseApiTest { SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); } - @SkipTestUntil("2019-08-22") + @SkipTestUntil("2019-09-24") @Test public void validateAuditLogsFormat() { validateLogsFormat("audit"); @@ -47,7 +46,7 @@ public class LoggerFormatTest extends BaseApiTest { validateLogsFormat("error"); } - @SkipTestUntil("2019-08-22") + @SkipTestUntil("2019-09-24") @Test public void validateMetricsLogsFormat() { validateLogsFormat("metrics", "metric"); diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 25bdff696..796c8be8d 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -29,9 +29,10 @@ FLAG_VF_MODULE_RESUME_STATUS_CREATE = true FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL = false FLAG_1906_COMPONENT_INFO = false FLAG_1906_INSTANTIATION_API_USER_VALIDATION = true -FLAG_1908_RESUME_MACRO_SERVICE=true -FLAG_1908_RELEASE_TENANT_ISOLATION=true -FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT=true -FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false -FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG=true +FLAG_1908_RESUME_MACRO_SERVICE = true +FLAG_1908_RELEASE_TENANT_ISOLATION = true +FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT = true +FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH = false +FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = true +FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false |