sanity macro test use csar that is still opened in old screens

Issue-ID: VID-701
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I3b8e62a2e76b1d0bcae3f24fd46013ca762a2c83

diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java
index 29e1365..e2f342f 100644 (file)
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java
@@ -25,7 +25,7 @@ public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstance
                 "    }," +
                 "    \"modelInfo\": {" +
                 "      \"modelType\": \"service\"," +
-                "      \"modelInvariantId\": \"d27e42cf-087e-4d31-88ac-6c4b7585f800\"," +
+                "      \"modelInvariantId\": \"a8dcd72d-d44d-44f2-aa85-53aa9ca99cba\"," +
                 "      \"modelVersionId\": \"4d71990b-d8ad-4510-ac61-496288d9078e\"," +
                 "      \"modelName\": \"vidmacrofalsenaming\"," +
                 "      \"modelVersion\": \"1.0\"" +

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 ba951bc..032e729 100644 (file)
--- 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,5 +1,10 @@
 package vid.automation.test.test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+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.onap.sdc.ci.tests.datatypes.UserCredentials;
@@ -17,11 +22,6 @@ import vid.automation.test.sections.BrowseASDCPage;
 import vid.automation.test.sections.SideMenu;
 import vid.automation.test.services.SimulatorApi;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc;
-import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
-
 public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
 
     static final String NEW_INSTANCE_NAME = "New Instance Name";
@@ -150,7 +150,7 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest {
         Assert.assertEquals(currElem.getText(), RESOURCE_DESCRIPTION);
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_INVARIANT_UUID, 30);
-        Assert.assertEquals(currElem.getText(), macroForBrowseSdc.modelInvariantId);
+        Assert.assertEquals(currElem.getText(), "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba");
 
         currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_VERSION, 30);
         Assert.assertEquals(currElem.getText(), SERVICE_VERSION);

diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_4d71990b.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_4d71990b.json
index 56bce65..03b6eb7 100644 (file)
--- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_4d71990b.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_4d71990b.json
@@ -6,7 +6,7 @@
     },
     "simulatorResponse": {
       "responseCode": 200,
-      "file": "csar15782222_invariantUUIDMacro.zip"
+      "file": "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip"
     }
   },
   {
@@ -24,7 +24,7 @@
         "invariantUUID": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
         "name": "vidmacrofalsenaming",
         "version": "1.0",
-        "toscaModelURL": "./csar15782222_invariantUUIDMacro.zip",
+        "toscaModelURL": "./csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip",
         "category": "Network Connectivityv",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
@@ -35,4 +35,4 @@
       }
     }
   }
-]
\ No newline at end of file
+]