diff options
author | Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
commit | 2e63f133b29f1bb7fccaf6e35d11488f042a5855 (patch) | |
tree | 8f95c37abe39ba61b21fb8b6bafe1cb4780580d0 /generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java | |
parent | 20ca6ead983ca534e1ce93abbeaa23a2e4aac0f1 (diff) |
Upgrade to ODL Aluminum
Updated code to conform to OpenDaylight Aluminum release.
Change-Id: I3ef7daebc689a5d2e344fc7b96ce885bda77a7f8
Issue-ID: SDNC-1474
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java')
-rw-r--r-- | generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java index e7618937..c572ab6f 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java @@ -22,16 +22,17 @@ import static org.onap.sdnc.northbound.util.MDSALUtil.serviceResponseInformation import static org.onap.sdnc.northbound.util.MDSALUtil.serviceStatus; import java.time.Instant; + 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.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.TransactionChainClosedException; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.OperStatusData.LastAction; import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.OperStatusData.LastOrderStatus; import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.OperStatusData.LastRpcAction; @@ -152,7 +153,7 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv svcClient.mockExecute(svcResultProp); svcClient.mockHasGraph(true); WriteTransaction mockWriteTransaction = mock(WriteTransaction.class); - when(mockWriteTransaction.submit()).thenThrow(new TransactionChainClosedException("test exception")); + when(mockWriteTransaction.commit()).thenThrow(new TransactionChainClosedException("test exception")); DataBroker spyDataBroker = Mockito.spy(dataBroker); when(spyDataBroker.newWriteOnlyTransaction()).thenReturn(mockWriteTransaction); |