Commit d5b61df7 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/307-update-python-version-service' into 'develop' 

Upgrade the Python version used by the Service and Context components

See merge request !391
parents 3a03e5cf 4c52be9c

common_requirements.in

+0 −1
Original line number Diff line number Diff line
@@ -24,4 +24,3 @@ protobuf==3.20.* 
pytest==6.2.5

pytest-benchmark==3.4.1

python-dateutil==2.8.2
 
pytest-depends==1.0.1

common_requirements_py313.in

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI 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.



coverage==7.9.*

grpcio==1.73.*

grpcio-health-checking==1.73.*

grpcio-reflection==1.73.*

grpcio-tools==1.73.*

grpclib==0.4.8

prettytable==3.16.0

prometheus-client==0.22.*

protobuf==6.32.*

pytest==8.4.1

pytest-benchmark==5.1.0

python-dateutil==2.9.0

pytest-depends==1.0.1

manifests/contextservice.yaml

+9 −4
Original line number Diff line number Diff line
@@ -52,12 +52,17 @@ spec: 
                name: crdb-data

            - secretRef:

                name: nats-data

          startupProbe:

            grpc:

              port: 1010

            failureThreshold: 30

            periodSeconds: 1

          readinessProbe:

            exec:

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

            grpc:

              port: 1010

          livenessProbe:

            exec:

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

            grpc:

              port: 1010

          resources:

            requests:

              cpu: 250m

manifests/serviceservice.yaml

+9 −4
Original line number Diff line number Diff line
@@ -37,12 +37,17 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "INFO"

          startupProbe:

            grpc:

              port: 3030

            failureThreshold: 30

            periodSeconds: 1

          readinessProbe:

            exec:

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

            grpc:

              port: 3030

          livenessProbe:

            exec:

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

            grpc:

              port: 3030

          resources:

            requests:

              cpu: 250m

src/common/method_wrappers/Decorator.py

+4 −1
Original line number Diff line number Diff line
@@ -128,7 +128,10 @@ class MetricsPool: 
                else:

                    raise Exception('Unsupported metric: {:s}'.format(raw_metric_name)) # pragma: no cover

                metric_data = method_to_metric_fields.setdefault(method_name, dict()).setdefault(metric_name, dict())

                for field_name,labels,value,_,_ in raw_metric_data._child_samples():

                for values in raw_metric_data._child_samples():

                    field_name = values[0]

                    labels = values[1]

                    value = values[2]

                    if field_name == '_bucket': bucket_bounds.add(labels['le'])

                    if len(labels) > 0: field_name = '{:s}:{:s}'.format(field_name, json.dumps(labels, sort_keys=True))

                    metric_data[field_name] = value