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, 29 insertions, 33 deletions

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/TunnelxconnTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/TunnelxconnTopologyOperationRPCTest.java
index 2e1f1cb1..1c6a468f 100644
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/TunnelxconnTopologyOperationRPCTest.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/TunnelxconnTopologyOperationRPCTest.java
@@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals;
 import static org.onap.sdnc.northbound.GenericResourceApiProvider.APP_NAME;
 import static org.onap.sdnc.northbound.GenericResourceApiProvider.NO_SERVICE_LOGIC_ACTIVE;
 import static org.onap.sdnc.northbound.GenericResourceApiProvider.NULL_OR_EMPTY_ERROR_PARAM;
-import static org.onap.sdnc.northbound.util.MDSALUtil.build;
 import static org.onap.sdnc.northbound.util.MDSALUtil.exec;
 import static org.onap.sdnc.northbound.util.MDSALUtil.requestInformation;
 import static org.onap.sdnc.northbound.util.MDSALUtil.sdncRequestHeader;
@@ -41,7 +40,7 @@ public class TunnelxconnTopologyOperationRPCTest extends GenericResourceApiProvi
     @Test
     public void should_fail_when_service_instance_id_not_present() throws Exception {
 
-        TunnelxconnTopologyOperationInput input = build(tunnelxconnTopologyOperationInput());
+        TunnelxconnTopologyOperationInput input = tunnelxconnTopologyOperationInput().build();
 
         TunnelxconnTopologyOperationOutput output =
             exec(genericResourceApiProvider::tunnelxconnTopologyOperation, input, RpcResult::getResult);
@@ -57,15 +56,14 @@ public class TunnelxconnTopologyOperationRPCTest extends GenericResourceApiProvi
         svcClient.mockHasGraph(true);
         svcClient.mockExecuteWoServiceData(new RuntimeException("test exception"));
 
-        TunnelxconnTopologyOperationInput input = build(tunnelxconnTopologyOperationInput()
-            .setSdncRequestHeader(build(sdncRequestHeader()
+        TunnelxconnTopologyOperationInput input = tunnelxconnTopologyOperationInput()
+            .setSdncRequestHeader(sdncRequestHeader()
                 .setSvcRequestId("test-svc-request-id")
-                .setSvcAction(SvcAction.Assign)
-            ))
-            .setServiceInformation(build(serviceInformationBuilder()
-                .setServiceInstanceId("test-service-instance-id")
-            ))
-        );
+                .setSvcAction(SvcAction.Assign).build()
+            )
+            .setServiceInformation(serviceInformationBuilder()
+                .setServiceInstanceId("test-service-instance-id").build()
+            ).build();
 
         TunnelxconnTopologyOperationOutput output =
             exec(genericResourceApiProvider::tunnelxconnTopologyOperation, input, RpcResult::getResult);
@@ -80,15 +78,14 @@ public class TunnelxconnTopologyOperationRPCTest extends GenericResourceApiProvi
 
         svcClient.mockHasGraph(false);
 
-        TunnelxconnTopologyOperationInput input = build(tunnelxconnTopologyOperationInput()
-            .setSdncRequestHeader(build(sdncRequestHeader()
+        TunnelxconnTopologyOperationInput input = tunnelxconnTopologyOperationInput()
+            .setSdncRequestHeader(sdncRequestHeader()
                 .setSvcRequestId("test-svc-request-id")
-                .setSvcAction(SvcAction.Assign)
-            ))
-            .setServiceInformation(build(serviceInformationBuilder()
-                .setServiceInstanceId("test-service-instance-id")
-            ))
-        );
+                .setSvcAction(SvcAction.Assign).build()
+            )
+            .setServiceInformation(serviceInformationBuilder()
+                .setServiceInstanceId("test-service-instance-id").build()
+            ).build();
 
         TunnelxconnTopologyOperationOutput output =
             exec(genericResourceApiProvider::tunnelxconnTopologyOperation, input, RpcResult::getResult);
@@ -106,15 +103,14 @@ public class TunnelxconnTopologyOperationRPCTest extends GenericResourceApiProvi
         svcResultProp.set("security-zone-object-path", "securityZoneObjectPath: XYZ");
         svcClient.mockExecuteWoServiceData(svcResultProp);
 
-        TunnelxconnTopologyOperationInput input = build(tunnelxconnTopologyOperationInput()
-            .setRequestInformation(build(requestInformation()
+        TunnelxconnTopologyOperationInput input = tunnelxconnTopologyOperationInput()
+            .setRequestInformation(requestInformation()
                 .setRequestId("test-request-id")
-                .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance)
-            ))
-            .setServiceInformation(build(serviceInformationBuilder()
-                .setServiceInstanceId("test-service-instance-id")
-            ))
-        );
+                .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance).build()
+            )
+            .setServiceInformation(serviceInformationBuilder()
+                .setServiceInstanceId("test-service-instance-id").build()
+            ).build();
 
         TunnelxconnTopologyOperationOutput output =
             exec(genericResourceApiProvider::tunnelxconnTopologyOperation, input, RpcResult::getResult);
@@ -131,16 +127,16 @@ public class TunnelxconnTopologyOperationRPCTest extends GenericResourceApiProvi
     private TunnelxconnTopologyOperationOutput createExpectedOutput(PropBuilder propBuilder,
         TunnelxconnTopologyOperationInput input) {
 
-        return build(tunnelxconnTopologyOperationOutput()
-            .setTunnelxconnResponseInformation(build(tunnelxconnResponseInformation()
-                .setObjectPath(propBuilder.get("tunnelxconn-object-path"))))
+        return tunnelxconnTopologyOperationOutput()
+            .setTunnelxconnResponseInformation(tunnelxconnResponseInformation()
+                .setObjectPath(propBuilder.get("tunnelxconn-object-path")).build()
+            )
             .setResponseCode(propBuilder.get(svcClient.errorCode))
             .setAckFinalIndicator(propBuilder.get(svcClient.ackFinal))
             .setResponseMessage(propBuilder.get(svcClient.errorMessage))
-            .setServiceResponseInformation(build(serviceResponseInformation()
+            .setServiceResponseInformation(serviceResponseInformation()
                 .setInstanceId(input.getServiceInformation().getServiceInstanceId())
-                .setObjectPath(propBuilder.get(svcClient.serviceObjectPath))
-            ))
-        );
+                .setObjectPath(propBuilder.get(svcClient.serviceObjectPath)).build()
+            ).build();
     }
 }