Resolve "(OPT) Integrate QKD tests in TFS CI/CD pipeline"

Closes #195 (closed)

Merge request reports

Loading
+4 −0
Changes for deploy/tfs.sh: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -669,6 +669,10 @@ if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui"
    printf "\n\n"
fi

echo "Pruning Docker Images..."
docker image prune --force
printf "\n\n"

if [ "$DOCKER_BUILD" == "docker buildx build" ]; then
    echo "Pruning Docker Buildx Cache..."
    docker buildx prune --force
+2 −2
Changes for manifests/nginx_ingress_http.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ spec:
                port:
                  number: 8080
          - path: /()(qkd_app/.*)
          - pathType: Prefix
            pathType: Prefix
            backend:
              service:
                name: qkdappservice
                name: qkd-appservice
                port:
                  number: 8005
+7 −9
Changes for manifests/qkd_appservice.yaml: 7 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@
apiVersion: apps/v1
kind: Deployment
metadata:
  name: qkdappservice
  name: qkd-appservice
spec:
  selector:
    matchLabels:
      app: qkdappservice
      app: qkd-appservice
  #replicas: 1
  template:
    metadata:
      labels:
        app: qkdappservice
        app: qkd-appservice
    spec:
      terminationGracePeriodSeconds: 5
      containers:
@@ -36,10 +36,8 @@ spec:
        - containerPort: 9192
        - containerPort: 8005
        env:
        - name: MB_BACKEND
          value: "nats"
        - name: LOG_LEVEL
          value: "INFO"
          value: "DEBUG"
        - name: CRDB_DATABASE_APP
          value: "qkd_app"
        envFrom:
@@ -64,13 +62,13 @@ spec:
apiVersion: v1
kind: Service
metadata:
  name: qkdappservice
  name: qkd-appservice
  labels:
    app: qkdappservice
    app: qkd-appservice
spec:
  type: ClusterIP
  selector:
    app: qkdappservice
    app: qkd-appservice
  ports:
  - name: grpc
    protocol: TCP
+27 −0
Changes for scripts/show_logs_qkd_app.sh: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
#!/bin/bash
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

########################################################################################################################
# Define your deployment settings here
########################################################################################################################

# If not already set, set the name of the Kubernetes namespace to deploy to.
export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}

########################################################################################################################
# Automated steps start here
########################################################################################################################

kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/qkd-appservice -c server
+77 −0
Changes for src/device/tests/qkd/unit/descriptorQKD_links.json: 77 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
    "contexts": [
        {"context_id": {"context_uuid": {"uuid": "admin"}}}
    ],
    "topologies": [
        {"topology_id": {"topology_uuid": {"uuid": "admin"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
    ],
    "devices": [
        {
            "device_id": {"device_uuid": {"uuid": "QKD1"}}, "device_type": "qkd-node",
            "device_operational_status": 0, "device_drivers": [12], "device_endpoints": [],
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "11111"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "scheme": "http"
                }}}
            ]}

        },
        {
            "device_id": {"device_uuid": {"uuid": "QKD2"}}, "device_type": "qkd-node",
            "device_operational_status": 0, "device_drivers": [12], "device_endpoints": [],
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "22222"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "scheme": "http"
                }}}
            ]}

        },
	{
            "device_id": {"device_uuid": {"uuid": "QKD3"}}, "device_type": "qkd-node",
            "device_operational_status": 0, "device_drivers": [12], "device_endpoints": [],
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "33333"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "scheme": "http"
                }}}
            ]}

        }
    ],
    "links": [
	{
            "link_id": {"link_uuid": {"uuid": "QKD1/10.0.2.10:1001==QKD2/10.0.2.10:2001"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "QKD1"}}, "endpoint_uuid": {"uuid": "10.0.2.10:1001"}},
                {"device_id": {"device_uuid": {"uuid": "QKD2"}}, "endpoint_uuid": {"uuid": "10.0.2.10:2001"}}
            ]
        },
        {
            "link_id": {"link_uuid": {"uuid": "QKD2/10.0.2.10:2001==QKD1/10.0.2.10:1001"}},
            "link_endpoint_ids": [
		        {"device_id": {"device_uuid": {"uuid": "QKD2"}}, "endpoint_uuid": {"uuid": "10.0.2.10:2001"}},
                {"device_id": {"device_uuid": {"uuid": "QKD1"}}, "endpoint_uuid": {"uuid": "10.0.2.10:1001"}}
            ]
        },
	{
            "link_id": {"link_uuid": {"uuid": "QKD2/10.0.2.10:2002==QKD3/10.0.2.10:3001"}},
            "link_endpoint_ids": [
		        {"device_id": {"device_uuid": {"uuid": "QKD2"}}, "endpoint_uuid": {"uuid": "10.0.2.10:2002"}},
                {"device_id": {"device_uuid": {"uuid": "QKD3"}}, "endpoint_uuid": {"uuid": "10.0.2.10:3001"}}
            ]
        },
	{
            "link_id": {"link_uuid": {"uuid": "QKD3/10.0.2.10:3001==QKD2/10.0.2.10:2002"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "QKD3"}}, "endpoint_uuid": {"uuid": "10.0.2.10:3001"}},
                {"device_id": {"device_uuid": {"uuid": "QKD2"}}, "endpoint_uuid": {"uuid": "10.0.2.10:2002"}}
            ]
        }

    ]
}
Loading
Loading