summaryrefslogtreecommitdiffstats
path: root/lcm/provider
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2018-12-20 14:29:35 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-01-11 17:05:43 -0500
commit90adbb654c878bfc9e1ba61c75feb3cba8280733 (patch)
treefc64077e7eae83fdb018b48f62bd74096fea8b76 /lcm/provider
parentc3888cff5246447a2b011e27f130fcd087c60295 (diff)
Code changes to sli/northbound for ODL Fluorine
Code changes needed to support port to ODL Fluorine. Change-Id: If898ed120a3d03773db815f797f1eee633ca77e3 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'lcm/provider')
-rwxr-xr-xlcm/provider/pom.xml37
-rw-r--r--lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java81
2 files changed, 62 insertions, 56 deletions
diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml
index 188104038..a6dd8637b 100755
--- a/lcm/provider/pom.xml
+++ b/lcm/provider/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>lcm-provider</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.4.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
@@ -20,16 +20,17 @@
<ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
</properties>
+
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.6.1</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<dependencies>
@@ -38,16 +39,15 @@
<artifactId>lcm-model</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-broker-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
@@ -95,6 +95,11 @@
<version>10.12.1.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
index 570e89ec3..d1f3ba53f 100644
--- a/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
+++ b/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java
@@ -43,6 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
import org.onap.ccsdk.sli.northbound.LcmResponseCode.*;
@@ -131,7 +132,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
@Override
- public Future<RpcResult<CheckLockOutput>> checkLock(CheckLockInput input) {
+ public ListenableFuture<RpcResult<CheckLockOutput>> checkLock(CheckLockInput input) {
CheckLockInputBuilder iBuilder = new CheckLockInputBuilder(input);
CheckLockOutputBuilder oBuilder = new CheckLockOutputBuilder();
@@ -153,7 +154,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<RebootOutput>> reboot(RebootInput input) {
+ public ListenableFuture<RpcResult<RebootOutput>> reboot(RebootInput input) {
RebootInputBuilder iBuilder = new RebootInputBuilder(input);
RebootOutputBuilder oBuilder = new RebootOutputBuilder();
@@ -174,7 +175,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UpgradeBackupOutput>> upgradeBackup(UpgradeBackupInput input) {
+ public ListenableFuture<RpcResult<UpgradeBackupOutput>> upgradeBackup(UpgradeBackupInput input) {
UpgradeBackupInputBuilder iBuilder = new UpgradeBackupInputBuilder(input);
UpgradeBackupOutputBuilder oBuilder = new UpgradeBackupOutputBuilder();
@@ -196,7 +197,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<RollbackOutput>> rollback(RollbackInput input) {
+ public ListenableFuture<RpcResult<RollbackOutput>> rollback(RollbackInput input) {
RollbackInputBuilder iBuilder = new RollbackInputBuilder(input);
RollbackOutputBuilder oBuilder = new RollbackOutputBuilder();
@@ -217,7 +218,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<SyncOutput>> sync(SyncInput input) {
+ public ListenableFuture<RpcResult<SyncOutput>> sync(SyncInput input) {
SyncInputBuilder iBuilder = new SyncInputBuilder(input);
SyncOutputBuilder oBuilder = new SyncOutputBuilder();
@@ -238,7 +239,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<QueryOutput>> query(QueryInput input) {
+ public ListenableFuture<RpcResult<QueryOutput>> query(QueryInput input) {
QueryInputBuilder iBuilder = new QueryInputBuilder(input);
QueryOutputBuilder oBuilder = new QueryOutputBuilder();
@@ -259,7 +260,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigExportOutput>> configExport(ConfigExportInput input) {
+ public ListenableFuture<RpcResult<ConfigExportOutput>> configExport(ConfigExportInput input) {
ConfigExportInputBuilder iBuilder = new ConfigExportInputBuilder(input);
ConfigExportOutputBuilder oBuilder = new ConfigExportOutputBuilder();
@@ -280,7 +281,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<StopApplicationOutput>> stopApplication(StopApplicationInput input) {
+ public ListenableFuture<RpcResult<StopApplicationOutput>> stopApplication(StopApplicationInput input) {
StopApplicationInputBuilder iBuilder = new StopApplicationInputBuilder(input);
StopApplicationOutputBuilder oBuilder = new StopApplicationOutputBuilder();
@@ -301,7 +302,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<SoftwareUploadOutput>> softwareUpload(SoftwareUploadInput input) {
+ public ListenableFuture<RpcResult<SoftwareUploadOutput>> softwareUpload(SoftwareUploadInput input) {
SoftwareUploadInputBuilder iBuilder = new SoftwareUploadInputBuilder(input);
SoftwareUploadOutputBuilder oBuilder = new SoftwareUploadOutputBuilder();
@@ -322,7 +323,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ResumeTrafficOutput>> resumeTraffic(ResumeTrafficInput input) {
+ public ListenableFuture<RpcResult<ResumeTrafficOutput>> resumeTraffic(ResumeTrafficInput input) {
ResumeTrafficInputBuilder iBuilder = new ResumeTrafficInputBuilder(input);
ResumeTrafficOutputBuilder oBuilder = new ResumeTrafficOutputBuilder();
@@ -343,7 +344,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<DistributeTrafficOutput>> distributeTraffic(DistributeTrafficInput input) {
+ public ListenableFuture<RpcResult<DistributeTrafficOutput>> distributeTraffic(DistributeTrafficInput input) {
DistributeTrafficInputBuilder iBuilder = new DistributeTrafficInputBuilder(input);
DistributeTrafficOutputBuilder oBuilder = new DistributeTrafficOutputBuilder();
@@ -364,7 +365,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigureOutput>> configure(ConfigureInput input) {
+ public ListenableFuture<RpcResult<ConfigureOutput>> configure(ConfigureInput input) {
ConfigureInputBuilder iBuilder = new ConfigureInputBuilder(input);
ConfigureOutputBuilder oBuilder = new ConfigureOutputBuilder();
@@ -385,7 +386,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ActionStatusOutput>> actionStatus(ActionStatusInput input) {
+ public ListenableFuture<RpcResult<ActionStatusOutput>> actionStatus(ActionStatusInput input) {
ActionStatusInputBuilder iBuilder = new ActionStatusInputBuilder(input);
ActionStatusOutputBuilder oBuilder = new ActionStatusOutputBuilder();
@@ -406,7 +407,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UpgradePreCheckOutput>> upgradePreCheck(UpgradePreCheckInput input) {
+ public ListenableFuture<RpcResult<UpgradePreCheckOutput>> upgradePreCheck(UpgradePreCheckInput input) {
UpgradePreCheckInputBuilder iBuilder = new UpgradePreCheckInputBuilder(input);
UpgradePreCheckOutputBuilder oBuilder = new UpgradePreCheckOutputBuilder();
@@ -427,7 +428,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<LiveUpgradeOutput>> liveUpgrade(LiveUpgradeInput input) {
+ public ListenableFuture<RpcResult<LiveUpgradeOutput>> liveUpgrade(LiveUpgradeInput input) {
LiveUpgradeInputBuilder iBuilder = new LiveUpgradeInputBuilder(input);
LiveUpgradeOutputBuilder oBuilder = new LiveUpgradeOutputBuilder();
@@ -448,7 +449,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigModifyOutput>> configModify(ConfigModifyInput input) {
+ public ListenableFuture<RpcResult<ConfigModifyOutput>> configModify(ConfigModifyInput input) {
ConfigModifyInputBuilder iBuilder = new ConfigModifyInputBuilder(input);
ConfigModifyOutputBuilder oBuilder = new ConfigModifyOutputBuilder();
@@ -469,7 +470,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<RestartOutput>> restart(RestartInput input) {
+ public ListenableFuture<RpcResult<RestartOutput>> restart(RestartInput input) {
RestartInputBuilder iBuilder = new RestartInputBuilder(input);
RestartOutputBuilder oBuilder = new RestartOutputBuilder();
@@ -490,7 +491,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<HealthCheckOutput>> healthCheck(HealthCheckInput input) {
+ public ListenableFuture<RpcResult<HealthCheckOutput>> healthCheck(HealthCheckInput input) {
HealthCheckInputBuilder iBuilder = new HealthCheckInputBuilder(input);
HealthCheckOutputBuilder oBuilder = new HealthCheckOutputBuilder();
@@ -511,7 +512,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<LockOutput>> lock(LockInput input) {
+ public ListenableFuture<RpcResult<LockOutput>> lock(LockInput input) {
LockInputBuilder iBuilder = new LockInputBuilder(input);
LockOutputBuilder oBuilder = new LockOutputBuilder();
@@ -532,7 +533,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<TerminateOutput>> terminate(TerminateInput input) {
+ public ListenableFuture<RpcResult<TerminateOutput>> terminate(TerminateInput input) {
TerminateInputBuilder iBuilder = new TerminateInputBuilder(input);
TerminateOutputBuilder oBuilder = new TerminateOutputBuilder();
@@ -553,7 +554,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<AttachVolumeOutput>> attachVolume(AttachVolumeInput input) {
+ public ListenableFuture<RpcResult<AttachVolumeOutput>> attachVolume(AttachVolumeInput input) {
AttachVolumeInputBuilder iBuilder = new AttachVolumeInputBuilder(input);
AttachVolumeOutputBuilder oBuilder = new AttachVolumeOutputBuilder();
@@ -574,7 +575,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<MigrateOutput>> migrate(MigrateInput input) {
+ public ListenableFuture<RpcResult<MigrateOutput>> migrate(MigrateInput input) {
MigrateInputBuilder iBuilder = new MigrateInputBuilder(input);
MigrateOutputBuilder oBuilder = new MigrateOutputBuilder();
@@ -595,7 +596,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<QuiesceTrafficOutput>> quiesceTraffic(QuiesceTrafficInput input) {
+ public ListenableFuture<RpcResult<QuiesceTrafficOutput>> quiesceTraffic(QuiesceTrafficInput input) {
QuiesceTrafficInputBuilder iBuilder = new QuiesceTrafficInputBuilder(input);
QuiesceTrafficOutputBuilder oBuilder = new QuiesceTrafficOutputBuilder();
@@ -616,7 +617,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigRestoreOutput>> configRestore(ConfigRestoreInput input) {
+ public ListenableFuture<RpcResult<ConfigRestoreOutput>> configRestore(ConfigRestoreInput input) {
ConfigRestoreInputBuilder iBuilder = new ConfigRestoreInputBuilder(input);
ConfigRestoreOutputBuilder oBuilder = new ConfigRestoreOutputBuilder();
@@ -637,7 +638,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UpgradeBackoutOutput>> upgradeBackout(UpgradeBackoutInput input) {
+ public ListenableFuture<RpcResult<UpgradeBackoutOutput>> upgradeBackout(UpgradeBackoutInput input) {
UpgradeBackoutInputBuilder iBuilder = new UpgradeBackoutInputBuilder(input);
UpgradeBackoutOutputBuilder oBuilder = new UpgradeBackoutOutputBuilder();
@@ -658,7 +659,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<EvacuateOutput>> evacuate(EvacuateInput input) {
+ public ListenableFuture<RpcResult<EvacuateOutput>> evacuate(EvacuateInput input) {
EvacuateInputBuilder iBuilder = new EvacuateInputBuilder(input);
EvacuateOutputBuilder oBuilder = new EvacuateOutputBuilder();
@@ -679,7 +680,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UnlockOutput>> unlock(UnlockInput input) {
+ public ListenableFuture<RpcResult<UnlockOutput>> unlock(UnlockInput input) {
UnlockInputBuilder iBuilder = new UnlockInputBuilder(input);
UnlockOutputBuilder oBuilder = new UnlockOutputBuilder();
@@ -700,7 +701,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigBackupDeleteOutput>> configBackupDelete(ConfigBackupDeleteInput input) {
+ public ListenableFuture<RpcResult<ConfigBackupDeleteOutput>> configBackupDelete(ConfigBackupDeleteInput input) {
ConfigBackupDeleteInputBuilder iBuilder = new ConfigBackupDeleteInputBuilder(input);
ConfigBackupDeleteOutputBuilder oBuilder = new ConfigBackupDeleteOutputBuilder();
@@ -721,7 +722,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UpgradeSoftwareOutput>> upgradeSoftware(UpgradeSoftwareInput input) {
+ public ListenableFuture<RpcResult<UpgradeSoftwareOutput>> upgradeSoftware(UpgradeSoftwareInput input) {
UpgradeSoftwareInputBuilder iBuilder = new UpgradeSoftwareInputBuilder(input);
UpgradeSoftwareOutputBuilder oBuilder = new UpgradeSoftwareOutputBuilder();
@@ -742,7 +743,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<StopOutput>> stop(StopInput input) {
+ public ListenableFuture<RpcResult<StopOutput>> stop(StopInput input) {
StopInputBuilder iBuilder = new StopInputBuilder(input);
StopOutputBuilder oBuilder = new StopOutputBuilder();
@@ -763,7 +764,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<DetachVolumeOutput>> detachVolume(DetachVolumeInput input) {
+ public ListenableFuture<RpcResult<DetachVolumeOutput>> detachVolume(DetachVolumeInput input) {
DetachVolumeInputBuilder iBuilder = new DetachVolumeInputBuilder(input);
DetachVolumeOutputBuilder oBuilder = new DetachVolumeOutputBuilder();
@@ -784,7 +785,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigScaleOutOutput>> configScaleOut(ConfigScaleOutInput input) {
+ public ListenableFuture<RpcResult<ConfigScaleOutOutput>> configScaleOut(ConfigScaleOutInput input) {
ConfigScaleOutInputBuilder iBuilder = new ConfigScaleOutInputBuilder(input);
ConfigScaleOutOutputBuilder oBuilder = new ConfigScaleOutOutputBuilder();
@@ -805,7 +806,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<UpgradePostCheckOutput>> upgradePostCheck(UpgradePostCheckInput input) {
+ public ListenableFuture<RpcResult<UpgradePostCheckOutput>> upgradePostCheck(UpgradePostCheckInput input) {
UpgradePostCheckInputBuilder iBuilder = new UpgradePostCheckInputBuilder(input);
UpgradePostCheckOutputBuilder oBuilder = new UpgradePostCheckOutputBuilder();
@@ -826,7 +827,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<TestOutput>> test(TestInput input) {
+ public ListenableFuture<RpcResult<TestOutput>> test(TestInput input) {
TestInputBuilder iBuilder = new TestInputBuilder(input);
TestOutputBuilder oBuilder = new TestOutputBuilder();
@@ -847,7 +848,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<StartApplicationOutput>> startApplication(StartApplicationInput input) {
+ public ListenableFuture<RpcResult<StartApplicationOutput>> startApplication(StartApplicationInput input) {
StartApplicationInputBuilder iBuilder = new StartApplicationInputBuilder(input);
StartApplicationOutputBuilder oBuilder = new StartApplicationOutputBuilder();
@@ -868,7 +869,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<ConfigBackupOutput>> configBackup(ConfigBackupInput input) {
+ public ListenableFuture<RpcResult<ConfigBackupOutput>> configBackup(ConfigBackupInput input) {
ConfigBackupInputBuilder iBuilder = new ConfigBackupInputBuilder(input);
ConfigBackupOutputBuilder oBuilder = new ConfigBackupOutputBuilder();
@@ -889,7 +890,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<RebuildOutput>> rebuild(RebuildInput input) {
+ public ListenableFuture<RpcResult<RebuildOutput>> rebuild(RebuildInput input) {
RebuildInputBuilder iBuilder = new RebuildInputBuilder(input);
RebuildOutputBuilder oBuilder = new RebuildOutputBuilder();
@@ -910,7 +911,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<AuditOutput>> audit(AuditInput input) {
+ public ListenableFuture<RpcResult<AuditOutput>> audit(AuditInput input) {
AuditInputBuilder iBuilder = new AuditInputBuilder(input);
AuditOutputBuilder oBuilder = new AuditOutputBuilder();
@@ -931,7 +932,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<StartOutput>> start(StartInput input) {
+ public ListenableFuture<RpcResult<StartOutput>> start(StartInput input) {
StartInputBuilder iBuilder = new StartInputBuilder(input);
StartOutputBuilder oBuilder = new StartOutputBuilder();
@@ -952,7 +953,7 @@ public class LcmProvider implements AutoCloseable, LCMService {
}
@Override
- public Future<RpcResult<SnapshotOutput>> snapshot(SnapshotInput input) {
+ public ListenableFuture<RpcResult<SnapshotOutput>> snapshot(SnapshotInput input) {
SnapshotInputBuilder iBuilder = new SnapshotInputBuilder(input);
SnapshotOutputBuilder oBuilder = new SnapshotOutputBuilder();