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

Merge branch... 

Merge branch 'feat/306-cttc-enhanced-restconf-based-openconfig-nbi-for-dscm-pluggables' into 'develop'

Resolve "(CTTC) Enhanced RESTCONF-based OpenConfig NBI for DSCM Pluggables"

See merge request !368
parents 0bab2254 07a6bcc2

.dockerignore

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
# Avoid including these folders when building the components

.git/

.gitlab/

.github/

.vscode/

coverage/

data/

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ cython_debug/ 


# Other

/tmp

.github



# Sqlite

*.db

scripts/run_tests_locally-nbi-dscm.sh

0 → 100755
+30 −0
Original line number Diff line number Diff line 
#!/bin/bash

# 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.



PROJECTDIR=`pwd`



cd $PROJECTDIR/src



# test DSCM NBI functions

python3 -m pytest --log-level=INFO --log-cli-level=INFO --verbose \

    nbi/tests/test_dscm_restconf.py::test_post_get_delete_leaf_optical_channel_frequency



# # test JSON to Proto conversion functions

# python3 -m pytest --log-level=INFO --log-cli-level=INFO --verbose \

#     nbi/tests/test_json_to_proto.py::test_create_pluggable_request_hub_format \

#     nbi/tests/test_json_to_proto.py::test_create_pluggable_request_leaf_format \

#     nbi/tests/test_json_to_proto.py::test_configure_pluggable_request_hub_format \

#     nbi/tests/test_json_to_proto.py::test_configure_pluggable_request_leaf_format \

#     nbi/tests/test_json_to_proto.py::test_empty_payload

src/common/DeviceTypes.py

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ class DeviceTypeEnum(Enum): 
    OPEN_ROADM                      = 'openroadm'

    MORPHEUS                        = 'morpheus'

    OPENFLOW_RYU_CONTROLLER         = 'openflow-ryu-controller'

    DSCM_NODE                       = 'dscm'



    # ETSI TeraFlowSDN controller

    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'

src/nbi/.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ unit_test nbi: 
    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_ietf_l3vpn.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_l3vpn.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_etsi_bwm.py --junitxml=/opt/results/${IMAGE_NAME}_report_etsi_bwm.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_camara_qod.py --junitxml=/opt/results/${IMAGE_NAME}_report_camara_qod.xml"

    #- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_dscm_restconf.py --junitxml=/opt/results/${IMAGE_NAME}_report_dscm_restconf.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script: