Changes to support ODL Sulfur update

Changes to sdnc/northbound to conform to changes in OpenDaylight Sulfur
release.  Many of these changes are due to a change in yangtools, which
no longer implements a common ancestor for its builder classes. This broke
a utility method used in jUnit test cases (build()), which meant all
jUnits using that method had to be updated to call each individual
builder's build() method directly.

Issue-ID: CCSDK-1728
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ia82aa3decd82d873120dd643a6a0427928890f99

1 files changed, 3 insertions, 4 deletions

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericConfigurationTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericConfigurationTopologyOperationRPCTest.java
index c77455d4..7a6081e3 100644
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericConfigurationTopologyOperationRPCTest.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericConfigurationTopologyOperationRPCTest.java
@@ -2,7 +2,6 @@ package org.onap.sdnc.northbound;
 
 import static org.junit.Assert.assertEquals;
 import static org.onap.sdnc.northbound.util.MDSALUtil.GenericConfigurationTopologyOperationInput;
-import static org.onap.sdnc.northbound.util.MDSALUtil.build;
 import static org.onap.sdnc.northbound.util.MDSALUtil.exec;
 
 import org.junit.Before;
@@ -28,7 +27,7 @@ public class GenericConfigurationTopologyOperationRPCTest extends GenericResourc
     @Test
     public void should_fail_when_invalid_vnf_topology() throws Exception {
 
-        GenericConfigurationTopologyOperationInput input = build(GenericConfigurationTopologyOperationInput());
+        GenericConfigurationTopologyOperationInput input = GenericConfigurationTopologyOperationInput().build();
 
         GenericConfigurationTopologyOperationOutput output =
                 exec(genericResourceApiProvider::genericConfigurationTopologyOperation, input, RpcResult::getResult);
@@ -41,8 +40,8 @@ public class GenericConfigurationTopologyOperationRPCTest extends GenericResourc
     @Test
     public void should_fail_when_valid_vnf_topology() throws Exception {
 
-        GenericConfigurationTopologyOperationInput input = build(GenericConfigurationTopologyOperationInput()
-                .setServiceInformation(new ServiceInformationBuilder().setServiceInstanceId("ServiceInsatnceId").build()));
+        GenericConfigurationTopologyOperationInput input = GenericConfigurationTopologyOperationInput()
+                .setServiceInformation(new ServiceInformationBuilder().setServiceInstanceId("ServiceInsatnceId").build()).build();
 
         GenericConfigurationTopologyOperationOutput output =
                 exec(genericResourceApiProvider::genericConfigurationTopologyOperation, input, RpcResult::getResult);