Commit 9bcb765e authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/377-tid-new-nbi-for-ipowdm-services-2
parents 08cb94c6 f962b570

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,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

deploy/tfs.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}

hackfest/mock_osm/WimconnectorIETFL2VPN.py

+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': []}

manifests/kafka/single-node.yaml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
apiVersion: v1

kind: Service

metadata:

  name: kafka-public

  name: kafka-service

  labels:

    app.kubernetes.io/component: message-broker

    app.kubernetes.io/instance: kafka
@@ -50,7 +50,7 @@ spec: 
      app.kubernetes.io/component: message-broker

      app.kubernetes.io/instance: kafka

      app.kubernetes.io/name: kafka

  serviceName: "kafka-public"

  serviceName: "kafka-service"

  replicas: 1

  minReadySeconds: 5

  template:
@@ -83,7 +83,7 @@ spec: 
          - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP

            value: "PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT"

          - name: KAFKA_CFG_ADVERTISED_LISTENERS

            value: "PLAINTEXT://kafka-public.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

            value: "PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

          - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES

            value: "CONTROLLER"

          - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS

manifests/nbiservice.yaml

+11 −0
Original line number Diff line number Diff line
@@ -68,6 +68,17 @@ spec: 
            limits:

              cpu: 1000m

              memory: 2048Mi

      # Volume mounts for TE data with IS-IS, BW and latency. Uncomment if needed

      #     volumeMounts:

      #       - name: te-data

      #         mountPath: /var/teraflow/nbi/service/ietf_network/te_data.json

      #         subPath: te_data.json

      # volumes:

      #   - name: te-data

      #     hostPath:

      #       Change this path to the actual path on the node where te_data.json is located

      #       path: /home/ubuntu/tfs-ctrl/src/nbi/service/ietf_network

      #       type: Directory

---

apiVersion: v1

kind: Service