Merge "config/cassandra: best-effort to support upgrade to cql driver"

Author: Jenkins CI

src/config/common/cfgm_common/datastore/drivers/cassandra_cql.py

@@ -32,6 +32,7 @@
 
 
 DEFAULT_CQL_PORT = 9042
+DEFAULT_THRIFT_PORT = 9160
 
 # Properties passed to the column familly
 TABLE_PROPERTIES = {
@@ -360,6 +361,18 @@ def _Init_Cluster(self):
             except ValueError:
                 endpoints.append(address)
 
+        # Best-effort to support upgrade from thrift to cql
+        if port == DEFAULT_THRIFT_PORT:
+            self.options.logger(
+                "Usage of thrift port '{}' detected for CQL driver. "
+                "Please consider fixing port number. Trying "
+                "best-effort by switching to default port for "
+                "CQL '{}'.".format(
+                    DEFAULT_THRIFT_PORT,
+                    DEFAULT_CQL_PORT),
+                level=SandeshLevel.SYS_WARN)
+            port = None
+
         connector.ProtocolVersion.SUPPORTED_VERSIONS = self.ProtocolVersions
         try:
             self._cluster = connector.cluster.Cluster(