Commit 352844ae authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/344-implement-a-new-firewall-agent-controllable-through-restconf-openconfig' into 'develop'

Resolve "Implement a new Firewall Agent controllable through RESTCONF/OpenConfig"

See merge request !402
parents 45d6b3cb a12b1122

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





# stages of the cicd pipeline

stages:

  #- dependencies

proto/context.proto

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

  DEVICEDRIVER_GNMI_NOKIA_SRLINUX = 19;

  DEVICEDRIVER_OPENROADM = 20;

  DEVICEDRIVER_RESTCONF_OPENCONFIG = 21;

}



enum DeviceOperationalStatusEnum {

scripts/run_tests_locally-device-restconf-openconfig.sh

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

RCFILE=$PROJECTDIR/coverage/.coveragerc



# Run unitary tests and analyze coverage of code at same time

# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0

coverage run --rcfile=$RCFILE --append -m pytest --log-level=DEBUG --verbose -o log_cli=true \

    device/tests/restconf_openconfig/test_unitary_restconf_openconfig.py

src/common/DeviceTypes.py

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ class DeviceTypeEnum(Enum): 
    EMULATED_OPEN_ROADM             = 'emu-optical-openroadm'

    EMULATED_OPTICAL_SPLITTER       = 'emu-optical-splitter'        # passive component required for XR Constellation

    EMULATED_P4_SWITCH              = 'emu-p4-switch'

    EMULATED_PACKET_FIREWALL        = 'emu-packet-firewall'

    EMULATED_PACKET_RADIO_ROUTER    = 'emu-packet-radio-router'

    EMULATED_PACKET_ROUTER          = 'emu-packet-router'

    EMULATED_PACKET_SWITCH          = 'emu-packet-switch'
@@ -51,6 +52,7 @@ class DeviceTypeEnum(Enum): 
    OPTICAL_ROADM                   = 'optical-roadm'

    OPTICAL_TRANSPONDER             = 'optical-transponder'

    P4_SWITCH                       = 'p4-switch'

    PACKET_FIREWALL                 = 'packet-firewall'

    PACKET_POP                      = 'packet-pop'

    PACKET_RADIO_ROUTER             = 'packet-radio-router'

    PACKET_ROUTER                   = 'packet-router'

src/common/tools/rest_conf/client/RestConfClient.py

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ class RestConfClient(RestApiClient): 
        self._base_url = str(href).replace('//', '/')

        if self._restconf_version is not None:

            self._base_url += '/{:s}'.format(self._restconf_version)

        if self._base_url.endswith('/data/'):

            self._base_url = self._base_url.split('/data/')[0]

        elif self._base_url.endswith('/data'):

            self._base_url = self._base_url.split('/data')[0]





    def get(