Change to use OAM IPAddress

Change to use ipaddress-v4/6-oam for the config deploy
Add more assertions to the integration test

Issue-ID: SO-1506
Change-Id: I5ba45b055569f90f91308b6e9d4bd85a1d4e99fe
Signed-off-by: eeginux <henry.xie@est.tech>

1 files changed, 2 insertions, 2 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PrepareConfigDeployDelegateTest.java b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PrepareConfigDeployDelegateTest.java
index 77b6d9ffdd..0964d2146b 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PrepareConfigDeployDelegateTest.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/pnf/delegate/PrepareConfigDeployDelegateTest.java
@@ -99,8 +99,8 @@ public class PrepareConfigDeployDelegateTest {
 
     private void mockAai() throws IOException {
         Pnf pnf = new Pnf();
-        pnf.setPnfIpv4Address(TEST_IPV4_ADDRESS);
-        pnf.setPnfIpv6Address(TEST_IPV6_ADDRESS);
+        pnf.setIpaddressV4Oam(TEST_IPV4_ADDRESS);
+        pnf.setIpaddressV6Oam(TEST_IPV6_ADDRESS);
         when(pnfManagement.getEntryFor(TEST_PNF_CORRELATION_ID)).thenReturn(Optional.of(pnf));
     }