From ce4e5f9a00d2677495240ad367b9bfc4b74752d0 Mon Sep 17 00:00:00 2001 From: Michael DÜrre Date: Mon, 18 Jan 2021 05:41:16 +0100 Subject: migrate sli to alu-SR1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit migrate ODL interfaces and fix code for changes in alu-SR1 Issue-ID: CCSDK-3089 Signed-off-by: Michael DÜrre Change-Id: Iad824627c581c902b639a2f0246e3133d4e38c48 --- northbound/daexim-offsite-backup/provider/pom.xml | 32 ++++++++++---------- .../DaeximOffsiteBackupProvider.java | 34 ++++++++++------------ .../OSGI-INF/blueprint/DaeximOffsiteBackup.xml | 20 ------------- .../opendaylight/blueprint/DaeximOffsiteBackup.xml | 6 ++-- .../DaeximOffsiteBackupProviderTest.java | 21 +++++++------ 5 files changed, 44 insertions(+), 69 deletions(-) delete mode 100755 northbound/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml (limited to 'northbound/daexim-offsite-backup') diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index c7b7d1c86..9db8934f6 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -23,30 +23,30 @@ ${project.version} - org.opendaylight.controller - sal-binding-api + org.opendaylight.mdsal + mdsal-binding-api org.opendaylight.controller sal-common-util - org.opendaylight.controller - sal-test-model - test - - - org.opendaylight.controller - sal-binding-broker-impl - test - - - org.opendaylight.controller - sal-binding-broker-impl - test-jar - tests + org.opendaylight.mdsal + mdsal-binding-test-model test + + + + + + + + + + + + org.apache.commons commons-lang3 diff --git a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java index 09c8f92f4..7ee2a91d7 100755 --- a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java +++ b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java @@ -21,6 +21,9 @@ package org.onap.ccsdk.sli.northbound.daeximoffsitebackup; +import com.google.common.util.concurrent.FluentFuture; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -44,27 +47,22 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; import javax.annotation.Nonnull; - -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.BackupDataInput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.BackupDataOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.BackupDataOutputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.DaeximOffsiteBackupService; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataInput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataOutputBuilder; -import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataInput; +import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,11 +84,11 @@ public class DaeximOffsiteBackupProvider implements AutoCloseable, DaeximOffsite private final ExecutorService executor; private Properties properties; private DataBroker dataBroker; - private RpcProviderRegistry rpcRegistry; - private BindingAwareBroker.RpcRegistration rpcRegistration; + private RpcProviderService rpcRegistry; + private ObjectRegistration rpcRegistration; public DaeximOffsiteBackupProvider(DataBroker dataBroker, - RpcProviderRegistry rpcProviderRegistry) { + RpcProviderService rpcProviderRegistry) { LOG.info("Creating provider for " + appName); this.executor = Executors.newFixedThreadPool(1); this.dataBroker = dataBroker; @@ -107,7 +105,7 @@ public class DaeximOffsiteBackupProvider implements AutoCloseable, DaeximOffsite } catch (Exception e) { LOG.error("Caught Exception while trying to load properties file", e); } - rpcRegistration = rpcRegistry.addRpcImplementation(DaeximOffsiteBackupService.class, this); + rpcRegistration = rpcRegistry.registerRpcImplementation(DaeximOffsiteBackupService.class, this); LOG.info("Initialization complete for " + appName); } @@ -173,7 +171,7 @@ public class DaeximOffsiteBackupProvider implements AutoCloseable, DaeximOffsite private void createContainers() { final WriteTransaction t = dataBroker.newReadWriteTransaction(); try { - CheckedFuture checkedFuture = t.submit(); + FluentFuture checkedFuture = t.commit(); checkedFuture.get(); LOG.info("Create Containers succeeded!: "); } catch (InterruptedException | ExecutionException e) { diff --git a/northbound/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml b/northbound/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml deleted file mode 100755 index 8e2101ad3..000000000 --- a/northbound/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - diff --git a/northbound/daexim-offsite-backup/provider/src/main/resources/org/opendaylight/blueprint/DaeximOffsiteBackup.xml b/northbound/daexim-offsite-backup/provider/src/main/resources/org/opendaylight/blueprint/DaeximOffsiteBackup.xml index 8e2101ad3..6118f28c3 100755 --- a/northbound/daexim-offsite-backup/provider/src/main/resources/org/opendaylight/blueprint/DaeximOffsiteBackup.xml +++ b/northbound/daexim-offsite-backup/provider/src/main/resources/org/opendaylight/blueprint/DaeximOffsiteBackup.xml @@ -4,12 +4,10 @@ odl:use-default-for-reference-types="true"> + interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" /> + interface="org.opendaylight.mdsal.binding.api.RpcProviderService" /> diff --git a/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java b/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java index 0f0cee288..03fe37513 100644 --- a/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java +++ b/northbound/daexim-offsite-backup/provider/src/test/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProviderTest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -38,10 +38,9 @@ import java.util.concurrent.ExecutionException; import org.eclipse.jdt.annotation.Nullable; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; +import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.DaeximOffsiteBackupService; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataInput; import org.opendaylight.yangtools.yang.binding.Augmentation; @@ -49,8 +48,8 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; public class DaeximOffsiteBackupProviderTest { public DataBroker dataBroker; public ReadWriteTransaction writeTransaction; - public CheckedFuture checkedFuture; - public RpcProviderRegistry rpcRegistry; + public FluentFuture checkedFuture; + public RpcProviderService rpcRegistry; public DaeximOffsiteBackupProvider provider; public Properties resProps; @@ -61,16 +60,16 @@ public class DaeximOffsiteBackupProviderTest { resProps.put("error-message", "Success"); dataBroker = mock(DataBroker.class); writeTransaction = mock(ReadWriteTransaction.class); - checkedFuture = mock(CheckedFuture.class); - rpcRegistry = mock(RpcProviderRegistry.class); - when(rpcRegistry.addRoutedRpcImplementation(any(), any(DaeximOffsiteBackupService.class))).thenReturn(null); + checkedFuture = mock(FluentFuture.class); + rpcRegistry = mock(RpcProviderService.class); + when(rpcRegistry.registerRpcImplementation(any(), any(DaeximOffsiteBackupService.class))).thenReturn(null); try { when(checkedFuture.get()).thenReturn(null); } catch(InterruptedException | ExecutionException e) { e.printStackTrace(); } - when(writeTransaction.submit()).thenReturn(checkedFuture); + when(writeTransaction.commit()).thenReturn(checkedFuture); when(dataBroker.newReadWriteTransaction()).thenReturn(writeTransaction); provider = new DaeximOffsiteBackupProvider(dataBroker, rpcRegistry); -- cgit 1.2.3-korg