make GR_API the default testApi in automation tests

[vid.git] / vid-automation / src / main / java / vid / automation / test / test / ChangeManagementTest.java

diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
index 7c577ca..e092ad3 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
@@ -223,7 +223,7 @@ public class ChangeManagementTest extends VidBaseTestCase {
                 , "changeManagement/mso_get_change_managements_scaleout.json"
         );
         SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), APPEND);
-        if(FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG.isActive()){
+        if (FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG.isActive()) {
             String AAI_VNFS_FOR_CHANGE_MANAGEMENT_JSON_BY_PARAMS = "registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_with_modelVer.json";
             String globalCustomerId = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb";
             String serviceType = "vRichardson";
@@ -231,7 +231,7 @@ public class ChangeManagementTest extends VidBaseTestCase {
                     SIMPLE,
                     "/business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
                             + serviceType + "/service-instances",
-                    "query/vnfs-fromServiceInstance-filterByCloudRegion?nfRole=vMobileDNS&cloudRegionID=092eb9e8e4b7412e8787dd091bc58e86"
+                    "query/vnfs-fromServiceInstance-filterByCloudRegion?nfRole=vMobileDNS&cloudRegionID=AAIAIC25"
             ) {
                 @Override
                 public Object getResponseBody() {
@@ -246,9 +246,9 @@ public class ChangeManagementTest extends VidBaseTestCase {
 
         if (Features.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH.isActive()) {
             SimulatorApi.registerExpectationFromPreset(new PresetAAIGetTenants(
-                    VNF_DATA_WITH_IN_PLACE.subscriberId,
-                    VNF_DATA_WITH_IN_PLACE.serviceType,
-                    "presets_templates/PresetAAIGetTenants_service_type_vWINIFRED.json"), SimulatorApi.RegistrationStrategy.APPEND);
+                            VNF_DATA_WITH_IN_PLACE.subscriberId,
+                            VNF_DATA_WITH_IN_PLACE.serviceType),
+                    SimulatorApi.RegistrationStrategy.APPEND);
 
         }
 
@@ -640,7 +640,8 @@ public class ChangeManagementTest extends VidBaseTestCase {
                         "widgetData", ImmutableMap.builder()
                                 .put("vnfNames", ImmutableList.of(ImmutableMap.of(
                                         "id", vnfInstanceId,
-                                        "invariant-id", modelInvariantId
+                                        "invariant-id", modelInvariantId,
+                                        "version", "5.0"
                                 )))
                                 .put("workflowParameters", emptyMap())
                                 .put("subscriberId", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb")
@@ -648,7 +649,7 @@ public class ChangeManagementTest extends VidBaseTestCase {
                                 .put("workflow", "" + workflowName + "")
                                 .put("policyYN", "Y")
                                 .put("sniroYN", "Y")
-                                .put("testApi", "VNF_API")
+                                .put("testApi", "GR_API")
                                 .put("vnfType", "vMobileDNS")
                                 .putAll(workflowParams)
                                 .build()