Commit 6a2a460a authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge cleanup

parent 20bf2c56

manifests/kpi_value_apiservice.yaml

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "INFO"

          # envFrom:

          #   - secretRef:

          #       name: crdb-data

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30020"]

manifests/kpi_value_writerservice.yaml

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "INFO"

          envFrom:

            - secretRef:

                name: crdb-data

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:30030"]

src/common/tools/kafka/Variables.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOGGER = logging.getLogger(__name__) 


class KafkaConfig(Enum):

    # SERVER_IP    = "127.0.0.1:9092"

    SERVER_IP    = "kafka-service:9092"

    SERVER_IP    = "kafka-service.kafka.svc.cluster.local:9092"

    ADMIN_CLIENT =  AdminClient({'bootstrap.servers': SERVER_IP})



class KafkaTopic(Enum):

src/kpi_manager/client/KpiManagerClient.py

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ class KpiManagerClient: 
        if not port: port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER) 

        self.endpoint = '{:s}:{:s}'.format(str(host), str(port))

        LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))

        print('Creating channel to {:s}...'.format(str(self.endpoint))) 



        self.channel = None

        self.stub = None

src/kpi_manager/requirements.in

+18 −11
Original line number Diff line number Diff line 
SQLAlchemy==1.4.52

sqlalchemy-cockroachdb==1.4.4

SQLAlchemy-Utils==0.38.3

psycopg2-binary==2.9.3

confluent-kafka==2.3.0

Jinja2==3.0.3

ncclient==0.6.15

pyang==2.6.0

requests==2.27.1

typing_extensions==4.12.0

yattag==1.15.2
 
 No newline at end of file
 
# 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.



psycopg2-binary==2.9.*

SQLAlchemy==1.4.*

sqlalchemy-cockroachdb==1.4.*

SQLAlchemy-Utils==0.38.*