Resolve "(CTTC) Fix CI/CD and Unit tests for DSCM Pluggables"

Closes #345 (closed)

Merge request reports

Loading
+89 −0
Changes for manifests/pluggablesservice.yaml: 89 added lines, 0 removed lines.
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.

apiVersion: apps/v1
kind: Deployment
metadata:
  name: pluggablesservice
spec:
  selector:
    matchLabels:
      app: pluggablesservice
  #replicas: 1
  template:
    metadata:
      labels:
        app: pluggablesservice
    spec:
      terminationGracePeriodSeconds: 5
      containers:
        - name: server
          image: labs.etsi.org:5050/tfs/controller/pluggables:latest
          imagePullPolicy: Always
          ports:
            - containerPort: 30220
          env:
            - name: LOG_LEVEL
              value: "INFO"
          readinessProbe:
            exec:
              command: ["/bin/grpc_health_probe", "-addr=:30220"]
          livenessProbe:
            exec:
              command: ["/bin/grpc_health_probe", "-addr=:30220"]
          resources:
            requests:
              cpu: 250m
              memory: 128Mi
            limits:
              cpu: 1000m
              memory: 1024Mi
---
apiVersion: v1
kind: Service
metadata:
  name: pluggablesservice
  labels:
    app: pluggablesservice
spec:
  type: ClusterIP
  selector:
    app: pluggablesservice
  ports:
    - name: grpc
      protocol: TCP
      port: 30220
      targetPort: 30220
---
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
  name: pluggablesservice-hpa
spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
    name: pluggablesservice
  minReplicas: 1
  maxReplicas: 20
  metrics:
    - type: Resource
      resource:
        name: cpu
        target:
          type: Utilization
          averageUtilization: 80
  #behavior:
  #  scaleDown:
  #    stabilizationWindowSeconds: 30
+4 −0
Changes for proto/kpi_sample_types.proto: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -75,4 +75,8 @@ enum KpiSampleType {

    KPISAMPLETYPE_INT_IS_DROP        = 2201;
    KPISAMPLETYPE_INT_DROP_REASON    = 2202;

    // PLUGGABLES
    KPISAMPLETYPE_PRE_FEC_BER              = 2301;
    KPISAMPLETYPE_RECEIVED_POWER_PLUGGABLE = 2302;
}
+2 −2
Changes for scripts/run_tests_locally-pluggable.sh: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ RCFILE=$PROJECTDIR/coverage/.coveragerc
# to run integration test: -m integration
python3 -m pytest --log-level=info --log-cli-level=info --verbose -m "not integration" \
    pluggables/tests/test_pluggables_with_SBI.py
# python3 -m pytest --log-level=info --log-cli-level=info --verbose \
#     pluggables/tests/test_Pluggables.py
python3 -m pytest --log-level=info --log-cli-level=info --verbose -m "not integration"\
    pluggables/tests/test_pluggables.py

echo "Bye!"
+42 −0
Changes for scripts/run_tests_locally-telemetry-netconf.sh: 42 added lines, 0 removed lines.
Original line number Diff line number Diff line
#!/bin/bash
# Copyright 2022-2026 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.

PROJECTDIR=`pwd`
cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc

# Collector folders to exclude from measurement and reporting
OMIT_COLLECTORS="telemetry/backend/service/collectors/emulated/*"
OMIT_COLLECTORS="${OMIT_COLLECTORS},telemetry/backend/service/collectors/gnmi_oc/*"
OMIT_COLLECTORS="${OMIT_COLLECTORS},telemetry/backend/service/collectors/int_collector/*"

# Files to include in the HTML report:
#   - netconf_oc collector (the code under test)
#   - telemetry backend service layer (*.py directly in service/)
INCLUDE_REPORT="telemetry/backend/service/collectors/netconf_oc/*"
INCLUDE_REPORT="${INCLUDE_REPORT},telemetry/backend/service/*.py"

# This is unit test (should be tested with container-lab running)
python3 -m coverage run \
    --source=telemetry/backend/service \
    --omit="${OMIT_COLLECTORS}" \
    -m pytest --log-level=info --log-cli-level=info --verbose \
    telemetry/backend/tests/netconf_oc/test_unit_NetconfOCcollector.py

python3 -m coverage html \
    --directory=../coverage/ecoc26_netconf_oc_unit \
    --include="${INCLUDE_REPORT}"

echo "Bye!"
+1 −1
Changes for src/common/Constants.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class ServiceNameEnum(Enum):
    ANALYTICSBACKEND       = 'analytics-backend'
    QOSPROFILE             = 'qos-profile'
    OSMCLIENT              = 'osm-client'
    PLUGGABLES              = 'dscm-pluggable'
    PLUGGABLES             = 'pluggables'

    # Used for test and debugging only
    DLT_GATEWAY    = 'dltgateway'
Loading
Loading