Commit 347fc82a authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Merge branch... 

Merge branch 'feat/306-cttc-enhanced-restconf-based-openconfig-nbi-for-dscm-pluggables' into feat/305-cttc-enhanced-netconf-openconfig-sbi-driver-for-dscm-pluggables
parents dd4fbb23 b0868e72

.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

manifests/contextservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ spec: 
            - name: ALLOW_EXPLICIT_ADD_LINK_TO_TOPOLOGY

              value: "FALSE"

            - name: CRDB_DATABASE

              value: "tfs_context"

              value: "tfs_ip_context"

          envFrom:

            - secretRef:

                name: crdb-data

proto/context.proto

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_RYU = 18;

  DEVICEDRIVER_GNMI_NOKIA_SRLINUX = 19;

  DEVICEDRIVER_OPENROADM = 20;

  DRVICEDRIVER_NETCONF_DSCM = 21;

}



enum DeviceOperationalStatusEnum {

scripts/run_tests_locally-nbi-dscm.sh

0 → 100755
+32 −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

/home/ubuntu/dscm/bin/python -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

# /home/ubuntu/dscm/bin/python -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