Commit 5fc770e1 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/147-integrate-support-for-ip-e2e-optical-sdn-controllers-to-manage-hierarchical-virtual
parents f163a56c 95a93fec

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:

my_deploy.sh

+8 −1
Original line number Diff line number Diff line
@@ -29,7 +29,14 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene 
#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"



# Uncomment to activate Optical Controller

#export TFS_COMPONENTS="${TFS_COMPONENTS} opticalcontroller"

#   To manage optical connections, "service" requires "opticalcontroller" to be deployed

#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the

#   "opticalcontroller" only if "service" is already in TFS_COMPONENTS, and re-export it.

#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

#    BEFORE="${TFS_COMPONENTS% service*}"

#    AFTER="${TFS_COMPONENTS#* service}"

#    export TFS_COMPONENTS="${BEFORE} opticalcontroller service ${AFTER}"

#fi



# Uncomment to activate ZTP

#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"

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',

    ]