1 files changed, 54 insertions, 26 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
index dfa79bf30..0741a4b38 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java
@@ -1,83 +1,89 @@
 package vid.automation.test.test;
 
+import static org.hamcrest.Matchers.containsString;
+import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc;
+import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
+
+import com.google.common.collect.ImmutableList;
 import org.junit.Assert;
-import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
-import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils;
+import org.onap.sdc.ci.tests.datatypes.UserCredentials;
+import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateMacroPre1806Post;
 import org.openqa.selenium.WebElement;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import vid.automation.test.Constants;
-import vid.automation.test.infra.FeatureTogglingTest;
 import vid.automation.test.infra.SelectOption;
 import vid.automation.test.model.User;
 import vid.automation.test.sections.BrowseASDCPage;
 import vid.automation.test.sections.SideMenu;
 import vid.automation.test.services.SimulatorApi;
 
-import static org.hamcrest.Matchers.containsString;
-import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION;
-
 public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
 
     static final String NEW_INSTANCE_NAME = "New Instance Name";
 
     static final String SERVICE_NAME_PNF = "vidmacrofalsenaming";
-    static final String SERVICE_UUID = "4d71990b-d8ad-4510-ac61-496288d9078e";
-    static final String SUBSCRIBER = "FIREWALL/MISC";
+    static final String SUBSCRIBER = "CRAIG/ROBERTS";
     static final String PRODUCT = "Transport";
     static final String SERVICE_TYPE = "AIM Transport";
-    static final String LCP_REGION = "rdm3";
+    static final String LCP_REGION = "olson3";
 
-    static final String TENANT = "AIN Web Tool-15-D-testgamma";
+    static final String TENANT = "AIN Web Tool-15-D-testalexandria";
     static final String AIC_ZONE = "NFTJSSSS-NFT1";
     static final String PROJECT = "yyy1";
     static final String OWNING_ENTITY = "aaa1";
 
     static final String RESOURCE_NAME = "MULTI_PROVIDER_PORT_GROUP 0";
     static final String RESOURCE_DESCRIPTION = "Creates a neutron multi-provider VLAN network with dummy subnet";
-    static final String SERVICE_INVARIANT_UUID = "d27e42cf-087e-4d31-88ac-6c4b7585f800";
     static final String SERVICE_VERSION = "1.0";
     static final String SERVICE_DESCRIPTION = "vidmacrofalsenaming";
     static final String SERVICE_CATEGORY = "Network L1-3";
 
-    public SanityMacroDeployTest() {
-    }
-
-
     @BeforeClass
     protected void registerToSimulator() {
-        SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND,
-                "sanity/browse_sdc_catalog_two_services.json",
+        resetGetServicesCache();
+        invalidateSdcModelsCache();
+        SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET,
                 "sanity/aai_get_services.json",
                 "sanity/aai_get_aic_zones.json",
-                "search_for_service_instance/aai_get_full_subscribers.json",
-                "search_for_service_instance/aai_get_subscribers_for_customer_FIREWALL-MISC.json",
+                "search_for_service_instance/aai_get_subscribers_for_customer_CRAIG-ROBERTS.json",
                 "sanity/aai_get_tenants.json",
                 "sanity/get_mso_get_orch_request.json",
-                "sanity/post_mso_create_service_instance.json",
                 "sanity/get_sdc_catalog_services_4d71990b.json",
                 "sanity/aai_named_query_for_view_edit.json"
         );
+        SimulatorApi.registerExpectationFromPresets(ImmutableList.of(
+                new PresetAAIServiceDesignAndCreationPut(),
+                new PresetMSOCreateMacroPre1806Post(),
+                new PresetAAIGetSubscribersGet(),
+                PresetAAIGetCloudOwnersByCloudRegionId.PRESET_RDM3_TO_ATT_NC
+                ),
+                APPEND);
     }
 
     @Override
     protected UserCredentials getUserCredentials() {
-        String userName = Constants.Users.FIREWALL_MISC_AIM_TRANSPORT;
+        String userName = Constants.Users.CRAIG_ROBERTS_AIM_TRANSPORT;
         User user = usersService.getUser(userName);
         return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", "");
     }
 
-    @FeatureTogglingTest(value = FLAG_ASYNC_INSTANTIATION, flagActive = false)
     @Test
     private void browseServiceModel_MacroService_CreatedSuccessfully() {
+
         BrowseASDCPage browseASDCPage = new BrowseASDCPage();
         SideMenu.navigateToBrowseASDCPage();
 
         GeneralUIUtils.ultimateWait();
-        browseASDCPage.clickDeployServiceButtonByServiceUUID(SERVICE_UUID);
+        browseASDCPage.clickDeployServiceButtonByServiceUUID(macroForBrowseSdc.modelVersionId);
 
         WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30);
         Assert.assertThat(modalTitle.getText().toLowerCase(), containsString("macro"));
+        GeneralUIUtils.ultimateWait();
 
         assertServiceDetails();
 
@@ -91,17 +97,29 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
     }
 
     private void fillCreateInstanceModal() {
+
+
+        waitForInstanceField();
+        GeneralUIUtils.ultimateWait();
+        GeneralUIUtils.sleep(10000); // stuff is getting weird
+
         WebElement instance_name = GeneralUIUtils.getWebElementByTestID(Constants.INSTANCE_NAME_SELECT_TESTS_ID, 30);
         instance_name.sendKeys(NEW_INSTANCE_NAME);
 
+        waitForInstanceField();
+        GeneralUIUtils.ultimateWait();
         SelectOption.byTestIdAndVisibleText(SUBSCRIBER, Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID);
 
+        waitForInstanceField();
         GeneralUIUtils.ultimateWait();
         SelectOption.byTestIdAndVisibleText(PRODUCT, Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID);
+
+        waitForInstanceField();
         GeneralUIUtils.ultimateWait();
         SelectOption.byTestIdAndVisibleText(SERVICE_TYPE, Constants.SERVICE_TYPE_SELECT_TESTS_ID);
+
         GeneralUIUtils.ultimateWait();
-        SelectOption.byTestIdAndVisibleText(LCP_REGION, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
+        viewEditPage.selectLcpRegion(LCP_REGION, "AIC");
 
         SelectOption.byTestIdAndVisibleText(TENANT, Constants.ViewEdit.TENANT_SELECT_TESTS_ID);
         SelectOption.byTestIdAndVisibleText(AIC_ZONE, Constants.ViewEdit.AIC_ZONE_TEST_ID);
@@ -109,12 +127,22 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
         SelectOption.byTestIdAndVisibleText(OWNING_ENTITY, Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID);
     }
 
+    private void waitForInstanceField() {
+        GeneralUIUtils.sleep(200); // stuff is getting weird
+        SelectOption.waitForOptionInSelect(SUBSCRIBER, Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID);
+        SelectOption.waitForOptionInSelect(TENANT, Constants.ViewEdit.TENANT_SELECT_TESTS_ID);
+        SelectOption.waitForOptionInSelect(AIC_ZONE, Constants.ViewEdit.AIC_ZONE_TEST_ID);
+        SelectOption.waitForOptionInSelect(PROJECT, Constants.OwningEntity.PROJECT_SELECT_TEST_ID);
+        SelectOption.waitForOptionInSelect(OWNING_ENTITY, Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID);
+        GeneralUIUtils.sleep(200); // stuff is getting weird
+    }
+
     private void assertServiceDetails() {
         WebElement currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_NAME, 30);
         Assert.assertEquals(currElem.getText(), SERVICE_NAME_PNF);
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_UUID, 30);
-        Assert.assertEquals(currElem.getText(), SERVICE_UUID);
+        Assert.assertEquals(currElem.getText(), macroForBrowseSdc.modelVersionId);
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.RESOURCE_NAME, 30);
         Assert.assertEquals(currElem.getText(), RESOURCE_NAME);
@@ -123,7 +151,7 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
         Assert.assertEquals(currElem.getText(), RESOURCE_DESCRIPTION);
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_INVARIANT_UUID, 30);
-        Assert.assertEquals(currElem.getText(), SERVICE_INVARIANT_UUID);
+        Assert.assertEquals(currElem.getText(), macroForBrowseSdc.modelInvariantId);
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_VERSION, 30);
         Assert.assertEquals(currElem.getText(), SERVICE_VERSION);