diff options
3 files changed, 13 insertions, 13 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 6b5105caa..6a15d8961 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -51,6 +51,7 @@ public enum Features implements Feature { FLAG_HANDLE_SO_WORKFLOWS, FLAG_CREATE_ERROR_REPORTS, FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, + FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH, FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, ; 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"); |