From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Thu, 1 Oct 2020 12:52:55 +0000 (+0200)
Subject: Update Opendaylight release to "Sodium-SR4" in "About" page
X-Git-Tag: 1.0.2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ee4c0d444012880c810f3325c93f0f5eaaf50940;p=ccsdk%2Ffeatures.git

Update Opendaylight release to "Sodium-SR4" in "About" page

Update Opendaylight release to "Sodium-SR4" in "About" page

Issue-ID: CCSDK-2860
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I1c4b0eb65cbef6aaeb248142651ac4aa158c9d82
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
(cherry picked from commit ac93d8ca61f87bb5f7f1278fca281ec60c6e3911)
---

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 991231f87..1adbea01f 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 @@ public class ODLVersionLUT {
         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 @@ public class ODLVersionLUT {
             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 fd9d76a1b..67b646b34 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>