Merge automation from ECOMP's repository

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

diff --git a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
index 0251e36..d53b501 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
@@ -1,6 +1,13 @@
 package vid.automation.test.test;
 
-import org.openecomp.sdc.ci.tests.datatypes.UserCredentials;
+import com.google.common.collect.ImmutableList;
+import java.util.HashMap;
+import java.util.Map;
+import org.onap.sdc.ci.tests.datatypes.UserCredentials;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteOldViewEdit;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet;
 import org.testng.annotations.Test;
 import vid.automation.test.Constants;
 import vid.automation.test.model.User;
@@ -8,27 +15,37 @@ import vid.automation.test.sections.ViewEditPage;
 import vid.automation.test.services.BulkRegistration;
 import vid.automation.test.services.SimulatorApi;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class AddNetworkTest extends VidBaseTestCase {
 
     private ViewEditPage viewEditPage = new ViewEditPage();
     private String serviceInstanceIdWithNetwork = "d198cc45-158b-480e-8d2c-03943c51268e";
-    private String currentUser;
 
     @Test
-    public void testAddNetworkFullFlow() throws Exception {
-        User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY);
+    public void testAddNetworkFullFlow() {
+        User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL);
         SimulatorApi.clearAll();
         BulkRegistration.genericSearchExistingServiceInstance();
         BulkRegistration.addNetwork();
         String instanceName = viewEditPage.generateInstanceName(Constants.ViewEdit.NETWORK_INSTANCE_NAME_PREFIX);
 
-        BulkRegistration.msoAddNetwork(instanceName);
+        SimulatorApi.registerExpectationFromPresets(
+                ImmutableList.of(
+                        PresetAAIGetCloudOwnersByCloudRegionId.PRESET_ONE_TO_ATT_AIC,
+                        new PresetMSOCreateNetworkALaCarteOldViewEdit(
+                                PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID,
+                                "d198cc45-158b-480e-8d2c-03943c51268e",
+                                "c187e9fe-40c3-4862-b73e-84ff056205f6",
+                                instanceName
+                        ),
+                        new PresetMSOOrchestrationRequestGet(
+                                PresetMSOOrchestrationRequestGet.COMPLETE,
+                                PresetMSOOrchestrationRequestGet.DEFAULT_REQUEST_ID,
+                                "Success")),
+                SimulatorApi.RegistrationStrategy.APPEND);
+
         goToExistingInstanceById(serviceInstanceIdWithNetwork);
         Map<String, String> networkMetadata=  getNetworkExpectedMetadata();
-        addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One","a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","xxx1", "y1","c630e297a3ae486497d63eacec1d7c14",
+        addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One", "FUSION", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","xxx1", "y1","c630e297a3ae486497d63eacec1d7c14",
                 "false", "some legacy region",user.tenants);
     }
 
@@ -36,7 +53,7 @@ public class AddNetworkTest extends VidBaseTestCase {
         return new HashMap<String, String>(){
             {
                 put(Constants.NetworkModelInfo.SERVICE_NAME, "Using VID for VoIP Network Instantiations Shani");
-                put(Constants.NetworkModelInfo.SUBSCRIBER_NAME, "Mobility");
+                put(Constants.NetworkModelInfo.SUBSCRIBER_NAME, "Emanuel");
                 put(Constants.NetworkModelInfo.SERVICE_INSTANCE_NAME, "service_with_network_shani");
                 put(Constants.NetworkModelInfo.MODEL_NAME, "AIC30_CONTRAIL_BASIC");
                 put(Constants.NetworkModelInfo.MODEL_INVARIANT_UUID, "de01afb5-532b-451d-aac4-ff9ff0644060");
@@ -49,7 +66,7 @@ public class AddNetworkTest extends VidBaseTestCase {
 
     @Override
     protected UserCredentials getUserCredentials() {
-        User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY);
-        return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.MOBILITY_MOBILITY, "", "");
+        User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL);
+        return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_EMANUEL, "", "");
     }
 }