Update features for Argon release

Update ccsdk/features for use with OpenDaylight Argon release

Issue-ID: CCSDK-3916
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ie28aa66f6c3a9c0c6002e05d8f714613dbe460cf
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

4 files changed, 21 insertions, 5 deletions

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 ef2dbcb94..55456a9c6 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.6.")) {
+            return "ONAP Montreal";
+        }
         if (onapCCSDKVersion.startsWith("2.5.")) {
             return "ONAP London";
         }
@@ -72,6 +75,10 @@ public class ODLVersionLUT {
         }
         if(odlMdsalVersionLUT==null) {
             odlMdsalVersionLUT = new HashMap<>();
+            odlMdsalVersionLUT.put("11.0.9","argon-SR1 (0.18.1)");
+            odlMdsalVersionLUT.put("11.0.7","argon-SR0 (0.18.0)");
+            odlMdsalVersionLUT.put("10.0.8","chlorine-SR3 (0.17.3)");
+            odlMdsalVersionLUT.put("10.0.6","chlorine-SR2 (0.17.2)");
             odlMdsalVersionLUT.put("10.0.5","chlorine-SR1 (0.17.1)");
             odlMdsalVersionLUT.put("10.0.2","chlorine-SR0 (0.17.0)");
             odlMdsalVersionLUT.put("9.0.5","sulfur-SR2 (0.16.2)");
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderConfig.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderConfig.java
index 950c8e919..9ecc68093 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderConfig.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderConfig.java
@@ -35,6 +35,8 @@ public class DataProviderConfig implements Configuration {
     private static final String PROPERTY_KEY_DBENABLED = "enabled";
     private static final String DEFAULT_ISENABLED = "${SDNRDBENABLED}";
     private static final boolean DEFAULT_ISENABLED_IFNOTSET = true;
+    private static final String PROPERTY_KEY_GUICUTTHROUGH_OVERWRITE = "GUICUTTHROUGH_PROXY_OVERWRITE";
+    private static final String DEFAULT_GUICUTTHROUGH_OVERWRITE = "${GUICUTTHROUGH_PROXY_OVERWRITE}";
     private final EsConfig esConfig;
     private final SqlDBConfig maridadbConfig;
     private ConfigurationFileRepresentation configuration;
@@ -55,17 +57,21 @@ public class DataProviderConfig implements Configuration {
     }
 
     public boolean isEnabled() {
-        final String s = this.configuration.getProperty(ConfigurationFileRepresentation.SECTIONNAME_ROOT, PROPERTY_KEY_DBENABLED);
-        if(s!= null && !s.isBlank()) {
+        final String s = this.configuration.getProperty(ConfigurationFileRepresentation.SECTIONNAME_ROOT,
+                PROPERTY_KEY_DBENABLED);
+        if (s != null && !s.isBlank()) {
             return Boolean.getBoolean(s);
         }
         return DEFAULT_ISENABLED_IFNOTSET;
     }
+
     @Override
     public void defaults() {
 
         configuration.setPropertyIfNotAvailable(this.getSectionName(), PROPERTY_KEY_DBTYPE, DEFAULT_DBTYPE);
         configuration.setPropertyIfNotAvailable(this.getSectionName(), PROPERTY_KEY_DBENABLED, DEFAULT_ISENABLED);
+        configuration.setPropertyIfNotAvailable(this.getSectionName(), PROPERTY_KEY_GUICUTTHROUGH_OVERWRITE,
+                DEFAULT_GUICUTTHROUGH_OVERWRITE);
     }
 
     @Override
@@ -81,5 +87,8 @@ public class DataProviderConfig implements Configuration {
         return SdnrDbType.valueOf(value);
     }
 
+    public String getGuicutthroughOverride() {
+        return this.configuration.getProperty(this.getSectionName(), PROPERTY_KEY_GUICUTTHROUGH_OVERWRITE);
+    }
 
 }
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
index d21d50f83..1b1990159 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderServiceImpl.java
@@ -154,7 +154,7 @@ public class DataProviderServiceImpl implements DataProviderService, AutoCloseab
             if (this.dbConfig.getDbType() == SdnrDbType.ELASTICSEARCH) {
                 this.dataProvider = new ElasticSearchDataProvider(this.dbConfig.getEsConfig());
              } else {
-                this.dataProvider = new SqlDBDataProvider(this.dbConfig.getMariadbConfig());
+                this.dataProvider = new SqlDBDataProvider(this.dbConfig.getMariadbConfig(), this.dbConfig.getGuicutthroughOverride());
             }
         }
         else {
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DataProviderYangToolsMapper.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DataProviderYangToolsMapper.java
index 78b032e77..4137295bc 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DataProviderYangToolsMapper.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/yangtools/DataProviderYangToolsMapper.java
@@ -23,8 +23,8 @@ package org.onap.ccsdk.features.sdnr.wt.dataprovider.yangtools;
 
 import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
 import org.onap.ccsdk.features.sdnr.wt.yang.mapper.serialize.IdentifierDeserializer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.MeasurementKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;