Resolve "(CTTC) Update recommendations to use SocketIO on NBI and E2E Orch components"

Lluis Gifre Renomrequested to merge
feat/266-cttc-e2e-orchestrator-subscription-on-device-added-using-socketio into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers

Closes #266 (closed)

Merge request reports

deploy/kafka.sh

+4 −3
Changes for deploy/kafka.sh: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -57,11 +57,12 @@ function kafka_deploy() { 
    # Kafka zookeeper service should be deployed before the kafka service

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"



    KFK_ZOOKEEPER_SERVICE="zookeeper-service"    # this command may be replaced with command to extract service name automatically

    KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEEPER_SERVICE} -o 'jsonpath={.spec.clusterIP}')

    #KFK_ZOOKEEPER_SERVICE="zookeeper-service"    # this command may be replaced with command to extract service name automatically

    #KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEEPER_SERVICE} -o 'jsonpath={.spec.clusterIP}')



    # Kafka service should be deployed after the zookeeper service

    sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

    #sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

    sed -i "s/<KAFKA_NAMESPACE>/${KFK_NAMESPACE}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



    # echo ">>> Deploying Apache Kafka Broker"

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

manifests/kafka/01-zookeeper.yaml

+3 −5
Changes for manifests/kafka/01-zookeeper.yaml: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -19,14 +19,13 @@ metadata: 
  labels:

    app: zookeeper-service

  name: zookeeper-service

  namespace: kafka

spec:

  type: NodePort

  type: ClusterIP

  ports:

    - name: zookeeper-port

      port: 2181

      nodePort: 30181

      targetPort: 2181

      #nodePort: 30181

      #targetPort: 2181

  selector:

    app: zookeeper

---
@@ -36,7 +35,6 @@ metadata: 
  labels:

    app: zookeeper

  name: zookeeper

  namespace: kafka

spec:

  replicas: 1

  selector:

manifests/kafka/02-kafka.yaml

+3 −4
Changes for manifests/kafka/02-kafka.yaml: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ metadata: 
  labels:

    app: kafka-broker

  name: kafka-service

  namespace: kafka

spec:

  ports:

  - port: 9092
@@ -32,7 +31,6 @@ metadata: 
  labels:

    app: kafka-broker

  name: kafka-broker

  namespace: kafka

spec:

  replicas: 1

  selector:
@@ -49,11 +47,12 @@ spec: 
        - name: KAFKA_BROKER_ID

          value: "1"

        - name: KAFKA_ZOOKEEPER_CONNECT

          value: <ZOOKEEPER_INTERNAL_IP>:2181

          #value: <ZOOKEEPER_INTERNAL_IP>:2181

          value: zookeeper-service.<KAFKA_NAMESPACE>.svc.cluster.local:2181

        - name: KAFKA_LISTENERS

          value: PLAINTEXT://:9092

        - name: KAFKA_ADVERTISED_LISTENERS

          value: PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092

          value: PLAINTEXT://kafka-service.<KAFKA_NAMESPACE>.svc.cluster.local:9092

        image: wurstmeister/kafka

        imagePullPolicy: IfNotPresent

        name: kafka-broker

manifests/e2e_orchestratorservice.yaml

+0 −12
Changes for manifests/e2e_orchestratorservice.yaml: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -41,18 +41,6 @@ spec: 
          env:

            - name: LOG_LEVEL

              value: "DEBUG"

            - name: WS_IP_HOST

              value: "nbiservice.tfs-ip.svc.cluster.local"

            - name: WS_IP_PORT

              value: "8761"

            - name: WS_E2E_HOST

              value: "e2e-orchestratorservice.tfs-e2e.svc.cluster.local"

            - name: WS_E2E_PORT

              value: "8762"

            - name: EXT_CONTROLLER1_ADD

              value: "10.1.1.96"

            - name: EXT_CONTROLLER1_PORT

              value: "8003"

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:10050"]

manifests/nbiservice.yaml

+8 −5
Changes for manifests/nbiservice.yaml: 8 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -39,25 +39,28 @@ spec: 
            #- containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

            - name: FLASK_ENV

              value: "production"  # change to "development" if developing

            - name: IETF_NETWORK_RENDERER

              value: "LIBYANG"

          envFrom:

            - secretRef:

                name: kfk-kpi-data

          readinessProbe:

            httpGet:

              path: /healthz

              port: 8080

            initialDelaySeconds: 5

            initialDelaySeconds: 30   # NBI's gunicorn takes 30~40 seconds to bootstrap

            periodSeconds: 10

            failureThreshold: 3

            failureThreshold: 6

          livenessProbe:

            httpGet:

              path: /healthz

              port: 8080

            initialDelaySeconds: 5

            initialDelaySeconds: 30   # NBI's gunicorn takes 30~40 seconds to bootstrap

            periodSeconds: 10

            failureThreshold: 3

            failureThreshold: 6

          resources:

            requests:

              cpu: 150m