Pre-merge Cosmetic changes

.gitignore

@@ -178,4 +178,4 @@ libyang/
 **/logs/*.log.*
 
 # PySpark checkpoints
-src/analytics/.spark/*
+src/analytics/.spark/*
\ No newline at end of file

src/analytics/backend/requirements.in

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 pyspark==3.5.2
-confluent-kafka==2.3.*
+confluent-kafka==2.3.*
\ No newline at end of file

src/analytics/frontend/__init__.py

-
 # Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

src/analytics/frontend/client/AnalyticsFrontendClient.py

@@ -65,4 +65,4 @@ class AnalyticsFrontendClient:
         LOGGER.debug('SelectAnalyzers: {:s}'.format(grpc_message_to_json_string(request)))
         response = self.stub.SelectAnalyzers(request)
         LOGGER.debug('SelectAnalyzers result: {:s}'.format(grpc_message_to_json_string(response)))
-        return response
+        return response
\ No newline at end of file

src/analytics/frontend/requirements.in

@@ -17,4 +17,4 @@ confluent-kafka==2.3.*
 psycopg2-binary==2.9.*
 SQLAlchemy==1.4.*
 sqlalchemy-cockroachdb==1.4.*
-SQLAlchemy-Utils==0.38.*
+SQLAlchemy-Utils==0.38.*
\ No newline at end of file

src/analytics/frontend/service/AnalyticsFrontendService.py

@@ -25,4 +25,4 @@ class AnalyticsFrontendService(GenericGrpcService):
         self.analytics_frontend_servicer = AnalyticsFrontendServiceServicerImpl()
     
     def install_servicers(self):
-        add_AnalyticsFrontendServiceServicer_to_server(self.analytics_frontend_servicer, self.server)
+        add_AnalyticsFrontendServiceServicer_to_server(self.analytics_frontend_servicer, self.server)
\ No newline at end of file

src/analytics/frontend/service/__init__.py

-
 # Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

src/analytics/frontend/tests/__init__.py

+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

src/analytics/requirements.in

@@ -18,4 +18,4 @@ confluent-kafka==2.3.*
 psycopg2-binary==2.9.*
 SQLAlchemy==1.4.*
 sqlalchemy-cockroachdb==1.4.*
-SQLAlchemy-Utils==0.38.*
+SQLAlchemy-Utils==0.38.*
\ No newline at end of file

src/analytics/tests/__init__.py

+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

src/kpi_manager/database/KpiEngine.py

@@ -16,8 +16,6 @@ import logging, sqlalchemy
 from common.Settings import get_setting
 
 LOGGER = logging.getLogger(__name__)
-
-# CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@127.0.0.1:{:s}/{:s}?sslmode={:s}'
 CRDB_URI_TEMPLATE = 'cockroachdb://{:s}:{:s}@cockroachdb-public.{:s}.svc.cluster.local:{:s}/{:s}?sslmode={:s}'
 
 class KpiEngine:
@@ -33,12 +31,10 @@ class KpiEngine:
             CRDB_SSLMODE   = get_setting('CRDB_SSLMODE')
             crdb_uri = CRDB_URI_TEMPLATE.format(
                 CRDB_USERNAME, CRDB_PASSWORD, CRDB_NAMESPACE, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)
-        # crdb_uri = CRDB_URI_TEMPLATE.format(
-        #         CRDB_USERNAME, CRDB_PASSWORD, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)
         try:
             engine = sqlalchemy.create_engine(crdb_uri, echo=False)
             LOGGER.info(' KpiDBmanager initalized with DB URL: {:}'.format(crdb_uri))
         except: # pylint: disable=bare-except # pragma: no cover
             LOGGER.exception('Failed to connect to database: {:s}'.format(str(crdb_uri)))
             return None # type: ignore
-        return engine 
+        return engine