X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2FGenericConfigurationTopologyOperationRPCTest.java;h=7a6081e388fba7a9c0dd01ef16bcad0b283aec2c;hb=HEAD;hp=629b485c417584702a9e6fd1ad39958c9495d6cd;hpb=b07d4397612bc882a6d46372ae550766a79116bd;p=sdnc%2Fnorthbound.git

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 629b485c..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
@@ -1,29 +1,18 @@
 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.exec;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.sdnc.northbound.util.PropBuilder;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader.SvcAction;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.information.ServiceInformationBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.configuration.information.ConfigurationInformationBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-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.util.MDSALUtil.*;
-
 @RunWith(MockitoJUnitRunner.class)
 public class GenericConfigurationTopologyOperationRPCTest extends GenericResourceApiProviderTest {
 
@@ -38,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);
@@ -51,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);