fix browse sdc with macro instantiation type to use unique IDs

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

diff --git a/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java b/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java
index 043e43a..84b2cd9 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java
@@ -61,6 +61,10 @@ public class ModelInfo {
     public static final ModelInfo collectionResourceService = new ModelInfo("abd0cb02-5f97-42cd-be93-7dd3e31a6a64", "04bdd793-32ed-4045-adea-4e096304a067", "csar_collection_resource.zip");
     public static final ModelInfo collectionResourceForResume = new ModelInfo("6e0bec91-09f3-43aa-9cf3-e617cd0146be", "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", "csar_collection_resource_for_resume.zip");
     public static final ModelInfo transportWithPnfsService = new ModelInfo("12550cd7-7708-4f53-a09e-41d3d6327ebc", "561faa57-7bbb-40ec-a81c-c0d4133e98d4", "csarTransportWithPnfs.zip");
+    public static final ModelInfo serviceWithInstantiationTypeMacro = new ModelInfo(
+        "fca0674c-f825-44bc-a87f-41ba7a0b4ab7",
+        "44173a37-0fce-486b-84be-40582bf3e40b",
+        "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip");
     public static final ImmutableList<ModelInfo> superSetOfModelInfos = buildModelInfos();
 
     public static ImmutableList<ModelInfo> buildModelInfos()  {
@@ -82,6 +86,7 @@ public class ModelInfo {
                 .add(transportWithPnfsService)
                 .add(collectionResourceService)
                 .add(collectionResourceForResume)
+                .add(serviceWithInstantiationTypeMacro)
                 .build();
     }
 }

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 0331420..0671815 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java
@@ -174,9 +174,8 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest {
     @Test
     private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro()  {
         deployServiceAndAssertInstantiationType(
-                "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip",
-                invariantUUIDAlacarte,
-                new DeployModernUIMacroDialog()
+            ModelInfo.serviceWithInstantiationTypeMacro,
+            new DeployModernUIMacroDialog()
         );
     }
 

diff --git a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip
index 1f073b4..b3ba460 100644 (file)
Binary files a/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip and b/vid-ext-services-simulator/src/main/resources/download_files/csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip differ