Commit fdc6ac60 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers' into 'develop'

Resolve "(CTTC) Implement integration test between E2E-IP-Optical SDN Controllers"

See merge request !286
parents 84efa77e 05051e46

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ include: 
  - local: '/src/bgpls_speaker/.gitlab-ci.yml'

  - local: '/src/kpi_manager/.gitlab-ci.yml'

  - local: '/src/kpi_value_api/.gitlab-ci.yml'

  - local: '/src/kpi_value_writer/.gitlab-ci.yml'

  - local: '/src/telemetry/.gitlab-ci.yml'

  #- local: '/src/kpi_value_writer/.gitlab-ci.yml'

  #- local: '/src/telemetry/.gitlab-ci.yml'

  - local: '/src/analytics/.gitlab-ci.yml'

  - local: '/src/qos_profile/.gitlab-ci.yml'

  - local: '/src/vnt_manager/.gitlab-ci.yml'

deploy/kafka.sh

+5 −4
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"

deploy/tfs.sh

+1 −5
Original line number Diff line number Diff line
@@ -342,11 +342,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

    else

        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f4)

        if [ "$TFS_SKIP_BUILD" != "YES" ]; then

        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')

        else

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" | sed 's,//,/,g' | sed 's,http:/,,g')

        fi

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

    fi

ecoc24

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
src/tests/ecoc24/
 
 No newline at end of file

manifests/e2e_orchestratorservice.yaml

+0 −15
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ spec: 
  replicas: 1

  template:

    metadata:

      annotations:

        config.linkerd.io/skip-outbound-ports: "8761"

        config.linkerd.io/skip-inbound-ports: "8761"

      labels:

        app: e2e-orchestratorservice

    spec:
@@ -37,18 +34,9 @@ spec: 
          ports:

            - containerPort: 10050

            - containerPort: 9192

            - containerPort: 8761

          env:

            - name: LOG_LEVEL

              value: "INFO"

            - 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"

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:10050"]
@@ -80,6 +68,3 @@ spec: 
    - name: metrics

      port: 9192

      targetPort: 9192
 
    - name: ws

      port: 8761

      targetPort: 8761