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

Merge branch... 

Merge branch 'feat/305-cttc-enhanced-netconf-openconfig-sbi-driver-for-dscm-pluggables' into 'develop'

Resolve "(CTTC) Enhanced NETCONF-OpenConfig SBI Driver for DSCM Pluggables"

See merge request !367
parents ad3e4852 ecf801eb

proto/pluggables.proto

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ message PluggableConfig { 
  double center_frequency_mhz                      = 3;   // center frequency in MHz

  int32  operational_mode                          = 4;   // e.g., 0=off and 1=on 

  int32  line_port                                 = 5;   // line port number

  string channel_name                              = 6;   // channel name

  repeated DigitalSubcarrierGroupConfig dsc_groups = 10;

}

scripts/run_tests_locally-service-pluggable.sh

+5 −2
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ PROJECTDIR=`pwd` 
cd $PROJECTDIR/src

RCFILE=$PROJECTDIR/coverage/.coveragerc



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

    pluggables/tests/test_Pluggables.py

# 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



echo "Bye!"

src/device/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ COPY src/context/__init__.py context/__init__.py 
COPY src/context/client/. context/client/

COPY src/monitoring/__init__.py monitoring/__init__.py

COPY src/monitoring/client/. monitoring/client/

COPY src/kpi_manager/__init__.py kpi_manager/__init__.py

COPY src/kpi_manager/client/. kpi_manager/client/



# Clone test mock tools

RUN mkdir -p tests/tools/mock_ietf_actn_sdn_ctrl

src/device/service/drivers/__init__.py

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ if LOAD_ALL_DEVICE_DRIVERS: 
                # Real Packet Router, specifying OpenConfig Driver => use OpenConfigDriver

                FilterFieldEnum.DEVICE_TYPE: [

                    DeviceTypeEnum.OPEN_ROADM,

                   

                ],

                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_OPENROADM,

            }

src/device/service/drivers/openconfig/templates/Namespace.py

+17 −15
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ NAMESPACE_POLICY_TYPES_2 = 'http://openconfig.net/yang/policy_types' 
NAMESPACE_ROUTING_POLICY                      = 'http://openconfig.net/yang/routing-policy'

NAMESPACE_VLAN                                = 'http://openconfig.net/yang/vlan'

NAMESPACE_PLATFORM_TRANSCEIVER                = 'http://openconfig.net/yang/platform/transceiver'

NAMESPACE_TERMINAL_DEVICE_DIGITAL_SUBCARRIERS = 'http://openconfig.net/yang/terminal-device-digital-subcarriers'



NAMESPACES = {

    'nc'   : NAMESPACE_NETCONF,
@@ -46,4 +47,5 @@ NAMESPACES = { 
    'ocrp' : NAMESPACE_ROUTING_POLICY,

    'ocv'  : NAMESPACE_VLAN,

    'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER,

    'octds': NAMESPACE_TERMINAL_DEVICE_DIGITAL_SUBCARRIERS,

}