Merge "YANG Model update to RANSlice southobound"
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
index 991231f..1adbea0 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/ODLVersionLUT.java
@@ -32,6 +32,9 @@
if (onapCCSDKVersion == null) {
return def;
}
+ if (onapCCSDKVersion.startsWith("2.1.")) {
+ return "ONAP Honolulu";
+ }
if (onapCCSDKVersion.startsWith("2.0.")) {
return "ONAP Guilin";
}
@@ -60,6 +63,7 @@
odlMdsalVersionLUT.put("5.0.14","magnesium-SR2 (0.12.2)");
odlMdsalVersionLUT.put("5.0.10","magnesium-SR1 (0.12.1)");
odlMdsalVersionLUT.put("5.0.9","magnesium-SR0 (0.12.0)");
+ odlMdsalVersionLUT.put("4.0.17","sodium-SR4 (0.11.4)");
odlMdsalVersionLUT.put("4.0.14","sodium-SR3 (0.11.3)");
odlMdsalVersionLUT.put("4.0.11","sodium-SR2 (0.11.2)");
odlMdsalVersionLUT.put("4.0.6","sodium-SR1 (0.11.1)");
diff --git a/sdnr/wt/data-provider/setup/pom.xml b/sdnr/wt/data-provider/setup/pom.xml
index 7d7f500..3a1b597 100644
--- a/sdnr/wt/data-provider/setup/pom.xml
+++ b/sdnr/wt/data-provider/setup/pom.xml
@@ -76,7 +76,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -88,7 +87,7 @@
<clusterName>testCluster</clusterName>
<transportPort>49504</transportPort>
<httpPort>${databaseport}</httpPort>
- <version>7.1.1</version>
+ <version>7.6.1</version>
</configuration>
<executions>
<execution>