diff options
| author |   Dan Timoney <dtimoney@att.com> | 2024-07-19 13:50:12 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2024-08-16 12:32:54 -0400 |
| commit | 4b27c1566071bf880b7ea1757530473ea2ee1b7f (patch) | |
| tree | 57434370476bed4394735ab91474ef0aae77be8e /northbound | |
| parent | ac0e0c95968436d78781056eddf6af4b75b7fd92 (diff) | |
Migrate SLI to ODL Potassium-SR2
Updated parent versions to match Potassium-SR2 version and made
code updates necessary to migrate to OpenDaylight Potassium release.
Issue-ID: CCSDK-3990
Change-Id: I8a8a99513a257fe7e9c3736ab23cb88fb1cd85ad
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'northbound')
6 files changed, 23 insertions, 9 deletions
diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index e703a903a..6a119941f 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -20,7 +20,11 @@ <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> - <artifactId>rfc6991</artifactId> + <artifactId>rfc6991-ietf-inet-types</artifactId> + </dependency> + <dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991-ietf-yang-types</artifactId> </dependency> </dependencies> diff --git a/northbound/asdcApi/model/src/main/yang/ASDC-API.yang b/northbound/asdcApi/model/src/main/yang/ASDC-API.yang index 12cfb9a56..30ae8b973 100755 --- a/northbound/asdcApi/model/src/main/yang/ASDC-API.yang +++ b/northbound/asdcApi/model/src/main/yang/ASDC-API.yang @@ -13,7 +13,6 @@ module ASDC-API { import ietf-inet-types { prefix inet; - revision-date "2013-07-15"; } organization diff --git a/northbound/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java b/northbound/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java index d8cf963b5..829b61a9f 100644 --- a/northbound/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java +++ b/northbound/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java @@ -200,7 +200,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService { Artifact artifact = aBuilder.build(); - InstanceIdentifier.InstanceIdentifierBuilder<Artifact> aIdBuilder = InstanceIdentifier + InstanceIdentifier.Builder<Artifact> aIdBuilder = InstanceIdentifier .<Artifacts> builder(Artifacts.class) .child(Artifact.class, artifact.key()); @@ -235,7 +235,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService { VfLicenseModelVersion version = vBuilder.build(); - InstanceIdentifier.InstanceIdentifierBuilder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier + InstanceIdentifier.Builder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier .<VfLicenseModelVersions> builder(VfLicenseModelVersions.class) .child(VfLicenseModelVersion.class, version.key()); @@ -261,7 +261,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService { vBuilder.setVfLicenseModel(vfLicenseModel); VfLicenseModelVersion version = vBuilder.build(); - InstanceIdentifier.InstanceIdentifierBuilder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier + InstanceIdentifier.Builder<VfLicenseModelVersion> versionIdBuilder = InstanceIdentifier .<VfLicenseModelVersions> builder(VfLicenseModelVersions.class) .child(VfLicenseModelVersion.class, version.key()); diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 21673faa4..ea079656b 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -19,8 +19,11 @@ <dependencies> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> - <artifactId>rfc6991</artifactId> + <artifactId>rfc6991-ietf-inet-types</artifactId> + </dependency> + <dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991-ietf-yang-types</artifactId> </dependency> - </dependencies> </project> diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 7445db802..e7e248d45 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -19,7 +19,11 @@ <dependencies> <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> - <artifactId>rfc6991</artifactId> + <artifactId>rfc6991-ietf-inet-types</artifactId> + </dependency> + <dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991-ietf-yang-types</artifactId> </dependency> </dependencies> diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 30e65ce59..06ec75d1f 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -20,7 +20,11 @@ <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> - <artifactId>rfc6991</artifactId> + <artifactId>rfc6991-ietf-inet-types</artifactId> + </dependency> + <dependency> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991-ietf-yang-types</artifactId> </dependency> </dependencies> |