X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdatabaseconfigurationimpl.cpp;h=ac691ab4e77ef30227d9d4206b1ca772972c7d52;hb=refs%2Fchanges%2F28%2F12728%2F4;hp=211c53773370da3798ad0fc5a8afe30284947a25;hpb=ece67088ea6c4f67b9d0db74477a9d5c614d7763;p=ric-plt%2Fsdl.git

diff --git a/src/databaseconfigurationimpl.cpp b/src/databaseconfigurationimpl.cpp
index 211c537..ac691ab 100644
--- a/src/databaseconfigurationimpl.cpp
+++ b/src/databaseconfigurationimpl.cpp
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2018-2019 Nokia.
+   Copyright (c) 2018-2022 Nokia.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 #include "private/databaseconfigurationimpl.hpp"
 #include <arpa/inet.h>
 #include <boost/crc.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
 
 using namespace shareddatalayer;
 
@@ -35,6 +37,7 @@ namespace
 
     const uint16_t DEFAULT_PORT(6379U);
     const uint16_t DEFAULT_SENTINEL_PORT(26379U);
+    const std::string DEFAULT_SENTINEL_MASTER_GROUP_NAME("dbaasmaster");
 }
 
 DatabaseConfigurationImpl::DatabaseConfigurationImpl():
@@ -54,8 +57,10 @@ void DatabaseConfigurationImpl::checkAndApplyDbType(const std::string& type)
         dbType = DatabaseConfiguration::DbType::REDIS_CLUSTER;
     else if (type == "redis-sentinel")
         dbType = DatabaseConfiguration::DbType::REDIS_SENTINEL;
-    else if (type == "sdl-cluster")
-        dbType = DatabaseConfiguration::DbType::SDL_CLUSTER;
+    else if (type == "sdl-standalone-cluster")
+        dbType = DatabaseConfiguration::DbType::SDL_STANDALONE_CLUSTER;
+    else if (type == "sdl-sentinel-cluster")
+        dbType = DatabaseConfiguration::DbType::SDL_SENTINEL_CLUSTER;
     else
         throw DatabaseConfiguration::InvalidDbType(type);
 }
@@ -80,35 +85,53 @@ DatabaseConfiguration::Addresses DatabaseConfigurationImpl::getServerAddresses()
     return serverAddresses;
 }
 
-DatabaseConfiguration::Addresses DatabaseConfigurationImpl::getDefaultServerAddresses() const
+DatabaseConfiguration::Addresses DatabaseConfigurationImpl::getServerAddresses(const boost::optional<std::size_t>& addressIndex) const
 {
-    return { HostAndPort(getDefaultHost(), htons(DEFAULT_PORT)) };
+    if (addressIndex)
+        return { HostAndPort(serverAddresses.at(*addressIndex)) };
+
+    return serverAddresses;
 }
 
-void DatabaseConfigurationImpl::checkAndApplySentinelAddress(const std::string& address)
+DatabaseConfiguration::Addresses DatabaseConfigurationImpl::getDefaultServerAddresses() const
 {
-    sentinelAddress = HostAndPort(address, htons(DEFAULT_SENTINEL_PORT));
+    return { HostAndPort(getDefaultHost(), htons(DEFAULT_PORT)) };
 }
 
-boost::optional<HostAndPort> DatabaseConfigurationImpl::getSentinelAddress() const
+void DatabaseConfigurationImpl::checkAndApplySentinelPorts(const std::string& portsEnvStr)
 {
-    return sentinelAddress;
+    std::vector<std::string> ports;
+    boost::split(ports, portsEnvStr, boost::is_any_of(","));
+
+    for (auto port : ports)
+    {
+        try {
+            sentinelPorts.push_back(htons(boost::lexical_cast<uint16_t>(port)));
+        }
+        catch (boost::bad_lexical_cast const &) {
+            continue;
+        }
+    }
 }
 
 boost::optional<HostAndPort> DatabaseConfigurationImpl::getSentinelAddress(const boost::optional<std::size_t>& addressIndex) const
 {
-    if (addressIndex)
-        return { HostAndPort(serverAddresses.at(*addressIndex).getHost(), sentinelAddress->getPort()) };
+    std::size_t index(addressIndex ? *addressIndex : 0);
+    uint16_t port((sentinelPorts.size() > 0 && index < sentinelPorts.size()) ? sentinelPorts.at(index) : htons(DEFAULT_SENTINEL_PORT));
+
+    if (!(serverAddresses.size() > 0))
+        return {};
 
-    return getSentinelAddress();
+    return { HostAndPort(serverAddresses.at(index).getHost(), port) };
 }
 
-void DatabaseConfigurationImpl::checkAndApplySentinelMasterName(const std::string& name)
+void DatabaseConfigurationImpl::checkAndApplySentinelMasterNames(const std::string& sentinelMasterNamesEnvStr)
 {
-    sentinelMasterName = name;
+    boost::split(sentinelMasterNames, sentinelMasterNamesEnvStr, boost::is_any_of(","));
 }
 
-std::string DatabaseConfigurationImpl::getSentinelMasterName() const
+std::string DatabaseConfigurationImpl::getSentinelMasterName(const boost::optional<std::size_t>& addressIndex) const
 {
-    return sentinelMasterName;
+    std::size_t index(addressIndex ? *addressIndex : 0);
+    return ((sentinelMasterNames.size() > 0 && index < sentinelMasterNames.size()) ? sentinelMasterNames.at(index) : DEFAULT_SENTINEL_MASTER_GROUP_NAME);
 }