Changes to support ODL Sulfur update

[sdnc/northbound.git] / generic-resource-api / provider / src / test / java / org / onap / sdnc / northbound / util / GenericResourceApiSvcLogicServiceClientMockUtil.java

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
index 36c6c7f..51eaa1f 100644 (file)
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
@@ -24,7 +24,6 @@ package org.onap.sdnc.northbound.util;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.isA;
 import static org.mockito.Mockito.when;
-import static org.onap.sdnc.northbound.util.MDSALUtil.build;
 import static org.onap.sdnc.northbound.util.PropBuilder.propBuilder;
 
 import java.util.Properties;
@@ -50,6 +49,7 @@ public class GenericResourceApiSvcLogicServiceClientMockUtil {
     public final String ackFinal = "ack-final";
     public final String serviceObjectPath = "service-object-path";
     public final String networkObjectPath = "network-object-path";
+    public final String pnfObjectPath = "pnf-object-path";
     public final String vnfObjectPath = "vnf-object-path";
     public final String vfModuleObjectPath = "vf-module-object-path";
     public final String networkId = "networkId";
@@ -98,6 +98,7 @@ public class GenericResourceApiSvcLogicServiceClientMockUtil {
             .set(ackFinal, "Y")
             .set(serviceObjectPath, "serviceObjectPath: XYZ")
             .set(networkObjectPath, "networkObjectPath: XYZ")
+            .set(pnfObjectPath,  "pnfObjectPath: XYZ")
             .set(vnfObjectPath,  "vnfObjectPath: XYZ")
             .set(vfModuleObjectPath,  "vfModuleObjectPath: XYZ")
             .set(networkId, "networkId: XYZ");
@@ -119,7 +120,7 @@ public class GenericResourceApiSvcLogicServiceClientMockUtil {
                     eq(MODE),
                     isA(ServiceDataBuilder.class),
                     isA(Properties.class))
-        ).thenReturn(build(svcResultProp));
+        ).thenReturn(svcResultProp.build());
     }
 
     public void mockExecute(RuntimeException exception) throws Exception {
@@ -146,7 +147,7 @@ public class GenericResourceApiSvcLogicServiceClientMockUtil {
                     eq(VERSION),
                     eq(MODE),
                     isA(Properties.class))
-        ).thenReturn(build(svcResultProp));
+        ).thenReturn(svcResultProp.build());
     }
 
     public void mockExecuteWoServiceData(RuntimeException exception) throws Exception {