Loading .gitlab-ci.yml +14 −4 Changes for .gitlab-ci.yml: 14 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -20,9 +20,15 @@ stages: - unit_test - end2end_test variables: CI_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}" TFS_REGISTRY_IMAGES: "${CI_REGISTRY_IMAGE}" TFS_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}" TFS_SKIP_BUILD: "YES" workflow: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)' when: always - when: never Loading @@ -31,6 +37,8 @@ include: #- local: '/manifests/.gitlab-ci.yml' - local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/nbi/.gitlab-ci.yml' - local: '/src/mcp_server/.gitlab-ci.yml' - local: '/src/agentic/.gitlab-ci.yml' - local: '/src/context/.gitlab-ci.yml' - local: '/src/device/.gitlab-ci.yml' - local: '/src/service/.gitlab-ci.yml' Loading @@ -44,11 +52,11 @@ include: - local: '/src/policy/.gitlab-ci.yml' - local: '/src/automation/.gitlab-ci.yml' - local: '/src/forecaster/.gitlab-ci.yml' #- local: '/src/webui/.gitlab-ci.yml' - local: '/src/webui/.gitlab-ci.yml' #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml' #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml' #- local: '/src/l3_attackmitigator/.gitlab-ci.yml' - local: '/src/slice/.gitlab-ci.yml' #- local: '/src/slice/.gitlab-ci.yml' #- local: '/src/interdomain/.gitlab-ci.yml' - local: '/src/pathcomp/.gitlab-ci.yml' #- local: '/src/dlt/.gitlab-ci.yml' Loading @@ -57,7 +65,7 @@ include: - 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/telemetry/.gitlab-ci.yml' - local: '/src/analytics/.gitlab-ci.yml' - local: '/src/qos_profile/.gitlab-ci.yml' - local: '/src/vnt_manager/.gitlab-ci.yml' Loading @@ -66,6 +74,8 @@ include: - local: '/src/osm_client/.gitlab-ci.yml' - local: '/src/simap_connector/.gitlab-ci.yml' - local: '/src/pluggables/.gitlab-ci.yml' - local: '/src/logical_resources/.gitlab-ci.yml' - local: '/src/spine_leaf/.gitlab-ci.yml' # This should be last one: end-to-end integration tests - local: '/src/tests/.gitlab-ci.yml' deploy/README.md 0 → 100644 +40 −0 Changes for deploy/README.md: 40 added lines, 0 removed lines. Original line number Diff line number Diff line # Optional Monitoring Infrastructure QuestDB and the bundled Grafana instance are deployed only when `TFS_COMPONENTS` includes the complete token `monitoring` or `slice`. Both are legacy components. Selecting only core, optical, MCP or Agentic components does not deploy this infrastructure. The fallback component list in `deploy/all.sh` still includes `slice` for compatibility; select an explicit component list without `slice` or `monitoring` for a lightweight deployment, as the ECOC demo specs do. `manifests/webuiservice.yaml` contains only the WebUI. `manifests/grafanaservice.yaml` contains a separate Grafana Deployment, Service, PVC and ingress at `/grafana/`. The deployment script enables the WebUI navigation link through `TFS_GRAFANA_ENABLED=YES` only in the legacy monitoring mode, and configures datasources through the Grafana Service. The `qdb-data` Secret and dashboard exposure/configuration are skipped when neither legacy consumer is selected. Shared Kubernetes observability installations are not automatically removed or disabled. Explicit calls to `deploy/qdb.sh` still deploy QuestDB for operators who need to manage that infrastructure separately. Existing QuestDB namespaces/storage and previously deployed Grafana resources are not pruned automatically. Back up any required data and clean up obsolete resources explicitly when migrating. Direct manifest users must apply the new Grafana manifest separately and enable its WebUI link if desired. For the ECOC demo, the branch-only root `redeploy.sh` delegates to `src/tests/ecoc26-hyr-agentic-optical/redeploy-all.sh`. Run `./redeploy.sh --help` before the first reset. This convenience wrapper is not intended for the upstream merge. Offline deployment checks: ```bash python -m unittest discover -s deploy/tests -v ``` These repository-level checks require PyYAML and stay separate from component unit tests, whose container images do not contain deployment manifests. deploy/all.sh +22 −0 Changes for deploy/all.sh: 22 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -72,6 +72,14 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n # Uncomment to activate Pluggables Component #export TFS_COMPONENTS="${TFS_COMPONENTS} pluggables" # Uncomment to activate MCP Server. # Keep it near the end so it is deployed after optional components it can expose. #export TFS_COMPONENTS="${TFS_COMPONENTS} mcp_server" # Uncomment to activate Agentic Module. # Keep it after MCP Server so it can discover the local TFS MCP tool catalogue. #export TFS_COMPONENTS="${TFS_COMPONENTS} agentic" # If not already set, set the tag you want to use for your images. export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"} Loading @@ -88,6 +96,11 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} # If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used. export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} # ----- CockroachDB ------------------------------------------------------------ Loading Loading @@ -243,6 +256,9 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh source deploy/monitoring_dependencies.sh # Deploy CockroachDB ./deploy/crdb.sh Loading @@ -250,7 +266,11 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} ./deploy/nats.sh # Deploy QuestDB if uses_legacy_monitoring; then ./deploy/qdb.sh else echo "Skipping QuestDB: neither monitoring nor slice is selected." fi # Deploy Apache Kafka ./deploy/kafka.sh Loading @@ -259,7 +279,9 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} # ./deploy/monitoring.sh # Expose Dashboard if uses_legacy_monitoring; then ./deploy/expose_dashboard.sh fi # Deploy TeraFlowSDN ./deploy/tfs.sh Loading deploy/build-only.sh +7 −0 Changes for deploy/build-only.sh: 7 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -32,11 +32,18 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n # If not already set, set the tag you want to use for your images. export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} ######################################################################################################################## # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh # Create a tmp folder for files modified during the deployment TMP_LOGS_FOLDER="./tmp/build" mkdir -p $TMP_LOGS_FOLDER Loading deploy/component.sh +17 −0 Changes for deploy/component.sh: 17 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -36,10 +36,17 @@ export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""} # If not already set, set the neew Grafana admin password export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} ######################################################################################################################## # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh DOCKER_BUILD="docker build" DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3) if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then Loading @@ -63,6 +70,8 @@ TMP_FOLDER="./tmp" TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests" TMP_LOGS_FOLDER="$TMP_FOLDER/logs" bash scripts/dockerhub_k8s_secret.sh "$TFS_K8S_NAMESPACE" echo "Deploying component and collecting environment variables..." ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh Loading Loading @@ -152,6 +161,14 @@ for COMPONENT in $TFS_COMPONENTS; do echo " Deploying '$COMPONENT' component to Kubernetes..." DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log" if [ "$COMPONENT" == "agentic" ]; then kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic --ignore-not-found >> "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic-api --ignore-not-found >> "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic-web --ignore-not-found >> "$DEPLOY_LOG" fi kubectl --namespace $TFS_K8S_NAMESPACE delete -f "$MANIFEST" > "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG" COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/") Loading Loading
.gitlab-ci.yml +14 −4 Changes for .gitlab-ci.yml: 14 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -20,9 +20,15 @@ stages: - unit_test - end2end_test variables: CI_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}" TFS_REGISTRY_IMAGES: "${CI_REGISTRY_IMAGE}" TFS_IMAGE_TAG: "candidate-${CI_COMMIT_SHORT_SHA}" TFS_SKIP_BUILD: "YES" workflow: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)' when: always - when: never Loading @@ -31,6 +37,8 @@ include: #- local: '/manifests/.gitlab-ci.yml' - local: '/src/monitoring/.gitlab-ci.yml' - local: '/src/nbi/.gitlab-ci.yml' - local: '/src/mcp_server/.gitlab-ci.yml' - local: '/src/agentic/.gitlab-ci.yml' - local: '/src/context/.gitlab-ci.yml' - local: '/src/device/.gitlab-ci.yml' - local: '/src/service/.gitlab-ci.yml' Loading @@ -44,11 +52,11 @@ include: - local: '/src/policy/.gitlab-ci.yml' - local: '/src/automation/.gitlab-ci.yml' - local: '/src/forecaster/.gitlab-ci.yml' #- local: '/src/webui/.gitlab-ci.yml' - local: '/src/webui/.gitlab-ci.yml' #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml' #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml' #- local: '/src/l3_attackmitigator/.gitlab-ci.yml' - local: '/src/slice/.gitlab-ci.yml' #- local: '/src/slice/.gitlab-ci.yml' #- local: '/src/interdomain/.gitlab-ci.yml' - local: '/src/pathcomp/.gitlab-ci.yml' #- local: '/src/dlt/.gitlab-ci.yml' Loading @@ -57,7 +65,7 @@ include: - 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/telemetry/.gitlab-ci.yml' - local: '/src/analytics/.gitlab-ci.yml' - local: '/src/qos_profile/.gitlab-ci.yml' - local: '/src/vnt_manager/.gitlab-ci.yml' Loading @@ -66,6 +74,8 @@ include: - local: '/src/osm_client/.gitlab-ci.yml' - local: '/src/simap_connector/.gitlab-ci.yml' - local: '/src/pluggables/.gitlab-ci.yml' - local: '/src/logical_resources/.gitlab-ci.yml' - local: '/src/spine_leaf/.gitlab-ci.yml' # This should be last one: end-to-end integration tests - local: '/src/tests/.gitlab-ci.yml'
deploy/README.md 0 → 100644 +40 −0 Changes for deploy/README.md: 40 added lines, 0 removed lines. Original line number Diff line number Diff line # Optional Monitoring Infrastructure QuestDB and the bundled Grafana instance are deployed only when `TFS_COMPONENTS` includes the complete token `monitoring` or `slice`. Both are legacy components. Selecting only core, optical, MCP or Agentic components does not deploy this infrastructure. The fallback component list in `deploy/all.sh` still includes `slice` for compatibility; select an explicit component list without `slice` or `monitoring` for a lightweight deployment, as the ECOC demo specs do. `manifests/webuiservice.yaml` contains only the WebUI. `manifests/grafanaservice.yaml` contains a separate Grafana Deployment, Service, PVC and ingress at `/grafana/`. The deployment script enables the WebUI navigation link through `TFS_GRAFANA_ENABLED=YES` only in the legacy monitoring mode, and configures datasources through the Grafana Service. The `qdb-data` Secret and dashboard exposure/configuration are skipped when neither legacy consumer is selected. Shared Kubernetes observability installations are not automatically removed or disabled. Explicit calls to `deploy/qdb.sh` still deploy QuestDB for operators who need to manage that infrastructure separately. Existing QuestDB namespaces/storage and previously deployed Grafana resources are not pruned automatically. Back up any required data and clean up obsolete resources explicitly when migrating. Direct manifest users must apply the new Grafana manifest separately and enable its WebUI link if desired. For the ECOC demo, the branch-only root `redeploy.sh` delegates to `src/tests/ecoc26-hyr-agentic-optical/redeploy-all.sh`. Run `./redeploy.sh --help` before the first reset. This convenience wrapper is not intended for the upstream merge. Offline deployment checks: ```bash python -m unittest discover -s deploy/tests -v ``` These repository-level checks require PyYAML and stay separate from component unit tests, whose container images do not contain deployment manifests.
deploy/all.sh +22 −0 Changes for deploy/all.sh: 22 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -72,6 +72,14 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n # Uncomment to activate Pluggables Component #export TFS_COMPONENTS="${TFS_COMPONENTS} pluggables" # Uncomment to activate MCP Server. # Keep it near the end so it is deployed after optional components it can expose. #export TFS_COMPONENTS="${TFS_COMPONENTS} mcp_server" # Uncomment to activate Agentic Module. # Keep it after MCP Server so it can discover the local TFS MCP tool catalogue. #export TFS_COMPONENTS="${TFS_COMPONENTS} agentic" # If not already set, set the tag you want to use for your images. export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"} Loading @@ -88,6 +96,11 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} # If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used. export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} # ----- CockroachDB ------------------------------------------------------------ Loading Loading @@ -243,6 +256,9 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh source deploy/monitoring_dependencies.sh # Deploy CockroachDB ./deploy/crdb.sh Loading @@ -250,7 +266,11 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} ./deploy/nats.sh # Deploy QuestDB if uses_legacy_monitoring; then ./deploy/qdb.sh else echo "Skipping QuestDB: neither monitoring nor slice is selected." fi # Deploy Apache Kafka ./deploy/kafka.sh Loading @@ -259,7 +279,9 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} # ./deploy/monitoring.sh # Expose Dashboard if uses_legacy_monitoring; then ./deploy/expose_dashboard.sh fi # Deploy TeraFlowSDN ./deploy/tfs.sh Loading
deploy/build-only.sh +7 −0 Changes for deploy/build-only.sh: 7 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -32,11 +32,18 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n # If not already set, set the tag you want to use for your images. export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} ######################################################################################################################## # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh # Create a tmp folder for files modified during the deployment TMP_LOGS_FOLDER="./tmp/build" mkdir -p $TMP_LOGS_FOLDER Loading
deploy/component.sh +17 −0 Changes for deploy/component.sh: 17 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -36,10 +36,17 @@ export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""} # If not already set, set the neew Grafana admin password export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"} # Optionally set Docker Hub credentials to avoid anonymous pull rate limits while building/pulling public images. # If either variable is empty, Docker Hub is used anonymously. export DOCKERHUB_USER_NAME=${DOCKERHUB_USER_NAME:-""} export DOCKERHUB_ACCESS_TOKEN=${DOCKERHUB_ACCESS_TOKEN:-""} ######################################################################################################################## # Automated steps start here ######################################################################################################################## bash scripts/dockerhub_login.sh DOCKER_BUILD="docker build" DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3) if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then Loading @@ -63,6 +70,8 @@ TMP_FOLDER="./tmp" TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests" TMP_LOGS_FOLDER="$TMP_FOLDER/logs" bash scripts/dockerhub_k8s_secret.sh "$TFS_K8S_NAMESPACE" echo "Deploying component and collecting environment variables..." ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh Loading Loading @@ -152,6 +161,14 @@ for COMPONENT in $TFS_COMPONENTS; do echo " Deploying '$COMPONENT' component to Kubernetes..." DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log" if [ "$COMPONENT" == "agentic" ]; then kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic --ignore-not-found >> "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic-api --ignore-not-found >> "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE delete ingress \ tfs-ingress-agentic-web --ignore-not-found >> "$DEPLOY_LOG" fi kubectl --namespace $TFS_K8S_NAMESPACE delete -f "$MANIFEST" > "$DEPLOY_LOG" kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG" COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/") Loading