Commit 5dede4aa 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/143-cttc-logical-resources-component
parents 26e604c7 6559fa42
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ venv.bak/

# VSCode project settings
.vscode/
.github/

# Visual Studio project settings
/.vs
@@ -177,6 +178,8 @@ cython_debug/
# Sqlite
*.db

#temp files to test telemetry
src/telemetry/backend/tempFiles/
# TeraFlowSDN-generated files
tfs_runtime_env_vars.sh
tfs_runtime_env_vars*.sh
+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type=
printf "\n"

echo ">>> Create Secret with Apache Kafka..."
KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-public -o 'jsonpath={.spec.ports[0].port}')
KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ $ docker exec -it clab-srlinux-srl1 sr_cli
$ sudo containerlab destroy --topo srlinux.clab.yml

## Install gNMIc
$ sudo bash -c "$(curl -sL https://get-gnmic.kmrd.dev)"
$ sudo bash -c "$(curl -sL https://get-gnmic.openconfig.net)"

## gNMI Capabilities request
$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify capabilities
+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ https://github.com/openconfig/kne/blob/v0.1.9/examples/nokia/srlinux-services/sr
https://containerlab.dev/manual/kinds/srl/#default-node-configuration
https://learn.srlinux.dev/tutorials/infrastructure/kne/srl-with-oc-services/
https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md
https://gnmic.kmrd.dev/cmd/get/
https://gnmic.openconfig.net/#get-request


IMPORTANT: for Nokia SR Linux, use kind "srl" and type "ixr6"
@@ -57,7 +57,7 @@ docker exec -it clab-tfs-scenario-client2 bash


## Install gNMIc
$ sudo bash -c "$(curl -sL https://get-gnmic.kmrd.dev)"
$ sudo bash -c "$(curl -sL https://get-gnmic.openconfig.net)"

## gNMI Capabilities request
$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify capabilities
+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class WimconnectorIETFL2VPN(SdnConnectorBase):
        """
        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type
            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service
            'ELAN' : (2, None, 'vpls'), # Virtual Private LAN  Service
            'ELAN' : (2, None, 'bgp-vpls'), # Virtual Private LAN  Service
        }
        settings = SETTINGS.get(service_type)
        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))
@@ -291,12 +291,12 @@ class WimconnectorIETFL2VPN(SdnConnectorBase):
            if access_priority is not None:
                availability = {}
                availability["access-priority"] = access_priority
                availability["single-active"] = [None]
                availability["single-active"] = None
                site_network_access["availability"] = availability

                constraint = {}
                constraint['constraint-type'] = 'end-to-end-diverse'
                constraint['target'] = {'all-other-accesses': [None]}
                constraint['target'] = {'all-other-accesses': None}

                access_diversity = {}
                access_diversity['constraints'] = {'constraint': []}
Loading