From 0314ba7753be6ef18b7d088478d6acc3b4331d10 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 22 Dec 2023 15:33:38 +0000
Subject: [PATCH] E2E Orchestrator:
- Remove unneeded files
---
src/tests/e2e_orchestrator/__init__.py | 14 -
src/tests/e2e_orchestrator/deploy_specs.sh | 154 -----------
.../descriptors_emulated.json | 250 ------------------
src/tests/e2e_orchestrator/redeploy.sh | 18 --
.../e2e_orchestrator/run_test_01_bootstrap.sh | 17 --
.../run_test_02_compute_path.sh | 17 --
.../e2e_orchestrator/run_test_03_cleanup.sh | 17 --
src/tests/e2e_orchestrator/run_tests.sh | 20 --
src/tests/e2e_orchestrator/tests/Fixtures.py | 13 -
src/tests/e2e_orchestrator/tests/Objects.py | 60 -----
src/tests/e2e_orchestrator/tests/__init__.py | 14 -
.../tests/test_functional_bootstrap.py | 71 -----
.../tests/test_functional_cleanup.py | 44 ---
.../tests/test_functional_compute_path.py | 61 -----
14 files changed, 770 deletions(-)
delete mode 100644 src/tests/e2e_orchestrator/__init__.py
delete mode 100755 src/tests/e2e_orchestrator/deploy_specs.sh
delete mode 100644 src/tests/e2e_orchestrator/descriptors_emulated.json
delete mode 100755 src/tests/e2e_orchestrator/redeploy.sh
delete mode 100755 src/tests/e2e_orchestrator/run_test_01_bootstrap.sh
delete mode 100755 src/tests/e2e_orchestrator/run_test_02_compute_path.sh
delete mode 100755 src/tests/e2e_orchestrator/run_test_03_cleanup.sh
delete mode 100755 src/tests/e2e_orchestrator/run_tests.sh
delete mode 100644 src/tests/e2e_orchestrator/tests/Fixtures.py
delete mode 100644 src/tests/e2e_orchestrator/tests/Objects.py
delete mode 100644 src/tests/e2e_orchestrator/tests/__init__.py
delete mode 100644 src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py
delete mode 100644 src/tests/e2e_orchestrator/tests/test_functional_cleanup.py
delete mode 100644 src/tests/e2e_orchestrator/tests/test_functional_compute_path.py
diff --git a/src/tests/e2e_orchestrator/__init__.py b/src/tests/e2e_orchestrator/__init__.py
deleted file mode 100644
index 1549d9811..000000000
--- a/src/tests/e2e_orchestrator/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
diff --git a/src/tests/e2e_orchestrator/deploy_specs.sh b/src/tests/e2e_orchestrator/deploy_specs.sh
deleted file mode 100755
index e93841917..000000000
--- a/src/tests/e2e_orchestrator/deploy_specs.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-
-# ----- TeraFlowSDN ------------------------------------------------------------
-
-# Set the URL of the internal MicroK8s Docker registry where the images will be uploaded to.
-export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
-
-# Set the list of components, separated by spaces, you want to build images for, and deploy.
-#export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
-export TFS_COMPONENTS="context device pathcomp service slice nbi webui"
-
-# Uncomment to activate Monitoring
-# export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
-
-# Uncomment to activate ZTP and Policy Manager
-#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp policy"
-# export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
-
-# Uncomment to activate Optical CyberSecurity
-#export TFS_COMPONENTS="${TFS_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector opticalattackmanager"
-
-# Uncomment to activate L3 CyberSecurity
-#export TFS_COMPONENTS="${TFS_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector"
-
-# Uncomment to activate TE
-#export TFS_COMPONENTS="${TFS_COMPONENTS} te"
-
-# Uncomment to activate E2E_Orchestrator
-export TFS_COMPONENTS="${TFS_COMPONENTS} e2eorchestrator"
-
-
-
-# Set the tag you want to use for your images.
-export TFS_IMAGE_TAG="dev"
-
-# Set the name of the Kubernetes namespace to deploy TFS to.
-export TFS_K8S_NAMESPACE="tfs"
-
-# Set additional manifest files to be applied after the deployment
-export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml"
-
-# Uncomment to monitor performance of components
-export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
-
-# Uncomment when deploying Optical CyberSecurity
-#export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/cachingservice.yaml"
-
-# Set the new Grafana admin password
-export TFS_GRAFANA_PASSWORD="admin123+"
-
-# Disable skip-build flag to rebuild the Docker images.
-export TFS_SKIP_BUILD=""
-
-
-# ----- CockroachDB ------------------------------------------------------------
-
-# Set the namespace where CockroackDB will be deployed.
-export CRDB_NAMESPACE="crdb"
-
-# Set the external port CockroackDB Postgre SQL interface will be exposed to.
-export CRDB_EXT_PORT_SQL="26257"
-
-# Set the external port CockroackDB HTTP Mgmt GUI interface will be exposed to.
-export CRDB_EXT_PORT_HTTP="8081"
-
-# Set the database username to be used by Context.
-export CRDB_USERNAME="tfs"
-
-# Set the database user's password to be used by Context.
-export CRDB_PASSWORD="tfs123"
-
-# Set the database name to be used by Context.
-export CRDB_DATABASE="tfs"
-
-# Set CockroachDB installation mode to 'single'. This option is convenient for development and testing.
-# See ./deploy/all.sh or ./deploy/crdb.sh for additional details
-export CRDB_DEPLOY_MODE="single"
-
-# Disable flag for dropping database, if it exists.
-export CRDB_DROP_DATABASE_IF_EXISTS="YES"
-
-# Disable flag for re-deploying CockroachDB from scratch.
-export CRDB_REDEPLOY=""
-
-
-# ----- NATS -------------------------------------------------------------------
-
-# Set the namespace where NATS will be deployed.
-export NATS_NAMESPACE="nats"
-
-# Set the external port NATS Client interface will be exposed to.
-export NATS_EXT_PORT_CLIENT="4222"
-
-# Set the external port NATS HTTP Mgmt GUI interface will be exposed to.
-export NATS_EXT_PORT_HTTP="8222"
-
-# Disable flag for re-deploying NATS from scratch.
-export NATS_REDEPLOY=""
-
-
-# ----- QuestDB ----------------------------------------------------------------
-
-# Set the namespace where QuestDB will be deployed.
-export QDB_NAMESPACE="qdb"
-
-# Set the external port QuestDB Postgre SQL interface will be exposed to.
-export QDB_EXT_PORT_SQL="8812"
-
-# Set the external port QuestDB Influx Line Protocol interface will be exposed to.
-export QDB_EXT_PORT_ILP="9009"
-
-# Set the external port QuestDB HTTP Mgmt GUI interface will be exposed to.
-export QDB_EXT_PORT_HTTP="9000"
-
-# Set the database username to be used for QuestDB.
-export QDB_USERNAME="admin"
-
-# Set the database user's password to be used for QuestDB.
-export QDB_PASSWORD="quest"
-
-# Set the table name to be used by Monitoring for KPIs.
-export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
-
-# Set the table name to be used by Slice for plotting groups.
-export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"
-
-# Disable flag for dropping tables if they exist.
-export QDB_DROP_TABLES_IF_EXIST="YES"
-
-# Disable flag for re-deploying QuestDB from scratch.
-export QDB_REDEPLOY=""
-
-
-# ----- K8s Observability ------------------------------------------------------
-
-# Set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.
-export PROM_EXT_PORT_HTTP="9090"
-
-# Set the external port Grafana HTTP Dashboards will be exposed to.
-export GRAF_EXT_PORT_HTTP="3000"
diff --git a/src/tests/e2e_orchestrator/descriptors_emulated.json b/src/tests/e2e_orchestrator/descriptors_emulated.json
deleted file mode 100644
index a2918ace9..000000000
--- a/src/tests/e2e_orchestrator/descriptors_emulated.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "contexts": [
- {
- "context_id": {"context_uuid": {"uuid": "admin"}},
- "topology_ids": [], "service_ids": []
- }
- ],
- "topologies": [
- {
- "topology_id": {
- "context_id": {"context_uuid": {"uuid": "admin"}},
- "topology_uuid": {"uuid": "admin"}
- },
- "device_ids": [
- {"device_uuid": {"uuid": "R1"}},
- {"device_uuid": {"uuid": "R2"}},
- {"device_uuid": {"uuid": "T1"}},
- {"device_uuid": {"uuid": "T2"}},
- {"device_uuid": {"uuid": "M1"}},
- {"device_uuid": {"uuid": "M2"}}
- ],
- "link_ids": [
- {"link_uuid": {"uuid": "R1==T1"}},
- {"link_uuid": {"uuid": "T1==R1"}},
- {"link_uuid": {"uuid": "R2==T2"}},
- {"link_uuid": {"uuid": "T2==R2"}},
-
- {"link_uuid": {"uuid": "T1==M1"}},
- {"link_uuid": {"uuid": "M1==T1"}},
- {"link_uuid": {"uuid": "T2==M2"}},
- {"link_uuid": {"uuid": "M2==T2"}},
-
- {"link_uuid": {"uuid": "M1==M2"}},
- {"link_uuid": {"uuid": "M2==M1"}}
-
-
- ]
- }
- ],
- "devices": [
- {
- "device_id": {"device_uuid": {"uuid": "R1"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "R2"}}, "device_type": "emu-packet-router", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "T1"}}, "device_type": "emu-optical-transponder", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- },
- {
- "device_id": {"device_uuid": {"uuid": "T2"}}, "device_type": "emu-optical-transponder", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- },
-
- {
- "device_id": {"device_uuid": {"uuid": "M1"}}, "device_type": "emu-optical-roadm", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- },
-
-
- {
- "device_id": {"device_uuid": {"uuid": "M2"}}, "device_type": "emu-optical-roadm", "device_drivers": [0],
- "device_endpoints": [], "device_operational_status": 1, "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
- {"sample_types": [], "type": "copper", "uuid": "1/1"},
- {"sample_types": [], "type": "copper", "uuid": "1/2"},
- {"sample_types": [], "type": "copper", "uuid": "1/3"},
- {"sample_types": [], "type": "copper", "uuid": "1/4"},
- {"sample_types": [], "type": "copper", "uuid": "2/1"},
- {"sample_types": [], "type": "copper", "uuid": "2/2"},
- {"sample_types": [], "type": "copper", "uuid": "2/3"},
- {"sample_types": [], "type": "copper", "uuid": "2/4"},
- {"sample_types": [], "type": "copper", "uuid": "3/1"},
- {"sample_types": [], "type": "copper", "uuid": "3/2"},
- {"sample_types": [], "type": "copper", "uuid": "3/3"},
- {"sample_types": [], "type": "copper", "uuid": "3/4"}
- ]}}}
- ]}
- }
-
-
- ],
- "links": [
- {
- "link_id": {"link_uuid": {"uuid": "R1==T1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R1"}}, "endpoint_uuid": {"uuid": "1/1"}},
- {"device_id": {"device_uuid": {"uuid": "T1"}}, "endpoint_uuid": {"uuid": "1/1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "T1==R1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "T1"}}, "endpoint_uuid": {"uuid": "1/1"}},
- {"device_id": {"device_uuid": {"uuid": "R1"}}, "endpoint_uuid": {"uuid": "1/1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R2==T2"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R2"}}, "endpoint_uuid": {"uuid": "1/2"}},
- {"device_id": {"device_uuid": {"uuid": "T2"}}, "endpoint_uuid": {"uuid": "1/2"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "T2==R2"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "T2"}}, "endpoint_uuid": {"uuid": "1/2"}},
- {"device_id": {"device_uuid": {"uuid": "R2"}}, "endpoint_uuid": {"uuid": "1/2"}}
- ]
- },
-
-
- {
- "link_id": {"link_uuid": {"uuid": "T1==M1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "T1"}}, "endpoint_uuid": {"uuid": "2/1"}},
- {"device_id": {"device_uuid": {"uuid": "M1"}}, "endpoint_uuid": {"uuid": "2/1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "M1==T1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "M1"}}, "endpoint_uuid": {"uuid": "2/1"}},
- {"device_id": {"device_uuid": {"uuid": "T1"}}, "endpoint_uuid": {"uuid": "2/1"}}
- ]
- },
-
- {
- "link_id": {"link_uuid": {"uuid": "T2==M2"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "T2"}}, "endpoint_uuid": {"uuid": "2/2"}},
- {"device_id": {"device_uuid": {"uuid": "M2"}}, "endpoint_uuid": {"uuid": "2/2"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "M2==T2"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "M2"}}, "endpoint_uuid": {"uuid": "2/2"}},
- {"device_id": {"device_uuid": {"uuid": "T2"}}, "endpoint_uuid": {"uuid": "2/2"}}
- ]
- },
-
- {
- "link_id": {"link_uuid": {"uuid": "M1==M2"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "M1"}}, "endpoint_uuid": {"uuid": "3/1"}},
- {"device_id": {"device_uuid": {"uuid": "M2"}}, "endpoint_uuid": {"uuid": "3/1"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "M2==M1"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "M2"}}, "endpoint_uuid": {"uuid": "3/1"}},
- {"device_id": {"device_uuid": {"uuid": "M1"}}, "endpoint_uuid": {"uuid": "3/1"}}
- ]
- }
-
- ]
-}
\ No newline at end of file
diff --git a/src/tests/e2e_orchestrator/redeploy.sh b/src/tests/e2e_orchestrator/redeploy.sh
deleted file mode 100755
index 5e8519926..000000000
--- a/src/tests/e2e_orchestrator/redeploy.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-source e2e_orchestrator/deploy_specs.sh
-./deploy/all.sh
-source tfs_runtime_env_vars.sh
diff --git a/src/tests/e2e_orchestrator/run_test_01_bootstrap.sh b/src/tests/e2e_orchestrator/run_test_01_bootstrap.sh
deleted file mode 100755
index 78c76def8..000000000
--- a/src/tests/e2e_orchestrator/run_test_01_bootstrap.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-source tfs_runtime_env_vars.sh
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py
diff --git a/src/tests/e2e_orchestrator/run_test_02_compute_path.sh b/src/tests/e2e_orchestrator/run_test_02_compute_path.sh
deleted file mode 100755
index 83191464a..000000000
--- a/src/tests/e2e_orchestrator/run_test_02_compute_path.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-source tfs_runtime_env_vars.sh
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_compute_path.py
diff --git a/src/tests/e2e_orchestrator/run_test_03_cleanup.sh b/src/tests/e2e_orchestrator/run_test_03_cleanup.sh
deleted file mode 100755
index f3ab6c68d..000000000
--- a/src/tests/e2e_orchestrator/run_test_03_cleanup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-source tfs_runtime_env_vars.sh
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_cleanup.py
diff --git a/src/tests/e2e_orchestrator/run_tests.sh b/src/tests/e2e_orchestrator/run_tests.sh
deleted file mode 100755
index 2c177259a..000000000
--- a/src/tests/e2e_orchestrator/run_tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-# Run functional tests
-source tfs_runtime_env_vars.sh
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_compute_path.py
-pytest --verbose --log-level=INFO src/tests/e2e_orchestrator/tests/test_functional_cleanup.py
diff --git a/src/tests/e2e_orchestrator/tests/Fixtures.py b/src/tests/e2e_orchestrator/tests/Fixtures.py
deleted file mode 100644
index 38d04994f..000000000
--- a/src/tests/e2e_orchestrator/tests/Fixtures.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
diff --git a/src/tests/e2e_orchestrator/tests/Objects.py b/src/tests/e2e_orchestrator/tests/Objects.py
deleted file mode 100644
index 1748efec9..000000000
--- a/src/tests/e2e_orchestrator/tests/Objects.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-import os
-from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.tools.object_factory.Context import json_context, json_context_id
-from common.tools.object_factory.Device import (
- json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
- json_device_connect_rules, json_device_id, json_device_p4_disabled,
- json_device_emulated_tapi_disabled, json_device_id, json_device_packetrouter_disabled, json_device_tapi_disabled)
-from common.tools.object_factory.Service import (
- get_service_uuid, json_service_l3nm_planned,json_service_p4_planned)
-from common.tools.object_factory.ConfigRule import (
- json_config_rule_set, json_config_rule_delete)
-from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_ids, json_endpoints, json_endpoint_id
-from common.tools.object_factory.EndPoint import json_endpoint_descriptor
-
-
-
-DEVICE_R1_UUID = 'R1'
-DEVICE_R2_UUID = 'R2'
-
-DEVICE_R1_ID = json_device_id(DEVICE_R1_UUID)
-DEVICE_R1_ENDPOINT_DEFS = [json_endpoint_descriptor('2/2', 'port')]
-DEVICE_R2_ID = json_device_id(DEVICE_R2_UUID)
-DEVICE_R2_ENDPOINT_DEFS = [json_endpoint_descriptor('2/2', 'port')]
-
-DEVICE_R1_ENDPOINTS = json_endpoints(DEVICE_R1_ID, DEVICE_R1_ENDPOINT_DEFS)
-DEVICE_R2_ENDPOINTS = json_endpoints(DEVICE_R2_ID, DEVICE_R2_ENDPOINT_DEFS)
-
-
-DEVICE_R1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_R1_ID, DEVICE_R1_ENDPOINT_DEFS)
-ENDPOINT_ID_R1 = DEVICE_R1_ENDPOINTS[0]['endpoint_id']
-DEVICE_R2_ENDPOINT_IDS = json_endpoint_ids(DEVICE_R2_ID, DEVICE_R2_ENDPOINT_DEFS)
-ENDPOINT_ID_R2 = DEVICE_R2_ENDPOINTS[0]['endpoint_id']
-
-
-# ----- Service ----------------------------------------------------------------------------------------------------------
-
-
-SERVICE_R1_R2_UUID = get_service_uuid(ENDPOINT_ID_R1, ENDPOINT_ID_R2)
-SERVICE_R1_R2 = json_service_p4_planned(SERVICE_R1_R2_UUID)
-SERVICE_R1_R2_ENDPOINT_IDS = [DEVICE_R1_ENDPOINT_IDS[0], DEVICE_R2_ENDPOINT_IDS[0]]
-
-
-SERVICES = [
- (SERVICE_R1_R2, SERVICE_R1_R2_ENDPOINT_IDS)
-]
diff --git a/src/tests/e2e_orchestrator/tests/__init__.py b/src/tests/e2e_orchestrator/tests/__init__.py
deleted file mode 100644
index 1549d9811..000000000
--- a/src/tests/e2e_orchestrator/tests/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
diff --git a/src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py b/src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py
deleted file mode 100644
index 905b93838..000000000
--- a/src/tests/e2e_orchestrator/tests/test_functional_bootstrap.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-import logging, time
-from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, DeviceOperationalStatusEnum, Empty
-from common.proto.monitoring_pb2 import KpiDescriptorList
-from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results, validate_empty_scenario
-from common.tools.object_factory.Context import json_context_id
-from context.client.ContextClient import ContextClient
-from device.client.DeviceClient import DeviceClient
-from monitoring.client.MonitoringClient import MonitoringClient
-from tests.Fixtures import context_client, device_client, monitoring_client # pylint: disable=unused-import
-
-LOGGER = logging.getLogger(__name__)
-LOGGER.setLevel(logging.DEBUG)
-
-DESCRIPTOR_FILE = 'src/tests/e2e_orchestrator/descriptors_emulated.json'
-ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-
-def test_scenario_bootstrap(
- context_client : ContextClient, # pylint: disable=redefined-outer-name
- device_client : DeviceClient, # pylint: disable=redefined-outer-name
-) -> None:
- validate_empty_scenario(context_client)
-
- descriptor_loader = DescriptorLoader(
- descriptors_file=DESCRIPTOR_FILE, context_client=context_client, device_client=device_client)
- results = descriptor_loader.process()
- check_descriptor_load_results(results, descriptor_loader)
- descriptor_loader.validate()
-
- # Verify the scenario has no services/slices
- response = context_client.GetContext(ADMIN_CONTEXT_ID)
- assert len(response.service_ids) == 0
- assert len(response.slice_ids) == 0
-
-def test_scenario_devices_enabled(
- context_client : ContextClient, # pylint: disable=redefined-outer-name
-) -> None:
- """
- This test validates that the devices are enabled.
- """
- DEVICE_OP_STATUS_ENABLED = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED
-
- num_devices = -1
- num_devices_enabled, num_retry = 0, 0
- while (num_devices != num_devices_enabled) and (num_retry < 1):
- time.sleep(1.0)
- response = context_client.ListDevices(Empty())
- num_devices = len(response.devices)
- num_devices_enabled = 0
- for device in response.devices:
- if device.device_operational_status != DEVICE_OP_STATUS_ENABLED: continue
- num_devices_enabled += 1
- LOGGER.info('Num Devices enabled: {:d}/{:d}'.format(num_devices_enabled, num_devices))
- num_retry += 1
- assert num_devices_enabled == num_devices
-
-
diff --git a/src/tests/e2e_orchestrator/tests/test_functional_cleanup.py b/src/tests/e2e_orchestrator/tests/test_functional_cleanup.py
deleted file mode 100644
index e661e177c..000000000
--- a/src/tests/e2e_orchestrator/tests/test_functional_cleanup.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-import logging
-from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId
-from common.tools.descriptor.Loader import DescriptorLoader, validate_empty_scenario
-from common.tools.object_factory.Context import json_context_id
-from context.client.ContextClient import ContextClient
-from device.client.DeviceClient import DeviceClient
-from tests.Fixtures import context_client, device_client # pylint: disable=unused-import
-
-LOGGER = logging.getLogger(__name__)
-LOGGER.setLevel(logging.DEBUG)
-
-DESCRIPTOR_FILE = 'src/tests/e2e_orchestrator/descriptors_emulated.json'
-ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-
-def test_scenario_cleanup(
- context_client : ContextClient, # pylint: disable=redefined-outer-name
- device_client : DeviceClient, # pylint: disable=redefined-outer-name
-) -> None:
- # Verify the scenario has no services/slices
- response = context_client.GetContext(ADMIN_CONTEXT_ID)
- assert len(response.service_ids) == 0
- assert len(response.slice_ids) == 0
-
- # Load descriptors and validate the base scenario
- descriptor_loader = DescriptorLoader(
- descriptors_file=DESCRIPTOR_FILE, context_client=context_client, device_client=device_client)
- descriptor_loader.validate()
- descriptor_loader.unload()
- validate_empty_scenario(context_client)
diff --git a/src/tests/e2e_orchestrator/tests/test_functional_compute_path.py b/src/tests/e2e_orchestrator/tests/test_functional_compute_path.py
deleted file mode 100644
index cbbf71038..000000000
--- a/src/tests/e2e_orchestrator/tests/test_functional_compute_path.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
-
-import logging, random
-from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum, Service
-from common.proto.e2eorchestrator_pb2 import E2EOrchestratorRequest
-from common.proto.kpi_sample_types_pb2 import KpiSampleType
-from common.tools.descriptor.Loader import DescriptorLoader
-from common.tools.grpc.Tools import grpc_message_to_json_string
-from common.tools.object_factory.Context import json_context_id
-from context.client.ContextClient import ContextClient
-from service.client.ServiceClient import ServiceClient
-from tests.Fixtures import service_client, context_client, e2eorchestrator_client # pylint: disable=unused-import
-from e2e_orchestrator.client.E2EOrchestratorClient import E2EOrchestratorClient
-from .Objects import SERVICES
-import copy
-
-LOGGER = logging.getLogger(__name__)
-LOGGER.setLevel(logging.DEBUG)
-
-DESCRIPTOR_FILE = 'src/tests/e2e_orchestrator/descriptors_emulated.json'
-ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-
-
-def test_orchestration(service_client : ServiceClient, context_client : ContextClient, e2eorchestrator_client : E2EOrchestratorClient): # pylint: disable=redefined-outer-name
- # Load descriptors and validate the base scenario
- descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
- descriptor_loader.validate()
-
- # Verify the scenario has no services/slices
- response = context_client.GetContext(ADMIN_CONTEXT_ID)
- assert len(response.service_ids) == 0
- assert len(response.slice_ids) == 0
-
-
-
- # ----- Compute E2E path ---------------------------------------------------------------
- for service, endpoints in SERVICES:
- service_uuid = service['service_id']['service_uuid']['uuid']
- print('Creating Service {:s}'.format(service_uuid))
- service_p4 = copy.deepcopy(service)
- service_p4['service_endpoint_ids'].extend(endpoints)
-
- request = E2EOrchestratorRequest()
- request.service.MergeFrom(Service(**service_p4))
- reply = e2eorchestrator_client.Compute(request)
- LOGGER.info(reply)
- assert len(reply.connections) == 6
-
--
GitLab