Resolving testAssociatePnf

Issue-ID: VID-543
Change-Id: Ib7d12d648f399096bf8d71b98249ff4994a156fc
Signed-off-by: RachelF <rachel.fishbein@intl.att.com>

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
index 2d54563..92f9b4e 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
@@ -21,9 +21,9 @@
 
 package org.onap.vid.aai.model.AaiGetPnfs;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.onap.vid.aai.model.AaiRelationResponse;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -39,10 +39,10 @@ public final class Pnf extends AaiRelationResponse {
 
     @JsonCreator
     public Pnf(
-        @JsonAlias("pnf-id") String pnfId, @JsonAlias("pnf-name") String pnfName,
-        @JsonAlias("pnf-name2") String pnfName2, @JsonAlias("pnf-name2-source") String pnfName2Source,
-        @JsonAlias("equip-type") String equipType, @JsonAlias("equip-vendor") String equipVendor,
-        @JsonAlias("equip-model") String equipModel) {
+            @JsonProperty("pnf-id") String pnfId, @JsonProperty("pnf-name") String pnfName,
+            @JsonProperty("pnf-name2") String pnfName2, @JsonProperty("pnf-name2-source") String pnfName2Source,
+            @JsonProperty("equip-type") String equipType, @JsonProperty("equip-vendor") String equipVendor,
+            @JsonProperty("equip-model") String equipModel) {
 
         this.pnfId = pnfId;
         this.pnfName = pnfName;

diff --git a/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java b/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java
index 7bec560..03d7d4a 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java
@@ -56,6 +56,7 @@ public class AssociatePnfTest extends VidBaseTestCase {
         vidBasePage.assertMsoRequestModal("Error");
         vidBasePage.clickCloseButton();
     }
+
     @Test
     public void testRainyChoosePnf() throws Exception {
         SimulatorApi.clearAll();
@@ -70,6 +71,7 @@ public class AssociatePnfTest extends VidBaseTestCase {
         boolean waitForElementResult = Wait.waitByTestId(Constants.ViewEdit.VNF_OPTION_TEST_ID_PREFIX + pnfName, 60);
         Assert.assertTrue(message, !waitForElementResult);
     }
+
     @Test
     public void testRainySearchPnfInstance() throws Exception {
         SimulatorApi.clearAll();
@@ -98,6 +100,7 @@ public class AssociatePnfTest extends VidBaseTestCase {
         }
         GeneralUIUtils.ultimateWait();
     }
+
     private void associatePNF() throws InterruptedException {
         pnfSearchAssociationPage.clickAssociateButton();
     }
@@ -118,6 +121,7 @@ public class AssociatePnfTest extends VidBaseTestCase {
         Wait.angularHttpRequestsLoaded();
         assertAssociateButtonState(true);
     }
+
     private void checkServiceModelInfo() {
         Wait.angularHttpRequestsLoaded();
         //Service name
@@ -188,7 +192,4 @@ public class AssociatePnfTest extends VidBaseTestCase {
         infoItemText = GeneralUIUtils.getWebElementByTestID(elementTestId, 60).getText();
         Assert.assertEquals(String.format(Constants.PnfAssociation.PNF_INSTANCE_ERROR_MESSAGE,elementTestId),infoItemText,"ASR1002-X");
     }
-
-
-
 }