diff options
| author |   Eylon Malin <eylon.malin@intl.att.com> | 2019-11-21 12:01:58 +0200 |
|---|---|---|
| committer | Eylon Malin <eylon.malin@intl.att.com> | 2019-11-25 15:30:52 +0200 |
| commit | cbe6877e50b69370170bea4057bb8d5baf42946e (patch) | |
| tree | d68c31c9ecd55a371944fe08e5c45025c9dca9ef /vid-automation/src/main/java | |
| parent | c1777f478aa421c35667a99fd2199569bc9e4a8a (diff) | |
identify macro services without instantiation type in BE by feature flag
Issue-ID: VID-705
Change-Id: Ia618f91133cdecbd35eac4346496a6ff38a3753e
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Diffstat (limited to 'vid-automation/src/main/java')
| -rw-r--r-- | vid-automation/src/main/java/vid/automation/test/infra/Features.java | 1 | ||||
| -rw-r--r-- | vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java | 9 |
2 files changed, 6 insertions, 4 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 a2892e5ea..7c2d61cc5 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 @@ -57,6 +57,7 @@ public enum Features implements Feature { FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI, FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS, + FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND, ; public boolean isActive() { diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index 0671815bd..a9378e6df 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -5,6 +5,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static vid.automation.test.infra.Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND; import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION; import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE; @@ -29,7 +30,7 @@ import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessi import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.testng.Assert; -import org.testng.TimeBombSkipException; +import org.testng.SkipException; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -181,9 +182,9 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test private void browseServiceModel_deployServiceMacroByMACRO_SERVICESConfig_creationPopupIsOldMacro() { - if (FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() ) { - throw new TimeBombSkipException("skipping identify macro by uuid for awhile", "2019/11/25"); - //also need to handle the simulator preset by using good ModelInfo instance + if (FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI.isActive() && + ! FLAG_2002_IDENTIFY_INVARIANT_MACRO_UUID_BY_BACKEND.isActive()) { + throw new SkipException("some 2002 flags shall come along together"); } deployServiceAndAssertInstantiationType( "csar15782222_invariantUUIDMacro.zip", |