Commit 570d9918 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... 

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/145-fix-ofc-24-end-to-end-test-for-optical-controller-component
parents c61310ad 6017733c

manifests/nginx_ingress_http.yaml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ spec: 
                name: nbiservice

                port:

                  number: 8080

          - path: /()(debug-api/.*)

          - path: /()(tfs-api/.*)

            pathType: Prefix

            backend:

              service:

proto/context.proto

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_FLEXSCALE = 9;

  DEVICEDRIVER_OPTICAL_TFS = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

}

scripts/run_tests_locally-nbi-debug-api.sh→scripts/run_tests_locally-nbi-tfs-api.sh

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 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=INFO --verbose \

    nbi/tests/test_debug_api.py
 
    nbi/tests/test_tfs_api.py

src/common/type_checkers/Assertions.py

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ def validate_device_driver_enum(message): 
        'DEVICEDRIVER_XR',

        'DEVICEDRIVER_IETF_L2VPN',

        'DEVICEDRIVER_GNMI_OPENCONFIG',

        'DEVICEDRIVER_FLEXSCALE',

        'DEVICEDRIVER_OPTICAL_TFS',

        'DEVICEDRIVER_IETF_ACTN',

    ]

src/context/service/database/models/enums/DeviceDriver.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class ORM_DeviceDriverEnum(enum.Enum): 
    XR                    = DeviceDriverEnum.DEVICEDRIVER_XR

    IETF_L2VPN            = DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN

    GNMI_OPENCONFIG       = DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG

    FLEXSCALE             = DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE

    OPTICAL_TFS           = DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS

    IETF_ACTN             = DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN

    OC                    = DeviceDriverEnum.DEVICEDRIVER_OC