diff --git a/deploy/all.sh b/deploy/all.sh
index a99607f5b907c2bd1e1b4b889bef881874a63967..09239afed7ba036b214742e636017a58c072f6b3 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -25,14 +25,14 @@
# By default, assume internal MicroK8s registry is used.
export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
-# If not already set, set the list of components you want to build images for, and deploy.
+# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.
# By default, only basic components are deployed
-export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device monitoring service compute webui"}
+export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation monitoring pathcomp service slice compute webui load_generator"}
# If not already set, set the tag you want to use for your images.
export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
-# If not already set, set the name of the Kubernetes namespace to deploy to.
+# If not already set, set the name of the Kubernetes namespace to deploy TFS to.
export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
# If not already set, set additional manifest files to be applied after the deployment
@@ -41,7 +41,7 @@ export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}
# If not already set, set the new Grafana admin password
export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}
-# If not already set, disable skip-build flag.
+# If not already set, disable skip-build flag to rebuild the Docker images.
# 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:-""}
@@ -60,12 +60,6 @@ export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}
# If not already set, set the database name to be used by Context.
export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}
-# If not already set, set the name of the secret where CockroachDB data and credentials will be stored.
-export CRDB_SECRET_NAME=${CRDB_SECRET_NAME:-"crdb-data"}
-
-# If not already set, set the namespace where the secret containing CockroachDB data and credentials will be stored.
-export CRDB_SECRET_NAMESPACE=${CRDB_SECRET_NAMESPACE:-${TFS_K8S_NAMESPACE}}
-
# If not already set, set CockroachDB installation mode. Accepted values are: 'single' and 'cluster'.
# "YES", the database pointed by variable CRDB_NAMESPACE will be dropped while
# checking/deploying CockroachDB.
@@ -78,7 +72,7 @@ export CRDB_SECRET_NAMESPACE=${CRDB_SECRET_NAMESPACE:-${TFS_K8S_NAMESPACE}}
# Ref: https://www.cockroachlabs.com/docs/stable/recommended-production-settings.html
export CRDB_DEPLOY_MODE=${CRDB_DEPLOY_MODE:-"single"}
-# If not already set, disable flag for dropping database if exists.
+# If not already set, disable flag for dropping database, if it exists.
# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE DATABASE INFORMATION!
# If CRDB_DROP_DATABASE_IF_EXISTS is "YES", the database pointed by variable CRDB_NAMESPACE will be dropped while
# checking/deploying CockroachDB.
@@ -96,12 +90,6 @@ export CRDB_REDEPLOY=${CRDB_REDEPLOY:-""}
# If not already set, set the namespace where NATS will be deployed.
export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}
-# If not already set, set the name of the secret where NATS data and credentials will be stored.
-export NATS_SECRET_NAME=${NATS_SECRET_NAME:-"nats-data"}
-
-# If not already set, set the namespace where the secret containing NATS data and credentials will be stored.
-export NATS_SECRET_NAMESPACE=${NATS_SECRET_NAMESPACE:-${TFS_K8S_NAMESPACE}}
-
# If not already set, disable flag for re-deploying NATS from scratch.
# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE MESSAGE BROKER INFORMATION!
# If NATS_REDEPLOY is "YES", the message broker will be dropped while checking/deploying NATS.
@@ -113,20 +101,20 @@ export NATS_REDEPLOY=${NATS_REDEPLOY:-""}
# If not already set, set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE=${QDB_NAMESPACE:-"qdb"}
-# If not already set, set the database username to be used by Monitoring.
+# If not already set, set the database username to be used for QuestDB.
export QDB_USERNAME=${QDB_USERNAME:-"admin"}
-# If not already set, set the database user's password to be used by Monitoring.
+# If not already set, set the database user's password to be used for QuestDB.
export QDB_PASSWORD=${QDB_PASSWORD:-"quest"}
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE=${QDB_TABLE:-"tfs_monitoring"}
+# If not already set, set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS:-"tfs_monitoring_kpis"}
-## If not already set, disable flag for dropping table if exists.
-## WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE TABLE INFORMATION!
-## If QDB_DROP_TABLE_IF_EXISTS is "YES", the table pointed by variable QDB_TABLE will be dropped while
-## checking/deploying QuestDB.
-#export QDB_DROP_TABLE_IF_EXISTS=${QDB_DROP_TABLE_IF_EXISTS:-""}
+# If not already set, disable flag for dropping tables if they exist.
+# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE TABLE INFORMATION!
+# If QDB_DROP_TABLES_IF_EXIST is "YES", the table pointed by variable
+# QDB_TABLE_MONITORING_KPIS will be dropped while checking/deploying QuestDB.
+export QDB_DROP_TABLES_IF_EXIST=${QDB_DROP_TABLES_IF_EXIST:-""}
# If not already set, disable flag for re-deploying QuestDB from scratch.
# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE DATABASE INFORMATION!
diff --git a/deploy/crdb.sh b/deploy/crdb.sh
index 98d011f190196b803be27200b8bc348b30c87055..4e8cfe2c399fb0e943c90e5c585f93f0707ca835 100755
--- a/deploy/crdb.sh
+++ b/deploy/crdb.sh
@@ -66,9 +66,6 @@ CRDB_MANIFESTS_PATH="manifests/cockroachdb"
# Create a tmp folder for files modified during the deployment
TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"
mkdir -p $TMP_MANIFESTS_FOLDER
-TMP_LOGS_FOLDER="$TMP_FOLDER/logs"
-mkdir -p $TMP_LOGS_FOLDER
-CRDB_LOG_FILE="$TMP_LOGS_FOLDER/crdb_deploy.log"
function crdb_deploy_single() {
echo "CockroachDB Namespace"
diff --git a/deploy/nats.sh b/deploy/nats.sh
index 115a185302236b80db385212cd772100392329af..9edbc7765a09135d62a6021c5f2b0669e36a69a4 100755
--- a/deploy/nats.sh
+++ b/deploy/nats.sh
@@ -31,14 +31,6 @@ export NATS_REDEPLOY=${NATS_REDEPLOY:-""}
# Automated steps start here
########################################################################################################################
-# Constants
-TMP_FOLDER="./tmp"
-NATS_MANIFESTS_PATH="manifests/nats"
-
-# Create a tmp folder for files modified during the deployment
-TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"
-mkdir -p $TMP_MANIFESTS_FOLDER
-
function nats_deploy_single() {
echo "NATS Namespace"
echo ">>> Create NATS Namespace (if missing)"
diff --git a/deploy/qdb.sh b/deploy/qdb.sh
index d9a4de353b3309ef0a8a34310089e9bff31589fa..a654088049df871fac0f4d19c225b2246f464f8e 100755
--- a/deploy/qdb.sh
+++ b/deploy/qdb.sh
@@ -21,20 +21,20 @@
# If not already set, set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE=${QDB_NAMESPACE:-"qdb"}
-# If not already set, set the database username to be used by Monitoring.
+# If not already set, set the database username to be used for QuestDB.
export QDB_USERNAME=${QDB_USERNAME:-"admin"}
-# If not already set, set the database user's password to be used by Monitoring.
+# If not already set, set the database user's password to be used for QuestDB.
export QDB_PASSWORD=${QDB_PASSWORD:-"quest"}
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE=${QDB_TABLE:-"tfs_monitoring"}
+# If not already set, set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS:-"tfs_monitoring_kpis"}
-## If not already set, disable flag for dropping table if exists.
-## WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE TABLE INFORMATION!
-## If QDB_DROP_TABLE_IF_EXISTS is "YES", the table pointed by variable QDB_TABLE will be dropped while
-## checking/deploying QuestDB.
-#export QDB_DROP_TABLE_IF_EXISTS=${QDB_DROP_TABLE_IF_EXISTS:-""}
+# If not already set, disable flag for dropping tables if they exist.
+# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE TABLE INFORMATION!
+# If QDB_DROP_TABLES_IF_EXIST is "YES", the table pointed by variable
+# QDB_TABLE_MONITORING_KPIS will be dropped while checking/deploying QuestDB.
+export QDB_DROP_TABLES_IF_EXIST=${QDB_DROP_TABLES_IF_EXIST:-""}
# If not already set, disable flag for re-deploying QuestDB from scratch.
# WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE DATABASE INFORMATION!
@@ -52,9 +52,6 @@ QDB_MANIFESTS_PATH="manifests/questdb"
# Create a tmp folder for files modified during the deployment
TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"
-TMP_LOGS_FOLDER="$TMP_FOLDER/logs"
-QDB_LOG_FILE="$TMP_LOGS_FOLDER/qdb_deploy.log"
-mkdir -p $TMP_LOGS_FOLDER
function qdb_deploy() {
echo "QuestDB Namespace"
@@ -147,19 +144,18 @@ function qdb_undeploy() {
echo
}
-# TODO: implement method to drop table
-#function qdb_drop_table() {
-# echo "Drop table if exists"
-# QDB_CLIENT_URL="postgresql://${QDB_USERNAME}:${QDB_PASSWORD}@questdb-0:${QDB_SQL_PORT}/defaultdb?sslmode=require"
-# kubectl exec -it --namespace ${QDB_NAMESPACE} questdb-0 -- \
-# ./qdb sql --certs-dir=/qdb/qdb-certs --url=${QDB_CLIENT_URL} \
-# --execute "DROP TABLE IF EXISTS ${QDB_TABLE};"
-# echo
-#}
+function qdb_drop_tables() {
+ QDB_HOST=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.clusterIP}')
+ QDB_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')
+
+ echo "Drop tables, if exist"
+ curl "http://${QDB_HOST}:${QDB_PORT}/exec?fmt=json&query=DROP+TABLE+IF+EXISTS+${QDB_TABLE_MONITORING_KPIS}+;"
+ echo
+}
if [ "$QDB_REDEPLOY" == "YES" ]; then
qdb_undeploy
-#elif [ "$QDB_DROP_TABLE_IF_EXISTS" == "YES" ]; then
-# qdb_drop_table
+elif [ "$QDB_DROP_TABLES_IF_EXIST" == "YES" ]; then
+ qdb_drop_tables
fi
qdb_deploy
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index b9bcbab4d8084e30aae90be3cf669445d01c0dac..2bacc8cacb18c3cba10247472798dc0644aab2bf 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -18,18 +18,21 @@
# Read deployment settings
########################################################################################################################
+
+# ----- TeraFlowSDN ------------------------------------------------------------
+
# If not already set, set the URL of the Docker registry where the images will be uploaded to.
# By default, assume internal MicroK8s registry is used.
export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
-# If not already set, set the list of components you want to build images for, and deploy.
+# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.
# By default, only basic components are deployed
-export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device monitoring service compute webui"}
+export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device automation monitoring pathcomp service slice compute webui load_generator"}
# If not already set, set the tag you want to use for your images.
export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}
-# If not already set, set the name of the Kubernetes namespace to deploy to.
+# If not already set, set the name of the Kubernetes namespace to deploy TFS to.
export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
# If not already set, set additional manifest files to be applied after the deployment
@@ -38,10 +41,13 @@ export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}
# If not already set, set the new Grafana admin password
export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}
-# If not already set, disable skip-build flag.
+# If not already set, disable skip-build flag to rebuild the Docker images.
# 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:-""}
+
+# ----- CockroachDB ------------------------------------------------------------
+
# If not already set, set the namespace where CockroackDB will be deployed.
export CRDB_NAMESPACE=${CRDB_NAMESPACE:-"crdb"}
@@ -54,20 +60,26 @@ export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}
# If not already set, set the database name to be used by Context.
export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}
+
+# ----- NATS -------------------------------------------------------------------
+
# If not already set, set the namespace where NATS will be deployed.
export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}
+
+# ----- QuestDB ----------------------------------------------------------------
+
# If not already set, set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE=${QDB_NAMESPACE:-"qdb"}
-# If not already set, set the database username to be used by Monitoring.
+# If not already set, set the database username to be used for QuestDB.
export QDB_USERNAME=${QDB_USERNAME:-"admin"}
-# If not already set, set the database user's password to be used by Monitoring.
+# If not already set, set the database user's password to be used for QuestDB.
export QDB_PASSWORD=${QDB_PASSWORD:-"quest"}
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE=${QDB_TABLE:-"tfs_monitoring"}
+# If not already set, set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS:-"tfs_monitoring_kpis"}
########################################################################################################################
@@ -85,7 +97,7 @@ TMP_LOGS_FOLDER="$TMP_FOLDER/logs"
mkdir -p $TMP_LOGS_FOLDER
echo "Deleting and Creating a new namespace..."
-kubectl delete namespace $TFS_K8S_NAMESPACE
+kubectl delete namespace $TFS_K8S_NAMESPACE --ignore-not-found
kubectl create namespace $TFS_K8S_NAMESPACE
printf "\n"
@@ -118,7 +130,7 @@ kubectl create secret generic qdb-data --namespace ${TFS_K8S_NAMESPACE} --type='
--from-literal=METRICSDB_REST_PORT=${QDB_HTTP_PORT} \
--from-literal=METRICSDB_ILP_PORT=${QDB_ILP_PORT} \
--from-literal=METRICSDB_SQL_PORT=${QDB_SQL_PORT} \
- --from-literal=METRICSDB_TABLE=${QDB_TABLE} \
+ --from-literal=METRICSDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS} \
--from-literal=METRICSDB_USERNAME=${QDB_USERNAME} \
--from-literal=METRICSDB_PASSWORD=${QDB_PASSWORD}
printf "\n"
@@ -301,7 +313,8 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
# Configure Grafana Admin Password
# Ref: https://grafana.com/docs/grafana/latest/http_api/user/#change-password
GRAFANA_URL_DEFAULT="http://${GRAFANA_USERNAME}:${GRAFANA_PASSWORD}@${GRAFANA_URL}"
- echo "Connecting to grafana at URL: ${GRAFANA_URL_DEFAULT}..."
+
+ echo ">> Updating Grafana 'admin' password..."
curl -X PUT -H "Content-Type: application/json" -d '{
"oldPassword": "'${GRAFANA_PASSWORD}'",
"newPassword": "'${TFS_GRAFANA_PASSWORD}'",
@@ -314,15 +327,14 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
echo "export GRAFANA_URL_UPDATED=${GRAFANA_URL_UPDATED}" >> $ENV_VARS_SCRIPT
# Ref: https://grafana.com/docs/grafana/latest/http_api/data_source/
- # TODO: replace user, password and database by variables to be saved
QDB_HOST_PORT="${METRICSDB_HOSTNAME}:${QDB_SQL_PORT}"
- echo "Creating a datasource..."
+ echo ">> Creating datasources..."
curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{
"access" : "proxy",
"type" : "postgres",
- "name" : "questdb",
+ "name" : "questdb-mon-kpi",
"url" : "'${QDB_HOST_PORT}'",
- "database" : "'${QDB_TABLE}'",
+ "database" : "'${QDB_TABLE_MONITORING_KPIS}'",
"user" : "'${QDB_USERNAME}'",
"basicAuth": false,
"isDefault": true,
@@ -342,16 +354,17 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
}' ${GRAFANA_URL_UPDATED}/api/datasources
echo
- # Create Monitoring Dashboard
+ echo ">> Creating dashboards..."
# Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/
- curl -X POST -H "Content-Type: application/json" \
- -d '@src/webui/grafana_dashboard_psql.json' \
+ curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_mon_kpis_psql.json' \
${GRAFANA_URL_UPDATED}/api/dashboards/db
echo
- DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tf-l3-monit"
+ echo ">> Staring dashboards..."
+ DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-l3-monit"
DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id')
curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}
+ echo
printf "\n\n"
fi
diff --git a/hackfest/tfs-descriptors/old/service.json b/hackfest/tfs-descriptors/old/service.json
index a25d0171dbfdbf174a877151201752c76759514a..26804dcf133fa6c83be70a72374b0f19435d24d6 100644
--- a/hackfest/tfs-descriptors/old/service.json
+++ b/hackfest/tfs-descriptors/old/service.json
@@ -18,8 +18,8 @@
{"device_id":{"device_uuid":{"uuid":"R2"}},"endpoint_uuid":{"uuid":"1/3"}}
],
"service_constraints":[
- {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},
- {"custom": {"constraint_type": "latency[ms]", "constraint_value": "20.0"}}
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 20.0}}
],
"service_config":{"config_rules":[]}
}
diff --git a/hackfest/tfs-descriptors/service-l3vpn.json b/hackfest/tfs-descriptors/service-l3vpn.json
index 457ba1a509aebc5eaea8caa37a09ac62ef286f32..723453b8b3d43a56386e15dec6f70fc368bca517 100644
--- a/hackfest/tfs-descriptors/service-l3vpn.json
+++ b/hackfest/tfs-descriptors/service-l3vpn.json
@@ -12,8 +12,8 @@
{"device_id": {"device_uuid": {"uuid": "R3"}}, "endpoint_uuid": {"uuid": "1/2"}}
],
"service_constraints": [
- {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},
- {"custom": {"constraint_type": "latency[ms]", "constraint_value": "15.2"}}
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 15.2}}
],
"service_config": {"config_rules": [
{"action": 1, "custom": {"resource_key": "/settings", "resource_value": {
diff --git a/my_deploy.sh b/my_deploy.sh
index 6f0e64afe311b8e56446caabfac6329024c207a9..1efea75bb3fb008e4a54d42135436a7373fd926e 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -56,7 +56,7 @@ export CRDB_DATABASE="tfs"
# See ./deploy/all.sh or ./deploy/crdb.sh for additional details
export CRDB_DEPLOY_MODE="single"
-# Disable flag for dropping database, if exists.
+# Disable flag for dropping database, if it exists.
export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch.
@@ -74,20 +74,20 @@ export NATS_REDEPLOY=""
# ----- QuestDB ----------------------------------------------------------------
-# If not already set, set the namespace where QuestDB will be deployed.
+# Set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE="qdb"
-# If not already set, set the database username to be used by Monitoring.
+# Set the database username to be used for QuestDB.
export QDB_USERNAME="admin"
-# If not already set, set the database user's password to be used by Monitoring.
+# Set the database user's password to be used for QuestDB.
export QDB_PASSWORD="quest"
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE="tfs_monitoring"
+# Set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
-## If not already set, disable flag for dropping table if exists.
-#export QDB_DROP_TABLE_IF_EXISTS=""
+# Disable flag for dropping tables if they exist.
+export QDB_DROP_TABLES_IF_EXIST=""
-# If not already set, disable flag for re-deploying QuestDB from scratch.
+# Disable flag for re-deploying QuestDB from scratch.
export QDB_REDEPLOY=""
diff --git a/scripts/show_logs_load_generator.sh b/scripts/show_logs_load_generator.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d0f2527d74840d48a10e0ec7ba018f513eea2c52
--- /dev/null
+++ b/scripts/show_logs_load_generator.sh
@@ -0,0 +1,27 @@
+#!/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.
+
+########################################################################################################################
+# 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/load-generatorservice
diff --git a/src/common/tests/LoadScenario.py b/src/common/tests/LoadScenario.py
deleted file mode 100644
index 93cf3708cfc5f8a4296a5cb68772984beefd7563..0000000000000000000000000000000000000000
--- a/src/common/tests/LoadScenario.py
+++ /dev/null
@@ -1,50 +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.tools.descriptor.Loader import DescriptorLoader, compose_notifications
-from context.client.ContextClient import ContextClient
-from device.client.DeviceClient import DeviceClient
-from service.client.ServiceClient import ServiceClient
-from slice.client.SliceClient import SliceClient
-
-LOGGER = logging.getLogger(__name__)
-LOGGERS = {
- 'success': LOGGER.info,
- 'danger' : LOGGER.error,
- 'error' : LOGGER.error,
-}
-
-def load_scenario_from_descriptor(
- descriptor_file : str, context_client : ContextClient, device_client : DeviceClient,
- service_client : ServiceClient, slice_client : SliceClient
-) -> DescriptorLoader:
- with open(descriptor_file, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(
- descriptors,
- context_client=context_client, device_client=device_client,
- service_client=service_client, slice_client=slice_client)
- results = descriptor_loader.process()
-
- num_errors = 0
- for message,level in compose_notifications(results):
- LOGGERS.get(level)(message)
- if level != 'success': num_errors += 1
- if num_errors > 0:
- MSG = 'Failed to load descriptors in file {:s}'
- raise Exception(MSG.format(str(descriptor_file)))
-
- return descriptor_loader
\ No newline at end of file
diff --git a/src/common/tools/context_queries/Context.py b/src/common/tools/context_queries/Context.py
index d28ca3991fe7de0cdf9d069db413ff528ace4335..a627b9ba5828d31caca8332d7241d28e126895d3 100644
--- a/src/common/tools/context_queries/Context.py
+++ b/src/common/tools/context_queries/Context.py
@@ -12,7 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from common.proto.context_pb2 import Context, Empty
+import grpc
+from typing import Optional
+from common.proto.context_pb2 import Context, ContextId, Empty
from common.tools.object_factory.Context import json_context
from context.client.ContextClient import ContextClient
@@ -23,3 +25,17 @@ def create_context(
existing_context_uuids = {context_id.context_uuid.uuid for context_id in existing_context_ids.context_ids}
if context_uuid in existing_context_uuids: return
context_client.SetContext(Context(**json_context(context_uuid)))
+
+def get_context(context_client : ContextClient, context_uuid : str, rw_copy : bool = False) -> Optional[Context]:
+ try:
+ # pylint: disable=no-member
+ context_id = ContextId()
+ context_id.context_uuid.uuid = context_uuid
+ ro_context = context_client.GetContext(context_id)
+ if not rw_copy: return ro_context
+ rw_context = Context()
+ rw_context.CopyFrom(ro_context)
+ return rw_context
+ except grpc.RpcError:
+ #LOGGER.exception('Unable to get Context({:s})'.format(str(context_uuid)))
+ return None
diff --git a/src/common/tools/context_queries/InterDomain.py b/src/common/tools/context_queries/InterDomain.py
index 7317cc793f5dd46e6a9f741bf259635a5bd0462f..edb640708b17b6734fbde6d759db5a2cdea692ec 100644
--- a/src/common/tools/context_queries/InterDomain.py
+++ b/src/common/tools/context_queries/InterDomain.py
@@ -136,13 +136,11 @@ def compute_interdomain_path(
service_endpoint_id = pathcomp_req_svc.service_endpoint_ids.add()
service_endpoint_id.CopyFrom(endpoint_id)
- constraint_bw = pathcomp_req_svc.service_constraints.add()
- constraint_bw.custom.constraint_type = 'bandwidth[gbps]'
- constraint_bw.custom.constraint_value = '10.0'
+ constraint_sla_capacity = pathcomp_req_svc.service_constraints.add()
+ constraint_sla_capacity.sla_capacity.capacity_gbps = 10.0
- constraint_lat = pathcomp_req_svc.service_constraints.add()
- constraint_lat.custom.constraint_type = 'latency[ms]'
- constraint_lat.custom.constraint_value = '100.0'
+ constraint_sla_latency = pathcomp_req_svc.service_constraints.add()
+ constraint_sla_latency.sla_latency.e2e_latency_ms = 100.0
LOGGER.debug('pathcomp_req = {:s}'.format(grpc_message_to_json_string(pathcomp_req)))
pathcomp_rep = pathcomp_client.Compute(pathcomp_req)
diff --git a/src/common/tools/context_queries/Link.py b/src/common/tools/context_queries/Link.py
index 83a878bde85ddfe25bc345ed987670164bacf2c6..291cdcf375d942b72008daea5c2c5ff357a994ef 100644
--- a/src/common/tools/context_queries/Link.py
+++ b/src/common/tools/context_queries/Link.py
@@ -12,11 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from typing import List, Set
-from common.proto.context_pb2 import ContextId, Empty, Link, Topology, TopologyId
+import grpc
+from typing import List, Optional, Set
+from common.proto.context_pb2 import ContextId, Empty, Link, LinkId, Topology, TopologyId
from common.tools.object_factory.Topology import json_topology_id
from context.client.ContextClient import ContextClient
+def get_link(context_client : ContextClient, link_uuid : str, rw_copy : bool = False) -> Optional[Link]:
+ try:
+ # pylint: disable=no-member
+ link_id = LinkId()
+ link_id.link_uuid.uuid = link_uuid
+ ro_link = context_client.GetLink(link_id)
+ if not rw_copy: return ro_link
+ rw_link = Link()
+ rw_link.CopyFrom(ro_link)
+ return rw_link
+ except grpc.RpcError:
+ #LOGGER.exception('Unable to get Link({:s})'.format(str(link_uuid)))
+ return None
+
def get_existing_link_uuids(context_client : ContextClient) -> Set[str]:
existing_link_ids = context_client.ListLinkIds(Empty())
existing_link_uuids = {link_id.link_uuid.uuid for link_id in existing_link_ids.link_ids}
diff --git a/src/common/tools/descriptor/Loader.py b/src/common/tools/descriptor/Loader.py
index 5972d425be5298ec7fcb63bd28b50f3643363ae4..0e1d8c7371e87b47bfc47a4242e00039add48e7f 100644
--- a/src/common/tools/descriptor/Loader.py
+++ b/src/common/tools/descriptor/Loader.py
@@ -15,25 +15,30 @@
# SDN controller descriptor loader
# Usage example (WebUI):
-# descriptors = json.loads(descriptors_data_from_client)
+# descriptors = json.loads(
+# descriptors=descriptors_data_from_client, num_workers=10,
+# context_client=..., device_client=..., service_client=..., slice_client=...)
# descriptor_loader = DescriptorLoader(descriptors)
# results = descriptor_loader.process()
# for message,level in compose_notifications(results):
# flash(message, level)
# Usage example (pytest):
-# with open('path/to/descriptor.json', 'r', encoding='UTF-8') as f:
-# descriptors = json.loads(f.read())
# descriptor_loader = DescriptorLoader(
-# descriptors, context_client=..., device_client=..., service_client=..., slice_client=...)
+# descriptors_file='path/to/descriptor.json', num_workers=10,
+# context_client=..., device_client=..., service_client=..., slice_client=...)
# results = descriptor_loader.process()
-# loggers = {'success': LOGGER.info, 'danger': LOGGER.error, 'error': LOGGER.error}
-# for message,level in compose_notifications(results):
-# loggers.get(level)(message)
+# check_results(results, descriptor_loader)
+# descriptor_loader.validate()
+# # do test ...
+# descriptor_loader.unload()
import concurrent.futures, json, logging, operator
from typing import Any, Dict, List, Optional, Tuple, Union
-from common.proto.context_pb2 import Connection, Context, Device, Link, Service, Slice, Topology
+from common.proto.context_pb2 import (
+ Connection, Context, ContextId, Device, DeviceId, Empty, Link, LinkId, Service, ServiceId, Slice, SliceId,
+ Topology, TopologyId)
+from common.tools.object_factory.Context import json_context_id
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
@@ -44,6 +49,11 @@ from .Tools import (
get_descriptors_add_topologies, split_devices_by_rules)
LOGGER = logging.getLogger(__name__)
+LOGGERS = {
+ 'success': LOGGER.info,
+ 'danger' : LOGGER.error,
+ 'error' : LOGGER.error,
+}
ENTITY_TO_TEXT = {
# name => singular, plural
@@ -67,25 +77,26 @@ TypeResults = List[Tuple[str, str, int, List[str]]] # entity_name, action, num_o
TypeNotification = Tuple[str, str] # message, level
TypeNotificationList = List[TypeNotification]
-def compose_notifications(results : TypeResults) -> TypeNotificationList:
- notifications = []
- for entity_name, action_name, num_ok, error_list in results:
- entity_name_singluar,entity_name_plural = ENTITY_TO_TEXT[entity_name]
- action_infinitive, action_past = ACTION_TO_TEXT[action_name]
- num_err = len(error_list)
- for error in error_list:
- notifications.append((f'Unable to {action_infinitive} {entity_name_singluar} {error}', 'error'))
- if num_ok : notifications.append((f'{str(num_ok)} {entity_name_plural} {action_past}', 'success'))
- if num_err: notifications.append((f'{str(num_err)} {entity_name_plural} failed', 'danger'))
- return notifications
-
class DescriptorLoader:
def __init__(
- self, descriptors : Union[str, Dict], num_workers : int = 1,
+ self, descriptors : Optional[Union[str, Dict]] = None, descriptors_file : Optional[str] = None,
+ num_workers : int = 1,
context_client : Optional[ContextClient] = None, device_client : Optional[DeviceClient] = None,
service_client : Optional[ServiceClient] = None, slice_client : Optional[SliceClient] = None
) -> None:
- self.__descriptors = json.loads(descriptors) if isinstance(descriptors, str) else descriptors
+ if (descriptors is None) == (descriptors_file is None):
+ raise Exception('Exactly one of "descriptors" or "descriptors_file" is required')
+
+ if descriptors_file is not None:
+ with open(descriptors_file, 'r', encoding='UTF-8') as f:
+ self.__descriptors = json.loads(f.read())
+ self.__descriptor_file_path = descriptors_file
+ else: # descriptors is not None
+ self.__descriptors = json.loads(descriptors) if isinstance(descriptors, str) else descriptors
+ self.__descriptor_file_path = '<dict>'
+
+ self.__num_workers = num_workers
+
self.__dummy_mode = self.__descriptors.get('dummy_mode' , False)
self.__contexts = self.__descriptors.get('contexts' , [])
self.__topologies = self.__descriptors.get('topologies' , [])
@@ -95,8 +106,6 @@ class DescriptorLoader:
self.__slices = self.__descriptors.get('slices' , [])
self.__connections = self.__descriptors.get('connections', [])
- self.__num_workers = num_workers
-
self.__contexts_add = None
self.__topologies_add = None
self.__devices_add = None
@@ -111,6 +120,24 @@ class DescriptorLoader:
self.__results : TypeResults = list()
+ @property
+ def descriptor_file_path(self) -> Optional[str]: return self.__descriptor_file_path
+
+ @property
+ def num_workers(self) -> int: return self.__num_workers
+
+ @property
+ def context_client(self) -> Optional[ContextClient]: return self.__ctx_cli
+
+ @property
+ def device_client(self) -> Optional[DeviceClient]: return self.__dev_cli
+
+ @property
+ def service_client(self) -> Optional[ServiceClient]: return self.__svc_cli
+
+ @property
+ def slice_client(self) -> Optional[SliceClient]: return self.__slc_cli
+
@property
def contexts(self) -> List[Dict]: return self.__contexts
@@ -269,3 +296,85 @@ class DescriptorLoader:
error_list = [str_error for _,str_error in sorted(error_list, key=operator.itemgetter(0))]
self.__results.append((entity_name, action_name, num_ok, error_list))
+
+ def validate(self) -> None:
+ self.__ctx_cli.connect()
+
+ contexts = self.__ctx_cli.ListContexts(Empty())
+ assert len(contexts.contexts) == self.num_contexts
+
+ for context_uuid, num_topologies in self.num_topologies.items():
+ response = self.__ctx_cli.ListTopologies(ContextId(**json_context_id(context_uuid)))
+ assert len(response.topologies) == num_topologies
+
+ response = self.__ctx_cli.ListDevices(Empty())
+ assert len(response.devices) == self.num_devices
+
+ response = self.__ctx_cli.ListLinks(Empty())
+ assert len(response.links) == self.num_links
+
+ for context_uuid, num_services in self.num_services.items():
+ response = self.__ctx_cli.ListServices(ContextId(**json_context_id(context_uuid)))
+ assert len(response.services) == num_services
+
+ for context_uuid, num_slices in self.num_slices.items():
+ response = self.__ctx_cli.ListSlices(ContextId(**json_context_id(context_uuid)))
+ assert len(response.slices) == num_slices
+
+ def unload(self) -> None:
+ self.__ctx_cli.connect()
+ self.__dev_cli.connect()
+ self.__svc_cli.connect()
+ self.__slc_cli.connect()
+
+ for _, slice_list in self.slices.items():
+ for slice_ in slice_list:
+ self.__slc_cli.DeleteSlice(SliceId(**slice_['slice_id']))
+
+ for _, service_list in self.services.items():
+ for service in service_list:
+ self.__svc_cli.DeleteService(ServiceId(**service['service_id']))
+
+ for link in self.links:
+ self.__ctx_cli.RemoveLink(LinkId(**link['link_id']))
+
+ for device in self.devices:
+ self.__dev_cli.DeleteDevice(DeviceId(**device['device_id']))
+
+ for _, topology_list in self.topologies.items():
+ for topology in topology_list:
+ self.__ctx_cli.RemoveTopology(TopologyId(**topology['topology_id']))
+
+ for context in self.contexts:
+ self.__ctx_cli.RemoveContext(ContextId(**context['context_id']))
+
+def compose_notifications(results : TypeResults) -> TypeNotificationList:
+ notifications = []
+ for entity_name, action_name, num_ok, error_list in results:
+ entity_name_singluar,entity_name_plural = ENTITY_TO_TEXT[entity_name]
+ action_infinitive, action_past = ACTION_TO_TEXT[action_name]
+ num_err = len(error_list)
+ for error in error_list:
+ notifications.append((f'Unable to {action_infinitive} {entity_name_singluar} {error}', 'error'))
+ if num_ok : notifications.append((f'{str(num_ok)} {entity_name_plural} {action_past}', 'success'))
+ if num_err: notifications.append((f'{str(num_err)} {entity_name_plural} failed', 'danger'))
+ return notifications
+
+def check_descriptor_load_results(results : TypeResults, descriptor_loader : DescriptorLoader) -> None:
+ num_errors = 0
+ for message,level in compose_notifications(results):
+ LOGGERS.get(level)(message)
+ if level != 'success': num_errors += 1
+ if num_errors > 0:
+ MSG = 'Failed to load descriptors from "{:s}"'
+ raise Exception(MSG.format(str(descriptor_loader.descriptor_file_path)))
+
+def validate_empty_scenario(context_client : ContextClient) -> None:
+ response = context_client.ListContexts(Empty())
+ assert len(response.contexts) == 0
+
+ response = context_client.ListDevices(Empty())
+ assert len(response.devices) == 0
+
+ response = context_client.ListLinks(Empty())
+ assert len(response.links) == 0
diff --git a/src/common/tools/descriptor/Tools.py b/src/common/tools/descriptor/Tools.py
index 9d6275748e6e35eaf240f80f100e993334d4c5ea..f03c635b802e5c003a6ea80af46ef740b97e500b 100644
--- a/src/common/tools/descriptor/Tools.py
+++ b/src/common/tools/descriptor/Tools.py
@@ -72,7 +72,7 @@ def format_service_custom_config_rules(service : Dict) -> Dict:
return service
def format_slice_custom_config_rules(slice_ : Dict) -> Dict:
- config_rules = slice_.get('service_config', {}).get('config_rules', [])
+ config_rules = slice_.get('slice_config', {}).get('config_rules', [])
config_rules = format_custom_config_rules(config_rules)
slice_['slice_config']['config_rules'] = config_rules
return slice_
diff --git a/src/common/tools/grpc/Constraints.py b/src/common/tools/grpc/Constraints.py
index 53f7dfd9822eb3a2efd48bf1b628547339a3ca69..07f0b7782dbd93479774af6324683753f906c5a1 100644
--- a/src/common/tools/grpc/Constraints.py
+++ b/src/common/tools/grpc/Constraints.py
@@ -17,7 +17,7 @@
import json
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
from common.proto.context_pb2 import Constraint, EndPointId
from common.tools.grpc.Tools import grpc_message_to_json_string
@@ -137,7 +137,31 @@ def update_constraint_endpoint_priority(constraints, endpoint_id : EndPointId, p
constraint.endpoint_priority.priority = priority
return constraint
-def update_constraint_sla_availability(constraints, num_disjoint_paths : int, all_active : bool) -> Constraint:
+def update_constraint_sla_capacity(constraints, capacity_gbps : float) -> Constraint:
+ for constraint in constraints:
+ if constraint.WhichOneof('constraint') != 'sla_capacity': continue
+ break # found, end loop
+ else:
+ # not found, add it
+ constraint = constraints.add() # pylint: disable=no-member
+
+ constraint.sla_capacity.capacity_gbps = capacity_gbps
+ return constraint
+
+def update_constraint_sla_latency(constraints, e2e_latency_ms : float) -> Constraint:
+ for constraint in constraints:
+ if constraint.WhichOneof('constraint') != 'sla_latency': continue
+ break # found, end loop
+ else:
+ # not found, add it
+ constraint = constraints.add() # pylint: disable=no-member
+
+ constraint.sla_latency.e2e_latency_ms = e2e_latency_ms
+ return constraint
+
+def update_constraint_sla_availability(
+ constraints, num_disjoint_paths : int, all_active : bool, availability : float
+) -> Constraint:
for constraint in constraints:
if constraint.WhichOneof('constraint') != 'sla_availability': continue
break # found, end loop
@@ -147,8 +171,21 @@ def update_constraint_sla_availability(constraints, num_disjoint_paths : int, al
constraint.sla_availability.num_disjoint_paths = num_disjoint_paths
constraint.sla_availability.all_active = all_active
+ constraint.sla_availability.availability = availability
return constraint
+def update_constraint_sla_isolation(constraints, isolation_levels : List[int]) -> Constraint:
+ for constraint in constraints:
+ if constraint.WhichOneof('constraint') != 'sla_isolation': continue
+ break # found, end loop
+ else:
+ # not found, add it
+ constraint = constraints.add() # pylint: disable=no-member
+
+ for isolation_level in isolation_levels:
+ if isolation_level in constraint.sla_isolation.isolation_level: continue
+ constraint.sla_isolation.isolation_level.append(isolation_level)
+ return constraint
def copy_constraints(source_constraints, target_constraints):
for source_constraint in source_constraints:
@@ -189,11 +226,27 @@ def copy_constraints(source_constraints, target_constraints):
priority = source_constraint.endpoint_priority.priority
update_constraint_endpoint_priority(target_constraints, endpoint_id, priority)
+ elif constraint_kind == 'sla_capacity':
+ sla_capacity = source_constraint.sla_capacity
+ capacity_gbps = sla_capacity.capacity_gbps
+ update_constraint_sla_capacity(target_constraints, capacity_gbps)
+
+ elif constraint_kind == 'sla_latency':
+ sla_latency = source_constraint.sla_latency
+ e2e_latency_ms = sla_latency.e2e_latency_ms
+ update_constraint_sla_latency(target_constraints, e2e_latency_ms)
+
elif constraint_kind == 'sla_availability':
sla_availability = source_constraint.sla_availability
num_disjoint_paths = sla_availability.num_disjoint_paths
all_active = sla_availability.all_active
- update_constraint_sla_availability(target_constraints, num_disjoint_paths, all_active)
+ availability = sla_availability.availability
+ update_constraint_sla_availability(target_constraints, num_disjoint_paths, all_active, availability)
+
+ elif constraint_kind == 'sla_isolation':
+ sla_isolation = source_constraint.sla_isolation
+ isolation_levels = sla_isolation.isolation_level
+ update_constraint_sla_isolation(target_constraints, isolation_levels)
else:
raise NotImplementedError('Constraint({:s})'.format(grpc_message_to_json_string(source_constraint)))
diff --git a/src/common/tools/mutex_queues/MutexQueues.py b/src/common/tools/mutex_queues/MutexQueues.py
index b9fc567d561287ed5d92f51a3cab0f92d58d88ed..96e22a86f012cb8326c380a0ebbf0c1b40cae21c 100644
--- a/src/common/tools/mutex_queues/MutexQueues.py
+++ b/src/common/tools/mutex_queues/MutexQueues.py
@@ -35,7 +35,7 @@
# self.mutex_queues.signal_done(device_uuid)
import threading
-from queue import Queue
+from queue import Queue, Empty
from typing import Dict
class MutexQueues:
@@ -67,8 +67,11 @@ class MutexQueues:
with self.lock:
queue : Queue = self.mutex_queues.setdefault(queue_name, Queue())
- # remove muself from the queue
- queue.get_nowait()
+ # remove myself from the queue
+ try:
+ queue.get(block=True, timeout=0.1)
+ except Empty:
+ pass
# if there are no other tasks queued, return
if queue.qsize() == 0: return
diff --git a/src/common/tools/object_factory/Constraint.py b/src/common/tools/object_factory/Constraint.py
index e3c5129fd5bda5fb4a6659fc39b208bbdf0bb40f..ef00e3872343196f0a9f8de97d3b1ab6fc12d847 100644
--- a/src/common/tools/object_factory/Constraint.py
+++ b/src/common/tools/object_factory/Constraint.py
@@ -13,7 +13,7 @@
# limitations under the License.
import json
-from typing import Any, Dict, Union
+from typing import Any, Dict, List, Union
def json_constraint_custom(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]) -> Dict:
if not isinstance(constraint_value, str): constraint_value = json.dumps(constraint_value, sort_keys=True)
@@ -29,5 +29,16 @@ def json_constraint_endpoint_location_gps(endpoint_id : Dict, latitude : float,
def json_constraint_endpoint_priority(endpoint_id : Dict, priority : int) -> Dict:
return {'endpoint_priority': {'endpoint_id': endpoint_id, 'priority': priority}}
-def json_constraint_sla_availability(num_disjoint_paths : int, all_active : bool) -> Dict:
- return {'sla_availability': {'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active}}
+def json_constraint_sla_availability(num_disjoint_paths : int, all_active : bool, availability : float) -> Dict:
+ return {'sla_availability': {
+ 'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active, 'availability': availability
+ }}
+
+def json_constraint_sla_capacity(capacity_gbps : float) -> Dict:
+ return {'sla_capacity': {'capacity_gbps': capacity_gbps}}
+
+def json_constraint_sla_isolation(isolation_levels : List[int]) -> Dict:
+ return {'sla_isolation': {'isolation_level': isolation_levels}}
+
+def json_constraint_sla_latency(e2e_latency_ms : float) -> Dict:
+ return {'sla_latency': {'e2e_latency_ms': e2e_latency_ms}}
diff --git a/src/context/service/database/Constraint.py b/src/context/service/database/Constraint.py
index 0540841c3a570f9a1e28ec530998b115f73a62a7..b37d0dcadd8799f8f7f9d538a135ed0404e08684 100644
--- a/src/context/service/database/Constraint.py
+++ b/src/context/service/database/Constraint.py
@@ -66,7 +66,7 @@ def compose_constraints_data(
constraint_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid)
elif kind in {
ConstraintKindEnum.SCHEDULE, ConstraintKindEnum.SLA_CAPACITY, ConstraintKindEnum.SLA_LATENCY,
- ConstraintKindEnum.SLA_AVAILABILITY, ConstraintKindEnum.SLA_ISOLATION_LEVEL
+ ConstraintKindEnum.SLA_AVAILABILITY, ConstraintKindEnum.SLA_ISOLATION
}:
constraint_name = '{:s}:{:s}:'.format(parent_kind, kind.value)
else:
@@ -107,7 +107,7 @@ def upsert_constraints(
#str_stmt = stmt.compile(dialect=postgresql.dialect(), compile_kwargs={"literal_binds": True})
#LOGGER.warning('delete stmt={:s}'.format(str(str_stmt)))
constraint_deletes = session.execute(stmt)
- LOGGER.warning('constraint_deletes.rowcount={:s}'.format(str(constraint_deletes.rowcount)))
+ #LOGGER.warning('constraint_deletes.rowcount={:s}'.format(str(constraint_deletes.rowcount)))
delete_affected = int(constraint_deletes.rowcount) > 0
upsert_affected = False
diff --git a/src/context/service/database/Service.py b/src/context/service/database/Service.py
index 4b63a4ae56fa278679d145f1da2c62e767f73005..a81a80c3c2398fed16842bcc3d8aa16342edb72b 100644
--- a/src/context/service/database/Service.py
+++ b/src/context/service/database/Service.py
@@ -77,8 +77,11 @@ def service_set(db_engine : Engine, request : Service) -> Tuple[Dict, bool]:
service_endpoints_data : List[Dict] = list()
for i,endpoint_id in enumerate(request.service_endpoint_ids):
endpoint_context_uuid = endpoint_id.topology_id.context_id.context_uuid.uuid
- if len(endpoint_context_uuid) == 0: endpoint_context_uuid = context_uuid
- if endpoint_context_uuid not in {raw_context_uuid, context_uuid}:
+ if len(endpoint_context_uuid) == 0:
+ endpoint_context_uuid = context_get_uuid(request.service_id.context_id, allow_random=False)
+ else:
+ endpoint_context_uuid = context_get_uuid(endpoint_id.topology_id.context_id, allow_random=False)
+ if endpoint_context_uuid != context_uuid:
raise InvalidArgumentException(
'request.service_endpoint_ids[{:d}].topology_id.context_id.context_uuid.uuid'.format(i),
endpoint_context_uuid,
diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py
index 7c291e33d858841054adc59306fbedb2e9a18f79..80af759defac88d69791b610b9bc093fef309db1 100644
--- a/src/context/service/database/Slice.py
+++ b/src/context/service/database/Slice.py
@@ -77,8 +77,11 @@ def slice_set(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
slice_endpoints_data : List[Dict] = list()
for i,endpoint_id in enumerate(request.slice_endpoint_ids):
endpoint_context_uuid = endpoint_id.topology_id.context_id.context_uuid.uuid
- if len(endpoint_context_uuid) == 0: endpoint_context_uuid = context_uuid
- if endpoint_context_uuid not in {raw_context_uuid, context_uuid}:
+ if len(endpoint_context_uuid) == 0:
+ endpoint_context_uuid = context_get_uuid(request.slice_id.context_id, allow_random=False)
+ else:
+ endpoint_context_uuid = context_get_uuid(endpoint_id.topology_id.context_id, allow_random=False)
+ if endpoint_context_uuid != context_uuid:
raise InvalidArgumentException(
'request.slice_endpoint_ids[{:d}].topology_id.context_id.context_uuid.uuid'.format(i),
endpoint_context_uuid,
@@ -177,7 +180,7 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
if len(request.slice_constraints) > 0: raise NotImplementedError('UnsetSlice: removal of constraints')
if len(request.slice_config.config_rules) > 0: raise NotImplementedError('UnsetSlice: removal of config rules')
- if len(request.slice_endpoint_ids) > 0: raise NotImplementedError('UnsetSlice: removal of endpoints')
+ #if len(request.slice_endpoint_ids) > 0: raise NotImplementedError('UnsetSlice: removal of endpoints')
slice_endpoint_uuids : Set[str] = set()
for i,endpoint_id in enumerate(request.slice_endpoint_ids):
@@ -210,13 +213,13 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
)).delete()
if len(slice_subslice_uuids) > 0:
num_deletes += session.query(SliceSubSliceModel)\
- .filter_by(and_(
+ .filter(and_(
SliceSubSliceModel.slice_uuid == slice_uuid,
SliceSubSliceModel.subslice_uuid.in_(slice_subslice_uuids)
)).delete()
if len(slice_endpoint_uuids) > 0:
num_deletes += session.query(SliceEndPointModel)\
- .filter_by(and_(
+ .filter(and_(
SliceEndPointModel.slice_uuid == slice_uuid,
SliceEndPointModel.endpoint_uuid.in_(slice_endpoint_uuids)
)).delete()
diff --git a/src/context/service/database/models/ConstraintModel.py b/src/context/service/database/models/ConstraintModel.py
index 01c7bcb76b00ac5d8b49d9f99f010d1ddfd30788..e9660d502c4420ec69c2bdc883d5e03ef283ca54 100644
--- a/src/context/service/database/models/ConstraintModel.py
+++ b/src/context/service/database/models/ConstraintModel.py
@@ -19,15 +19,17 @@ from typing import Dict
from ._Base import _Base
# Enum values should match name of field in Constraint message
+# - enum item name should be Constraint message type in upper case
+# - enum item value should be Constraint message type as it is in the proto files
class ConstraintKindEnum(enum.Enum):
- CUSTOM = 'custom'
- SCHEDULE = 'schedule'
- ENDPOINT_LOCATION = 'endpoint_location'
- ENDPOINT_PRIORITY = 'endpoint_priority'
- SLA_CAPACITY = 'sla_capacity'
- SLA_LATENCY = 'sla_latency'
- SLA_AVAILABILITY = 'sla_availability'
- SLA_ISOLATION_LEVEL = 'sla_isolation'
+ CUSTOM = 'custom'
+ SCHEDULE = 'schedule'
+ ENDPOINT_LOCATION = 'endpoint_location'
+ ENDPOINT_PRIORITY = 'endpoint_priority'
+ SLA_CAPACITY = 'sla_capacity'
+ SLA_LATENCY = 'sla_latency'
+ SLA_AVAILABILITY = 'sla_availability'
+ SLA_ISOLATION = 'sla_isolation'
class ConstraintModel(_Base):
__tablename__ = 'constraint'
diff --git a/src/context/service/database/models/SliceModel.py b/src/context/service/database/models/SliceModel.py
index 1a562bcd973cc41d777fdd20e4d42622afeebc44..458bc714a3be42ee619fd2d182d734a4edd79628 100644
--- a/src/context/service/database/models/SliceModel.py
+++ b/src/context/service/database/models/SliceModel.py
@@ -98,5 +98,9 @@ class SliceServiceModel(_Base):
class SliceSubSliceModel(_Base):
__tablename__ = 'slice_subslice'
- slice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE' ), primary_key=True)
- subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='RESTRICT'), primary_key=True)
+ slice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)
+ subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)
+
+ slice = relationship(
+ 'SliceModel', foreign_keys='SliceSubSliceModel.slice_uuid', back_populates='slice_subslices', lazy='joined')
+ subslice = relationship('SliceModel', foreign_keys='SliceSubSliceModel.subslice_uuid', lazy='joined')
diff --git a/src/context/tests/Objects.py b/src/context/tests/Objects.py
index 8634c1f309e0c060654a168a1ad400f1d4722a32..6b52ef4c0f3583de628706ba79efffb9d5709820 100644
--- a/src/context/tests/Objects.py
+++ b/src/context/tests/Objects.py
@@ -17,7 +17,7 @@ from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
from common.proto.kpi_sample_types_pb2 import KpiSampleType
from common.tools.object_factory.ConfigRule import json_config_rule_set
from common.tools.object_factory.Connection import json_connection, json_connection_id
-from common.tools.object_factory.Constraint import json_constraint_custom
+from common.tools.object_factory.Constraint import json_constraint_custom, json_constraint_sla_latency
from common.tools.object_factory.Context import json_context, json_context_id
from common.tools.object_factory.Device import json_device_id, json_device_packetrouter_disabled
from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id
@@ -95,7 +95,7 @@ def compose_service(
for device_id, endpoint_name in endpoint_ids
]
constraints = [
- json_constraint_custom('latency[ms]', str(latency_ms)),
+ json_constraint_sla_latency(latency_ms),
json_constraint_custom('jitter[us]', str(jitter_us)),
]
config_rules = [
@@ -128,7 +128,7 @@ def compose_slice(
for device_id, endpoint_name in endpoint_ids
]
constraints = [
- json_constraint_custom('latency[ms]', str(latency_ms)),
+ json_constraint_sla_latency(latency_ms),
json_constraint_custom('jitter[us]', str(jitter_us)),
]
config_rules = [
diff --git a/src/device/service/drivers/emulated/SyntheticSamplingParameters.py b/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
index ea5cf2cb77e34fc4f9e88490ff400b92b1f64e66..5bbbf89e84e764677638b7e4e3f4934336321576 100644
--- a/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
+++ b/src/device/service/drivers/emulated/SyntheticSamplingParameters.py
@@ -51,7 +51,7 @@ class SyntheticSamplingParameters:
metric = match.group(2)
metric_sense = metric.lower().replace('packets_', '').replace('bytes_', '')
- LOGGER.info(MSG_INFO.format(monitoring_resource_key, endpoint_uuid, metric, metric_sense))
+ LOGGER.debug(MSG_INFO.format(monitoring_resource_key, endpoint_uuid, metric, metric_sense))
parameters_key = '{:s}-{:s}'.format(endpoint_uuid, metric_sense)
parameters = self.__data.get(parameters_key)
diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index 906c26e98a75fe3c8f15d628f863faac4ba2ea16..a6d14307eee9bbc531e09495d4b650e361aa3d26 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -14,9 +14,11 @@
import logging, json, random, threading
from typing import Dict, Optional, Set, Tuple
-from common.proto.context_pb2 import Empty, TopologyId
+from common.proto.context_pb2 import Empty, IsolationLevelEnum, TopologyId
from common.tools.grpc.Tools import grpc_message_to_json
-from common.tools.object_factory.Constraint import json_constraint_custom
+from common.tools.object_factory.Constraint import (
+ json_constraint_sla_availability, json_constraint_sla_capacity, json_constraint_sla_isolation,
+ json_constraint_sla_latency)
from common.tools.object_factory.ConfigRule import json_config_rule_set
from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.EndPoint import json_endpoint_id
@@ -36,7 +38,7 @@ class RequestGenerator:
def __init__(self, parameters : Parameters) -> None:
self._parameters = parameters
self._lock = threading.Lock()
- self._num_requests = 0
+ self._num_generated = 0
self._available_device_endpoints : Dict[str, Set[str]] = dict()
self._used_device_endpoints : Dict[str, Dict[str, str]] = dict()
self._endpoint_ids_to_types : Dict[Tuple[str, str], str] = dict()
@@ -45,6 +47,12 @@ class RequestGenerator:
self._device_data : Dict[str, Dict] = dict()
self._device_endpoint_data : Dict[str, Dict[str, Dict]] = dict()
+ @property
+ def num_generated(self): return self._num_generated
+
+ @property
+ def infinite_loop(self): return self._parameters.num_requests == 0
+
def initialize(self) -> None:
with self._lock:
self._available_device_endpoints.clear()
@@ -96,17 +104,14 @@ class RequestGenerator:
if self._parameters.record_to_dlt:
record_link_to_dlt(dlt_connector_client, dlt_domain_id, link.link_id)
- @property
- def num_requests_generated(self): return self._num_requests
-
def dump_state(self) -> None:
with self._lock:
_endpoints = {
device_uuid:[endpoint_uuid for endpoint_uuid in endpoint_uuids]
for device_uuid,endpoint_uuids in self._available_device_endpoints.items()
}
- LOGGER.info('[dump_state] available_device_endpoints = {:s}'.format(json.dumps(_endpoints)))
- LOGGER.info('[dump_state] used_device_endpoints = {:s}'.format(json.dumps(self._used_device_endpoints)))
+ LOGGER.debug('[dump_state] available_device_endpoints = {:s}'.format(json.dumps(_endpoints)))
+ LOGGER.debug('[dump_state] used_device_endpoints = {:s}'.format(json.dumps(self._used_device_endpoints)))
def _use_device_endpoint(
self, service_uuid : str, request_type : RequestType, endpoint_types : Optional[Set[str]] = None,
@@ -167,10 +172,13 @@ class RequestGenerator:
self._used_device_endpoints.setdefault(device_uuid, dict()).pop(endpoint_uuid, None)
self._available_device_endpoints.setdefault(device_uuid, set()).add(endpoint_uuid)
- def compose_request(self) -> Optional[Dict]:
+ def compose_request(self) -> Tuple[bool, Optional[Dict]]: # completed, request
with self._lock:
- self._num_requests += 1
- num_request = self._num_requests
+ if not self.infinite_loop and (self._num_generated >= self._parameters.num_requests):
+ LOGGER.info('Generation Done!')
+ return True, None # completed
+ self._num_generated += 1
+ num_request = self._num_generated
#request_uuid = str(uuid.uuid4())
request_uuid = 'svc_{:d}'.format(num_request)
@@ -181,9 +189,9 @@ class RequestGenerator:
if request_type in {
RequestType.SERVICE_L2NM, RequestType.SERVICE_L3NM, RequestType.SERVICE_TAPI, RequestType.SERVICE_MW
}:
- return self._compose_service(num_request, request_uuid, request_type)
+ return False, self._compose_service(num_request, request_uuid, request_type)
elif request_type in {RequestType.SLICE_L2NM, RequestType.SLICE_L3NM}:
- return self._compose_slice(num_request, request_uuid, request_type)
+ return False, self._compose_slice(num_request, request_uuid, request_type)
def _compose_service(self, num_request : int, request_uuid : str, request_type : str) -> Optional[Dict]:
# choose source endpoint
@@ -222,10 +230,17 @@ class RequestGenerator:
]
if request_type == RequestType.SERVICE_L2NM:
+ availability = int(random.uniform(00.0, 99.99) * 100.0) / 100.0
+ capacity_gbps = int(random.uniform(0.1, 100.0) * 100.0) / 100.0
+ e2e_latency_ms = int(random.uniform(5.0, 100.0) * 100.0) / 100.0
+
constraints = [
- json_constraint_custom('bandwidth[gbps]', '10.0'),
- json_constraint_custom('latency[ms]', '20.0'),
+ json_constraint_sla_availability(1, True, availability),
+ json_constraint_sla_capacity(capacity_gbps),
+ json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),
+ json_constraint_sla_latency(e2e_latency_ms),
]
+
vlan_id = num_request % 1000
circuit_id = '{:03d}'.format(vlan_id)
@@ -260,10 +275,17 @@ class RequestGenerator:
request_uuid, endpoint_ids=endpoint_ids, constraints=constraints, config_rules=config_rules)
elif request_type == RequestType.SERVICE_L3NM:
+ availability = int(random.uniform(00.0, 99.99) * 100.0) / 100.0
+ capacity_gbps = int(random.uniform(0.1, 100.0) * 100.0) / 100.0
+ e2e_latency_ms = int(random.uniform(5.0, 100.0) * 100.0) / 100.0
+
constraints = [
- json_constraint_custom('bandwidth[gbps]', '10.0'),
- json_constraint_custom('latency[ms]', '20.0'),
+ json_constraint_sla_availability(1, True, availability),
+ json_constraint_sla_capacity(capacity_gbps),
+ json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),
+ json_constraint_sla_latency(e2e_latency_ms),
]
+
vlan_id = num_request % 1000
bgp_as = 60000 + (num_request % 10000)
bgp_route_target = '{:5d}:{:03d}'.format(bgp_as, 333)
@@ -357,9 +379,15 @@ class RequestGenerator:
json_endpoint_id(json_device_id(src_device_uuid), src_endpoint_uuid),
json_endpoint_id(json_device_id(dst_device_uuid), dst_endpoint_uuid),
]
+
+ availability = int(random.uniform(00.0, 99.99) * 100.0) / 100.0
+ capacity_gbps = int(random.uniform(0.1, 100.0) * 100.0) / 100.0
+ e2e_latency_ms = int(random.uniform(5.0, 100.0) * 100.0) / 100.0
constraints = [
- json_constraint_custom('bandwidth[gbps]', '10.0'),
- json_constraint_custom('latency[ms]', '20.0'),
+ json_constraint_sla_availability(1, True, availability),
+ json_constraint_sla_capacity(capacity_gbps),
+ json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),
+ json_constraint_sla_latency(e2e_latency_ms),
]
if request_type == RequestType.SLICE_L2NM:
diff --git a/src/load_generator/load_gen/RequestScheduler.py b/src/load_generator/load_gen/RequestScheduler.py
index 775da1580a2a6521dbdc8fe32236c1f2adb4b3a7..57afe80bec569b29d2931256a8c1cf7a1ab3eb85 100644
--- a/src/load_generator/load_gen/RequestScheduler.py
+++ b/src/load_generator/load_gen/RequestScheduler.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import copy, logging, pytz, random
+import copy, logging, pytz, random, threading
from apscheduler.executors.pool import ThreadPoolExecutor
from apscheduler.jobstores.memory import MemoryJobStore
from apscheduler.schedulers.blocking import BlockingScheduler
@@ -46,14 +46,18 @@ class RequestScheduler:
timezone=pytz.utc)
self._parameters = parameters
self._generator = generator
+ self._running = threading.Event()
+
+ @property
+ def num_generated(self): return min(self._generator.num_generated, self._parameters.num_requests)
+
+ @property
+ def infinite_loop(self): return self._generator.infinite_loop
+
+ @property
+ def running(self): return self._running.is_set()
def _schedule_request_setup(self) -> None:
- infinite_loop = self._parameters.num_requests == 0
- num_requests_generated = self._generator.num_requests_generated - 1 # because it first increases, then checks
- if not infinite_loop and (num_requests_generated >= self._parameters.num_requests):
- LOGGER.info('Generation Done!')
- #self._scheduler.shutdown()
- return
iat = random.expovariate(1.0 / self._parameters.inter_arrival_time)
run_date = datetime.utcnow() + timedelta(seconds=iat)
self._scheduler.add_job(
@@ -66,16 +70,24 @@ class RequestScheduler:
self._request_teardown, args=(request,), trigger='date', run_date=run_date, timezone=pytz.utc)
def start(self):
+ self._running.set()
self._schedule_request_setup()
self._scheduler.start()
def stop(self):
self._scheduler.shutdown()
+ self._running.clear()
def _request_setup(self) -> None:
- self._schedule_request_setup()
+ completed,request = self._generator.compose_request()
+ if completed:
+ LOGGER.info('Generation Done!')
+ #self._scheduler.shutdown()
+ self._running.clear()
+ return
+ else:
+ self._schedule_request_setup()
- request = self._generator.compose_request()
if request is None:
LOGGER.warning('No resources available to compose new request')
return
diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index ff620c53425f8f447dcb00ea03bc4c9f8ce4c5e9..7c3a14975d9c7bf7d5d46be917203338bea7f1f9 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -56,7 +56,7 @@ unit_test monitoring:
- docker pull questdb/questdb
- docker run --name questdb -d -p 9000:9000 -p 9009:9009 -p 8812:8812 -p 9003:9003 -e QDB_CAIRO_COMMIT_LAG=1000 -e QDB_CAIRO_MAX_UNCOMMITTED_ROWS=100000 --network=teraflowbridge --rm questdb/questdb
- sleep 10
- - docker run --name $IMAGE_NAME -d -p 7070:7070 --env METRICSDB_HOSTNAME=questdb --env METRICSDB_ILP_PORT=9009 --env METRICSDB_REST_PORT=9000 --env METRICSDB_TABLE=monitoring -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
+ - docker run --name $IMAGE_NAME -d -p 7070:7070 --env METRICSDB_HOSTNAME=questdb --env METRICSDB_ILP_PORT=9009 --env METRICSDB_REST_PORT=9000 --env METRICSDB_TABLE_MONITORING_KPIS=tfs_monitoring_kpis -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
- sleep 30
- docker ps -a
- docker logs $IMAGE_NAME
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index 0bbce15094b87a17e332aad21bf34a565e8dd087..f408734df40c1bc5c16b7e108e3ce5a211165f71 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -47,7 +47,7 @@ MONITORING_INCLUDEKPI_COUNTER = Counter('monitoring_includekpi_counter', 'Monito
METRICSDB_HOSTNAME = os.environ.get("METRICSDB_HOSTNAME")
METRICSDB_ILP_PORT = os.environ.get("METRICSDB_ILP_PORT")
METRICSDB_REST_PORT = os.environ.get("METRICSDB_REST_PORT")
-METRICSDB_TABLE = os.environ.get("METRICSDB_TABLE")
+METRICSDB_TABLE_MONITORING_KPIS = os.environ.get("METRICSDB_TABLE_MONITORING_KPIS")
class MonitoringServiceServicerImpl(MonitoringServiceServicer):
def __init__(self, name_mapping : NameMapping):
@@ -57,7 +57,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
self.management_db = ManagementDBTools.ManagementDB('monitoring.db')
self.deviceClient = DeviceClient()
self.metrics_db = MetricsDBTools.MetricsDB(
- METRICSDB_HOSTNAME, name_mapping, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)
+ METRICSDB_HOSTNAME, name_mapping, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE_MONITORING_KPIS)
self.subs_manager = SubscriptionManager(self.metrics_db)
self.alarm_manager = AlarmManager(self.metrics_db)
LOGGER.info('MetricsDB initialized')
@@ -592,8 +592,8 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))
response.kpi_id.kpi_id.uuid = "NoID"
else:
- query = f"SELECT kpi_id, timestamp, kpi_value FROM {METRICSDB_TABLE} WHERE kpi_id = '{kpi_id}' " \
- f"LATEST ON timestamp PARTITION BY kpi_id"
+ query = f"SELECT kpi_id, timestamp, kpi_value FROM {METRICSDB_TABLE_MONITORING_KPIS} " \
+ f"WHERE kpi_id = '{kpi_id}' LATEST ON timestamp PARTITION BY kpi_id"
data = self.metrics_db.run_query(query)
LOGGER.debug(data)
if len(data) == 0:
diff --git a/src/monitoring/service/__main__.py b/src/monitoring/service/__main__.py
index fc460151b370c0eb5335787ed4677f7008881ad2..14f5609602c90eb9f54462e423af100997cf00d2 100644
--- a/src/monitoring/service/__main__.py
+++ b/src/monitoring/service/__main__.py
@@ -69,6 +69,8 @@ def main():
wait_for_environment_variables([
get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST ),
get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
+ get_env_var_name(ServiceNameEnum.DEVICE, ENVVAR_SUFIX_SERVICE_HOST ),
+ get_env_var_name(ServiceNameEnum.DEVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
])
signal.signal(signal.SIGINT, signal_handler)
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 1428b0ed56dbb24a24af8fde42e4d073a48c931d..c883f9d141fc28645761641b0ccd10294b538bd2 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -75,7 +75,7 @@ os.environ[get_env_var_name(ServiceNameEnum.MONITORING, ENVVAR_SUFIX_SERVICE_POR
METRICSDB_HOSTNAME = os.environ.get('METRICSDB_HOSTNAME')
METRICSDB_ILP_PORT = os.environ.get('METRICSDB_ILP_PORT')
METRICSDB_REST_PORT = os.environ.get('METRICSDB_REST_PORT')
-METRICSDB_TABLE = os.environ.get('METRICSDB_TABLE')
+METRICSDB_TABLE_MONITORING_KPIS = os.environ.get('METRICSDB_TABLE_MONITORING_KPIS')
LOGGER = logging.getLogger(__name__)
@@ -193,7 +193,7 @@ def management_db():
def metrics_db(monitoring_service : MonitoringService): # pylint: disable=redefined-outer-name
return monitoring_service.monitoring_servicer.metrics_db
#_metrics_db = MetricsDBTools.MetricsDB(
- # METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)
+ # METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE_MONITORING_KPIS)
#return _metrics_db
@pytest.fixture(scope='session')
diff --git a/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py b/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
index a9fc4fa3d499f634f021d9ebbb4a749b4f8715c7..a6d39ee36949e075323613fceb71da5c77354fe5 100644
--- a/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/KDisjointPathAlgorithm.py
@@ -54,13 +54,15 @@ class KDisjointPathAlgorithm(_Algorithm):
self.services_details.setdefault(service_key, service_details)
for constraint in service.service_constraints:
- if constraint.WhichOneof('constraint') == 'custom':
+ kind = constraint.WhichOneof('constraint')
+
+ if kind == 'custom':
constraint_type = constraint.custom.constraint_type
if constraint_type not in CUSTOM_CONSTRAINTS: continue
constraint_value = constraint.custom.constraint_value
constraints[constraint_type] = constraint_value
- if constraint.WhichOneof('constraint') == 'endpoint_location':
+ elif kind == 'endpoint_location':
endpoint_id = constraint.endpoint_location.endpoint_id
device_uuid = endpoint_id.device_id.device_uuid.uuid
device_uuid = self.device_name_mapping.get(device_uuid, device_uuid)
@@ -73,7 +75,7 @@ class KDisjointPathAlgorithm(_Algorithm):
site_id = constraint.endpoint_location.location.region
endpoints.setdefault((device_uuid, endpoint_uuid), dict())['site_id'] = site_id
- if constraint.WhichOneof('constraint') == 'endpoint_priority':
+ elif kind == 'endpoint_priority':
endpoint_id = constraint.endpoint_priority.endpoint_id
device_uuid = endpoint_id.device_id.device_uuid.uuid
device_uuid = self.device_name_mapping.get(device_uuid, device_uuid)
@@ -82,9 +84,18 @@ class KDisjointPathAlgorithm(_Algorithm):
priority = constraint.endpoint_priority.priority
endpoints.setdefault((device_uuid, endpoint_uuid), dict())['priority'] = priority
+ elif kind == 'sla_capacity':
+ capacity_gbps = constraint.sla_capacity.capacity_gbps
+ constraints['bandwidth[gbps]'] = str(capacity_gbps)
+
+ elif kind == 'sla_latency':
+ e2e_latency_ms = constraint.sla_latency.e2e_latency_ms
+ constraints['latency[ms]'] = str(e2e_latency_ms)
+
# TODO: ensure these constraints are provided in the request
if 'bandwidth[gbps]' not in constraints: constraints['bandwidth[gbps]'] = '20.0'
if 'latency[ms]' not in constraints: constraints['latency[ms]'] = '20.0'
+ #if 'jitter[us]' not in constraints: constraints['jitter[us]'] = '50.0'
def get_link_from_endpoint(self, endpoint : Dict) -> Tuple[Dict, Link]:
device_uuid = endpoint['device_id']
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py b/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
index bfb4da05fb57bef03fb94fc8973271ceb45f619a..ee85f0bb083500c655e78798bbcd2bd00e8a4501 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ComposeRequest.py
@@ -73,17 +73,22 @@ def compose_latency_characteristics(fixed_latency_characteristic : str) -> Dict:
return {'fixed-latency-characteristic': fixed_latency_characteristic}
def compose_constraint(constraint : Constraint) -> Dict:
- if constraint.WhichOneof('constraint') != 'custom':
- str_constraint = grpc_message_to_json_string(constraint)
- LOGGER.warning('Ignoring unsupported Constraint({:s})'.format(str_constraint))
- return None
- constraint_type = constraint.custom.constraint_type
- if constraint_type in {'diversity'}:
- str_constraint = grpc_message_to_json_string(constraint)
- LOGGER.warning('Ignoring unsupported Constraint({:s})'.format(str_constraint))
- return None
- constraint_value = constraint.custom.constraint_value
- return {'constraint_type': constraint_type, 'constraint_value': constraint_value}
+ kind = constraint.WhichOneof('constraint')
+ if kind == 'custom':
+ constraint_type = constraint.custom.constraint_type
+ if constraint_type in {'bandwidth[gbps]', 'latency[ms]', 'jitter[us]'}:
+ constraint_value = constraint.custom.constraint_value
+ return {'constraint_type': constraint_type, 'constraint_value': constraint_value}
+ elif kind == 'sla_capacity':
+ capacity_gbps = constraint.sla_capacity.capacity_gbps
+ return {'constraint_type': 'bandwidth[gbps]', 'constraint_value': str(capacity_gbps)}
+ elif kind == 'sla_latency':
+ e2e_latency_ms = constraint.sla_latency.e2e_latency_ms
+ return {'constraint_type': 'latency[ms]', 'constraint_value': str(e2e_latency_ms)}
+
+ str_constraint = grpc_message_to_json_string(constraint)
+ LOGGER.warning('Ignoring unsupported Constraint({:s})'.format(str_constraint))
+ return None
def compose_device(grpc_device : Device) -> Dict:
device_uuid = grpc_device.device_id.device_uuid.uuid
@@ -144,6 +149,8 @@ def compose_service(grpc_service : Service) -> Dict:
constraints.append({'constraint_type': 'bandwidth[gbps]', 'constraint_value': '20.0'})
if 'latency[ms]' not in constraint_types:
constraints.append({'constraint_type': 'latency[ms]', 'constraint_value': '20.0'})
+ #if 'jitter[us]' not in constraint_types:
+ # constraints.append({'constraint_type': 'jitter[us]', 'constraint_value': '50.0'})
return {
'serviceId': service_id,
diff --git a/src/pathcomp/frontend/tests/Objects_A_B_C.py b/src/pathcomp/frontend/tests/Objects_A_B_C.py
index ca9764a34ef0550351c4a0ebcdbd041805c49dde..f26d74ce4c665663735bae69dcfb5a4e14311bfa 100644
--- a/src/pathcomp/frontend/tests/Objects_A_B_C.py
+++ b/src/pathcomp/frontend/tests/Objects_A_B_C.py
@@ -13,7 +13,7 @@
# limitations under the License.
from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.tools.object_factory.Constraint import json_constraint_custom
+from common.tools.object_factory.Constraint import json_constraint_sla_capacity, json_constraint_sla_latency
from common.tools.object_factory.Context import json_context, json_context_id
from common.tools.object_factory.Device import json_device_emulated_packet_router_disabled, json_device_id
from common.tools.object_factory.EndPoint import json_endpoints
@@ -97,8 +97,8 @@ LINK_C2_C3_ID, LINK_C2_C3 = compose_link(DEVICE_C2_ENDPOINTS[1], DEVICE_C3_ENDPO
# ----- Service --------------------------------------------------------------------------------------------------------
SERVICE_A1_B1 = compose_service(DEVICE_A1_ENDPOINTS[2], DEVICE_B1_ENDPOINTS[2], constraints=[
- json_constraint_custom('bandwidth[gbps]', 10.0),
- json_constraint_custom('latency[ms]', 12.0),
+ json_constraint_sla_capacity(10.0),
+ json_constraint_sla_latency(12.0),
])
# ----- Containers -----------------------------------------------------------------------------------------------------
diff --git a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
index 1d057c10edcea30e1bf38f63d8a1ad0c6a0a4d46..9ee784e1f76026416bca9824aa8e54e2c4f874f2 100644
--- a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
+++ b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN.py
@@ -13,7 +13,7 @@
# limitations under the License.
from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.tools.object_factory.Constraint import json_constraint_custom
+from common.tools.object_factory.Constraint import json_constraint_sla_capacity, json_constraint_sla_latency
from common.tools.object_factory.Context import json_context, json_context_id
from common.tools.object_factory.Device import (
json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -139,8 +139,8 @@ LINK_TNR2_TNR4_ID, LINK_TNR2_TNR4 = compose_link(DEV_TNR2_EPS[4], DEV_TNR4_EPS[4
# ----- Service --------------------------------------------------------------------------------------------------------
SERVICE_DC1GW_DC2GW = compose_service(DEV_DC1GW_EPS[2], DEV_DC2GW_EPS[2], constraints=[
- json_constraint_custom('bandwidth[gbps]', 10.0),
- json_constraint_custom('latency[ms]', 20.0),
+ json_constraint_sla_capacity(10.0),
+ json_constraint_sla_latency(20.0),
])
# ----- Containers -----------------------------------------------------------------------------------------------------
diff --git a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
index 8f6e88719f4019edbeea36c7b4a641fbd7abbea4..71510d088746bd791e4671686dd5114874dd5a2a 100644
--- a/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
+++ b/src/pathcomp/frontend/tests/Objects_DC_CSGW_TN_OLS.py
@@ -14,7 +14,7 @@
import uuid
from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.tools.object_factory.Constraint import json_constraint_custom
+from common.tools.object_factory.Constraint import json_constraint_sla_capacity, json_constraint_sla_latency
from common.tools.object_factory.Context import json_context, json_context_id
from common.tools.object_factory.Device import (
json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -149,8 +149,8 @@ LINK_TNR4_TOLS_ID, LINK_TNR4_TOLS = compose_link(DEV_TNR4_EPS[2], DEV_TOLS_EPS[3
# ----- Service --------------------------------------------------------------------------------------------------------
SERVICE_DC1GW_DC2GW = compose_service(DEV_DC1GW_EPS[2], DEV_DC2GW_EPS[2], constraints=[
- json_constraint_custom('bandwidth[gbps]', 10.0),
- json_constraint_custom('latency[ms]', 20.0),
+ json_constraint_sla_capacity(10.0),
+ json_constraint_sla_latency(20.0),
])
# ----- Containers -----------------------------------------------------------------------------------------------------
diff --git a/src/pathcomp/frontend/tests/test_unitary.py b/src/pathcomp/frontend/tests/test_unitary.py
index fd14c8a7aed4ec6e1a1c73aaa9425008abe7db60..8088259b80b8ade2669568b74f004dcfa631dd9c 100644
--- a/src/pathcomp/frontend/tests/test_unitary.py
+++ b/src/pathcomp/frontend/tests/test_unitary.py
@@ -18,12 +18,11 @@ from common.proto.pathcomp_pb2 import PathCompRequest
from common.tools.grpc.Tools import grpc_message_to_json
from common.tools.object_factory.Constraint import (
json_constraint_custom, json_constraint_endpoint_location_region, json_constraint_endpoint_priority,
- json_constraint_sla_availability)
+ json_constraint_sla_availability, json_constraint_sla_capacity, json_constraint_sla_latency)
from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.EndPoint import json_endpoint_id
from common.tools.object_factory.Service import json_service_l3nm_planned
from context.client.ContextClient import ContextClient
-from device.client.DeviceClient import DeviceClient
from pathcomp.frontend.client.PathCompClient import PathCompClient
# Scenarios:
@@ -90,8 +89,8 @@ def test_request_service_shortestpath(
request_services = copy.deepcopy(SERVICES)
#request_services[0]['service_constraints'] = [
- # json_constraint_custom('bandwidth[gbps]', 1000.0),
- # json_constraint_custom('latency[ms]', 1200.0),
+ # json_constraint_sla_capacity(1000.0),
+ # json_constraint_sla_latency(1200.0),
#]
pathcomp_request = PathCompRequest(services=request_services)
pathcomp_request.shortest_path.Clear() # hack to select the shortest path algorithm that has no attributes
@@ -202,9 +201,9 @@ def test_request_service_kdisjointpath(
]
endpoint_ids, constraints = [], [
- json_constraint_custom('bandwidth[gbps]', 10.0),
- json_constraint_custom('latency[ms]', 12.0),
- json_constraint_sla_availability(2, True),
+ json_constraint_sla_capacity(10.0),
+ json_constraint_sla_latency(12.0),
+ json_constraint_sla_availability(2, True, 50.0),
json_constraint_custom('diversity', {'end-to-end-diverse': 'all-other-accesses'}),
]
diff --git a/src/pathcomp/misc/example-results-kdisjointpaths.json b/src/pathcomp/misc/example-results-kdisjointpaths.json
index 9eda25d484e45db53471ea3f655d511cbcc42c18..c1dbf3a3c7bc6335f0d0c765b6622ce070b7774e 100644
--- a/src/pathcomp/misc/example-results-kdisjointpaths.json
+++ b/src/pathcomp/misc/example-results-kdisjointpaths.json
@@ -64,8 +64,8 @@
],
"service_status": {"service_status": "SERVICESTATUS_PLANNED"},
"service_constraints": [
- {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},
- {"custom": {"constraint_type": "latency[ms]", "constraint_value": "12.0"}}
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 12.0}}
],
"service_config": {"config_rules": []}
}
diff --git a/src/service/service/ServiceServiceServicerImpl.py b/src/service/service/ServiceServiceServicerImpl.py
index 622abeee860cdb6ce8153b7def9fb91ea1117277..0b2e0760161c109a2ba6a5feecc931e8bcf5c14f 100644
--- a/src/service/service/ServiceServiceServicerImpl.py
+++ b/src/service/service/ServiceServiceServicerImpl.py
@@ -38,8 +38,6 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def CreateService(self, request : Service, context : grpc.ServicerContext) -> ServiceId:
- LOGGER.info('[CreateService] begin ; request = {:s}'.format(grpc_message_to_json_string(request)))
-
if len(request.service_endpoint_ids) > 0:
unexpected_endpoints = []
for service_endpoint_id in request.service_endpoint_ids:
@@ -85,8 +83,6 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def UpdateService(self, request : Service, context : grpc.ServicerContext) -> ServiceId:
- LOGGER.info('[UpdateService] begin ; request = {:s}'.format(grpc_message_to_json_string(request)))
-
# Set service status to "SERVICESTATUS_PLANNED" to ensure rest of components are aware the service is
# being modified.
context_client = ContextClient()
@@ -112,27 +108,30 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
service_id_with_uuids = context_client.SetService(service)
service_with_uuids = context_client.GetService(service_id_with_uuids)
- num_disjoint_paths = None
+ num_disjoint_paths = 0
for constraint in request.service_constraints:
if constraint.WhichOneof('constraint') == 'sla_availability':
num_disjoint_paths = constraint.sla_availability.num_disjoint_paths
break
+ num_disjoint_paths = 1 if num_disjoint_paths is None or num_disjoint_paths == 0 else num_disjoint_paths
+ num_expected_endpoints = num_disjoint_paths * 2
+
tasks_scheduler = TasksScheduler(self.service_handler_factory)
- if len(service_with_uuids.service_endpoint_ids) >= (2 if num_disjoint_paths is None else 4):
+ if len(service_with_uuids.service_endpoint_ids) >= num_expected_endpoints:
pathcomp_request = PathCompRequest()
pathcomp_request.services.append(service_with_uuids) # pylint: disable=no-member
- if num_disjoint_paths is None:
+ if num_disjoint_paths is None or num_disjoint_paths in {0, 1}:
pathcomp_request.shortest_path.Clear() # pylint: disable=no-member
else:
pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths # pylint: disable=no-member
- LOGGER.info('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))
+ LOGGER.debug('pathcomp_request={:s}'.format(grpc_message_to_json_string(pathcomp_request)))
pathcomp = PathCompClient()
pathcomp_reply = pathcomp.Compute(pathcomp_request)
pathcomp.close()
- LOGGER.info('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply)))
+ LOGGER.debug('pathcomp_reply={:s}'.format(grpc_message_to_json_string(pathcomp_reply)))
# Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
# the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
@@ -144,8 +143,6 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def DeleteService(self, request : ServiceId, context : grpc.ServicerContext) -> Empty:
- LOGGER.info('[DeleteService] begin ; request = {:s}'.format(grpc_message_to_json_string(request)))
-
context_client = ContextClient()
# Set service status to "SERVICESTATUS_PENDING_REMOVAL" to ensure rest of components are aware the service is
diff --git a/src/slice/service/SliceServiceServicerImpl.py b/src/slice/service/SliceServiceServicerImpl.py
index 21d820089aad9531834187e129d893e90f3c93a8..d49f1c547e473a9999bed06508f249cb9afcf275 100644
--- a/src/slice/service/SliceServiceServicerImpl.py
+++ b/src/slice/service/SliceServiceServicerImpl.py
@@ -24,7 +24,7 @@ from common.tools.grpc.ConfigRules import copy_config_rules
from common.tools.grpc.Constraints import copy_constraints
from common.tools.grpc.EndPointIds import copy_endpoint_ids
from common.tools.grpc.ServiceIds import update_service_ids
-from common.tools.grpc.Tools import grpc_message_to_json_string
+#from common.tools.grpc.Tools import grpc_message_to_json_string
from context.client.ContextClient import ContextClient
from interdomain.client.InterdomainClient import InterdomainClient
from service.client.ServiceClient import ServiceClient
@@ -109,13 +109,13 @@ class SliceServiceServicerImpl(SliceServiceServicer):
service_request.service_type = ServiceTypeEnum.SERVICETYPE_UNKNOWN
for config_rule in request.slice_config.config_rules:
- LOGGER.info('config_rule: {:s}'.format(grpc_message_to_json_string(config_rule)))
+ #LOGGER.debug('config_rule: {:s}'.format(grpc_message_to_json_string(config_rule)))
config_rule_kind = config_rule.WhichOneof('config_rule')
- LOGGER.info('config_rule_kind: {:s}'.format(str(config_rule_kind)))
+ #LOGGER.debug('config_rule_kind: {:s}'.format(str(config_rule_kind)))
if config_rule_kind != 'custom': continue
custom = config_rule.custom
resource_key = custom.resource_key
- LOGGER.info('resource_key: {:s}'.format(str(resource_key)))
+ #LOGGER.debug('resource_key: {:s}'.format(str(resource_key)))
# TODO: parse resource key with regular expression, e.g.:
# m = re.match('\/device\[[^\]]\]\/endpoint\[[^\]]\]\/settings', s)
@@ -123,21 +123,21 @@ class SliceServiceServicerImpl(SliceServiceServicer):
if not resource_key.endswith('/settings'): continue
resource_value = json.loads(custom.resource_value)
- LOGGER.info('resource_value: {:s}'.format(str(resource_value)))
+ #LOGGER.debug('resource_value: {:s}'.format(str(resource_value)))
if service_request.service_type == ServiceTypeEnum.SERVICETYPE_UNKNOWN:
if (resource_value.get('address_ip') is not None and \
resource_value.get('address_prefix') is not None):
service_request.service_type = ServiceTypeEnum.SERVICETYPE_L3NM
- LOGGER.info('is L3')
+ #LOGGER.debug('is L3')
else:
service_request.service_type = ServiceTypeEnum.SERVICETYPE_L2NM
- LOGGER.info('is L2')
+ #LOGGER.debug('is L2')
break
if service_request.service_type == ServiceTypeEnum.SERVICETYPE_UNKNOWN:
service_request.service_type = ServiceTypeEnum.SERVICETYPE_L2NM
- LOGGER.info('assume L2')
+ #LOGGER.debug('assume L2')
service_client.UpdateService(service_request)
diff --git a/src/tests/benchmark/policy/deploy_specs.sh b/src/tests/benchmark/policy/deploy_specs.sh
index 12a45ef92a538ff48682fe45172a27d77b2800a0..7d408f003ce411566b9bf2435d89c72ff5db1459 100755
--- a/src/tests/benchmark/policy/deploy_specs.sh
+++ b/src/tests/benchmark/policy/deploy_specs.sh
@@ -4,7 +4,7 @@
# 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
+# 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,
@@ -12,21 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Set the URL of your local Docker registry where the images will be uploaded to.
-export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
+
+# ----- 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.
-# Supported components are:
-# context device automation policy service compute monitoring webui
-# interdomain slice pathcomp dlt
-# dbscanserving opticalattackmitigator opticalattackdetector
-# l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector
export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui"
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
-# Set the name of the Kubernetes namespace to deploy to.
+# 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
@@ -35,6 +33,60 @@ export TFS_EXTRA_MANIFESTS="manifests/nginx_ingress_http.yaml"
# Set the new Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"
-# If not already set, disable skip-build flag.
-# 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:-""}
+# 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 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=""
+
+# Disable flag for re-deploying CockroachDB from scratch.
+export CRDB_REDEPLOY=""
+
+
+# ----- NATS -------------------------------------------------------------------
+
+# Set the namespace where NATS will be deployed.
+export NATS_NAMESPACE="nats"
+
+# 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 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"
+
+# Disable flag for dropping tables if they exist.
+export QDB_DROP_TABLES_IF_EXIST=""
+
+# Disable flag for re-deploying QuestDB from scratch.
+export QDB_REDEPLOY=""
diff --git a/src/tests/benchmark/policy/tests/test_functional_bootstrap.py b/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
index 65c46b4eb5aea8d5762484d1558c14745acf83ed..ca1882aaa22ff1ac20d0b1927199a6594a6c441a 100644
--- a/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
+++ b/src/tests/benchmark/policy/tests/test_functional_bootstrap.py
@@ -13,10 +13,10 @@
# limitations under the License.
import logging, time
+from common.Constants import DEFAULT_CONTEXT_NAME
from common.proto.context_pb2 import ContextId, Empty
from common.proto.monitoring_pb2 import KpiDescriptorList
-from common.tests.LoadScenario import load_scenario_from_descriptor
-from common.tools.grpc.Tools import grpc_message_to_json_string
+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
@@ -27,44 +27,25 @@ LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = 'ofc22/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:
- # ----- List entities - Ensure database is empty -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
+ validate_empty_scenario(context_client)
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 0
-
-
- # ----- Load Scenario ----------------------------------------------------------------------------------------------
- descriptor_loader = load_scenario_from_descriptor(
- DESCRIPTOR_FILE, context_client, device_client, None, None)
-
-
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
+ 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()
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # 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
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
def test_scenario_kpis_created(
context_client : ContextClient, # pylint: disable=redefined-outer-name
diff --git a/src/tests/benchmark/policy/tests/test_functional_cleanup.py b/src/tests/benchmark/policy/tests/test_functional_cleanup.py
index e00c5ceeea6c59bf11bd2961802a9a3b805c5d2c..122526840796310519f8fe0feb8921e51467b21f 100644
--- a/src/tests/benchmark/policy/tests/test_functional_cleanup.py
+++ b/src/tests/benchmark/policy/tests/test_functional_cleanup.py
@@ -13,9 +13,10 @@
# limitations under the License.
import logging
-from common.tools.descriptor.Loader import DescriptorLoader
+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 common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from tests.Fixtures import context_client, device_client # pylint: disable=unused-import
@@ -24,57 +25,20 @@ LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
+ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-
-def test_services_removed(
+def test_scenario_cleanup(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
) -> None:
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
-
-
- # ----- Delete Links, Devices, Topologies, Contexts ----------------------------------------------------------------
- for link in descriptor_loader.links:
- context_client.RemoveLink(LinkId(**link['link_id']))
-
- for device in descriptor_loader.devices:
- device_client .DeleteDevice(DeviceId(**device['device_id']))
-
- for context_uuid, topology_list in descriptor_loader.topologies.items():
- for topology in topology_list:
- context_client.RemoveTopology(TopologyId(**topology['topology_id']))
-
- for context in descriptor_loader.contexts:
- context_client.RemoveContext(ContextId(**context['context_id']))
-
-
- # ----- List entities - Ensure database is empty again -------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 0
+ # 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/benchmark/policy/tests/test_functional_create_service.py b/src/tests/benchmark/policy/tests/test_functional_create_service.py
index 919f81979305831b69a82f13fbe4b70bd20ea70f..dd7761f3871db48752f313dc53e8b7d2e2c38489 100644
--- a/src/tests/benchmark/policy/tests/test_functional_create_service.py
+++ b/src/tests/benchmark/policy/tests/test_functional_create_service.py
@@ -13,83 +13,61 @@
# limitations under the License.
import logging, random
-from common.DeviceTypes import DeviceTypeEnum
-from common.proto.context_pb2 import ContextId, Empty
+from common.Constants import DEFAULT_CONTEXT_NAME
+from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
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 monitoring.client.MonitoringClient import MonitoringClient
-from tests.Fixtures import context_client, device_client, monitoring_client # pylint: disable=unused-import
+from tests.Fixtures import context_client, monitoring_client # pylint: disable=unused-import
from tests.tools.mock_osm.MockOSM import MockOSM
-from .Fixtures import osm_wim # pylint: disable=unused-import
+from .Fixtures import osm_wim # pylint: disable=unused-import
from .Objects import WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
-DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value
-DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value
-
DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
+ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
+ # 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
- # ----- Create Service ---------------------------------------------------------------------------------------------
+ # Create Connectivity Service
service_uuid = osm_wim.create_connectivity_service(WIM_SERVICE_TYPE, WIM_SERVICE_CONNECTION_POINTS)
osm_wim.get_connectivity_service_status(service_uuid)
-
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
- assert len(response.services) == 2*num_services # OLS & L3NM => (L3NM + TAPI)
-
- for service in response.services:
- service_id = service.service_id
- response = context_client.ListConnections(service_id)
- LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
- grpc_message_to_json_string(service_id), len(response.connections),
- grpc_message_to_json_string(response)))
- assert len(response.connections) == 1 # one connection per service
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
+
+ response = context_client.ListServices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
+ assert len(response.services) == 2 # 1xL3NM + 1xTAPI
+
+ for service in response.services:
+ service_id = service.service_id
+ response = context_client.ListConnections(service_id)
+ LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
+ grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
+
+ if service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM:
+ assert len(response.connections) == 1 # 1 connection per service
+ elif service.service_type == ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:
+ assert len(response.connections) == 1 # 1 connection per service
+ else:
+ str_service = grpc_message_to_json_string(service)
+ raise Exception('Unexpected ServiceType: {:s}'.format(str_service))
def test_scenario_kpi_values_created(
diff --git a/src/tests/benchmark/policy/tests/test_functional_delete_service.py b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
index 6f6ca602980fb05ffafd17f44a5bc64671c4c7b0..4fffc115e6c0ea881dea637dd741f99715d28c6a 100644
--- a/src/tests/benchmark/policy/tests/test_functional_delete_service.py
+++ b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
@@ -14,86 +14,61 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.DeviceTypes import DeviceTypeEnum
-from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
+from common.proto.context_pb2 import ContextId, ServiceTypeEnum
from common.tools.descriptor.Loader import DescriptorLoader
-from common.tools.object_factory.Context import json_context_id
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 tests.Fixtures import context_client # pylint: disable=unused-import
from tests.tools.mock_osm.MockOSM import MockOSM
-from .Fixtures import osm_wim # pylint: disable=unused-import
-
+from .Fixtures import osm_wim # pylint: disable=unused-import
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
-DEVTYPE_EMU_PR = DeviceTypeEnum.EMULATED_PACKET_ROUTER.value
-DEVTYPE_EMU_OLS = DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value
-
DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
-
+ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
- descriptor_loader = DescriptorLoader(descriptors)
+ response = context_client.ListServices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
+ assert len(response.services) == 2 # 1xL3NM + 1xTAPI
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- l3nm_service_uuids = set()
- response = context_client.ListServices(ContextId(**json_context_id(DEFAULT_CONTEXT_NAME)))
- assert len(response.services) == 2 # OLS & L3NM => (L3NM + TAPI)
+ service_uuids = set()
for service in response.services:
service_id = service.service_id
+ response = context_client.ListConnections(service_id)
+ LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
+ grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
if service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM:
+ assert len(response.connections) == 1 # 1 connection per service
service_uuid = service_id.service_uuid.uuid
- l3nm_service_uuids.add(service_uuid)
+ service_uuids.add(service_uuid)
osm_wim.conn_info[service_uuid] = {}
-
- response = context_client.ListConnections(service_id)
- LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
- grpc_message_to_json_string(service_id), len(response.connections),
- grpc_message_to_json_string(response)))
- assert len(response.connections) == 1 # one connection per service
+ elif service.service_type == ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:
+ assert len(response.connections) == 1 # 1 connection per service
+ else:
+ str_service = grpc_message_to_json_string(service)
+ raise Exception('Unexpected ServiceType: {:s}'.format(str_service))
# Identify service to delete
- assert len(l3nm_service_uuids) == 1 # assume a single L3NM service has been created
- l3nm_service_uuid = set(l3nm_service_uuids).pop()
-
-
- # ----- Delete Service ---------------------------------------------------------------------------------------------
- osm_wim.delete_connectivity_service(l3nm_service_uuid)
-
-
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
+ assert len(service_uuids) == 1 # assume a single L3NM service has been created
+ service_uuid = set(service_uuids).pop()
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
+ # Delete Connectivity Service
+ osm_wim.delete_connectivity_service(service_uuid)
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # 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
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
+ # Load descriptors and validate the base scenario
+ descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
+ descriptor_loader.validate()
diff --git a/src/tests/ecoc22/deploy_specs.sh b/src/tests/ecoc22/deploy_specs.sh
index 874774e1ca50830832e842e49b6fff1114cb85d8..6c3d9db662a8232f1fcccf3835b98d69571b6337 100755
--- a/src/tests/ecoc22/deploy_specs.sh
+++ b/src/tests/ecoc22/deploy_specs.sh
@@ -20,7 +20,6 @@
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 automation monitoring pathcomp service slice compute webui load_generator"
export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui"
# Set the tag you want to use for your images.
@@ -57,7 +56,7 @@ export CRDB_DATABASE="tfs"
# See ./deploy/all.sh or ./deploy/crdb.sh for additional details
export CRDB_DEPLOY_MODE="single"
-# Disable flag for dropping database, if exists.
+# Disable flag for dropping database, if it exists.
export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch.
@@ -75,20 +74,20 @@ export NATS_REDEPLOY=""
# ----- QuestDB ----------------------------------------------------------------
-# If not already set, set the namespace where QuestDB will be deployed.
+# Set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE="qdb"
-# If not already set, set the database username to be used by Monitoring.
+# Set the database username to be used for QuestDB.
export QDB_USERNAME="admin"
-# If not already set, set the database user's password to be used by Monitoring.
+# Set the database user's password to be used for QuestDB.
export QDB_PASSWORD="quest"
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE="tfs_monitoring"
+# Set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
-## If not already set, disable flag for dropping table if exists.
-#export QDB_DROP_TABLE_IF_EXISTS=""
+# Disable flag for dropping tables if they exist.
+export QDB_DROP_TABLES_IF_EXIST=""
-# If not already set, disable flag for re-deploying QuestDB from scratch.
+# Disable flag for re-deploying QuestDB from scratch.
export QDB_REDEPLOY=""
diff --git a/src/tests/ecoc22/tests/test_functional_bootstrap.py b/src/tests/ecoc22/tests/test_functional_bootstrap.py
index 3b7b5009c0dbe9d95b4ee8e2cdbe33d39008a7a1..05691d0b274df019a87bd870fec2b9ffa3245612 100644
--- a/src/tests/ecoc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ecoc22/tests/test_functional_bootstrap.py
@@ -14,8 +14,8 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, Empty
-from common.tests.LoadScenario import load_scenario_from_descriptor
+from common.proto.context_pb2 import ContextId
+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
@@ -31,45 +31,15 @@ def test_scenario_bootstrap(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
) -> None:
- # ----- List entities - Ensure database is empty -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
+ validate_empty_scenario(context_client)
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
+ 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()
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 0
-
-
- # ----- Load Scenario ----------------------------------------------------------------------------------------------
- descriptor_loader = load_scenario_from_descriptor(
- DESCRIPTOR_FILE, context_client, device_client, None, None)
-
-
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
-
- for context_uuid, _ in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == 0
-
- # This scenario assumes no services are created beforehand
+ # 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
diff --git a/src/tests/ecoc22/tests/test_functional_cleanup.py b/src/tests/ecoc22/tests/test_functional_cleanup.py
index 3e8b5ea65fe8249102ba17b9d4ce3f2cf2296dda..088c19799615169bf8c60ae5a9226fe02ec0e4ff 100644
--- a/src/tests/ecoc22/tests/test_functional_cleanup.py
+++ b/src/tests/ecoc22/tests/test_functional_cleanup.py
@@ -14,8 +14,8 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId
-from common.tools.descriptor.Loader import DescriptorLoader
+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
@@ -27,64 +27,18 @@ LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = 'ecoc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-def test_services_removed(
+def test_scenario_cleanup(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
) -> None:
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
-
- for context_uuid, _ in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == 0
-
- # This scenario assumes no services are created beforehand
+ # 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
-
- # ----- Delete Links, Devices, Topologies, Contexts ----------------------------------------------------------------
- for link in descriptor_loader.links:
- context_client.RemoveLink(LinkId(**link['link_id']))
-
- for device in descriptor_loader.devices:
- device_client .DeleteDevice(DeviceId(**device['device_id']))
-
- for context_uuid, topology_list in descriptor_loader.topologies.items():
- for topology in topology_list:
- context_client.RemoveTopology(TopologyId(**topology['topology_id']))
-
- for context in descriptor_loader.contexts:
- context_client.RemoveContext(ContextId(**context['context_id']))
-
-
- # ----- List entities - Ensure database is empty again -------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 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/ecoc22/tests/test_functional_create_service.py b/src/tests/ecoc22/tests/test_functional_create_service.py
index 6dd4eb827c0fbafdf0bce81c7702af5fd5fe007b..dab9c7eb131434a16dad01be4fb8cd6b6b322515 100644
--- a/src/tests/ecoc22/tests/test_functional_create_service.py
+++ b/src/tests/ecoc22/tests/test_functional_create_service.py
@@ -14,7 +14,7 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
+from common.proto.context_pb2 import ContextId, ServiceTypeEnum
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
@@ -31,57 +31,23 @@ DESCRIPTOR_FILE = 'ecoc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
+ # Load descriptors and validate the base scenario
+ descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
+ descriptor_loader.validate()
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == num_services
-
- for context_uuid, num_slices in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == num_slices
-
- # This scenario assumes no services are created beforehand
+ # 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
-
- # ----- Create Service ---------------------------------------------------------------------------------------------
+ # Create Connectivity Service
service_uuid = osm_wim.create_connectivity_service(WIM_SERVICE_TYPE, WIM_SERVICE_CONNECTION_POINTS)
osm_wim.get_connectivity_service_status(service_uuid)
-
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
diff --git a/src/tests/ecoc22/tests/test_functional_delete_service.py b/src/tests/ecoc22/tests/test_functional_delete_service.py
index 5cfdc34733d8ddc6927b52131a187fb097b36d9d..710e1a817f00f0b1664439d1c816195202a69a9d 100644
--- a/src/tests/ecoc22/tests/test_functional_delete_service.py
+++ b/src/tests/ecoc22/tests/test_functional_delete_service.py
@@ -14,14 +14,14 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
+from common.proto.context_pb2 import ContextId, ServiceTypeEnum
from common.tools.descriptor.Loader import DescriptorLoader
-from common.tools.object_factory.Context import json_context_id
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 tests.Fixtures import context_client # pylint: disable=unused-import
+from tests.Fixtures import context_client # pylint: disable=unused-import
from tests.tools.mock_osm.MockOSM import MockOSM
-from .Fixtures import osm_wim # pylint: disable=unused-import
+from .Fixtures import osm_wim # pylint: disable=unused-import
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
@@ -30,44 +30,27 @@ DESCRIPTOR_FILE = 'ecoc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
- service_uuids = set()
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
assert len(response.services) == 3 # 1xL2NM + 2xTAPI
+ service_uuids = set()
for service in response.services:
service_id = service.service_id
-
- if service.service_type == ServiceTypeEnum.SERVICETYPE_L2NM:
- service_uuid = service_id.service_uuid.uuid
- service_uuids.add(service_uuid)
- osm_wim.conn_info[service_uuid] = {}
-
response = context_client.ListConnections(service_id)
LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
if service.service_type == ServiceTypeEnum.SERVICETYPE_L2NM:
assert len(response.connections) == 2 # 2 connections per service (primary + backup)
+ service_uuid = service_id.service_uuid.uuid
+ service_uuids.add(service_uuid)
+ osm_wim.conn_info[service_uuid] = {}
elif service.service_type == ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:
assert len(response.connections) == 1 # 1 connection per service
else:
@@ -78,34 +61,14 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p
assert len(service_uuids) == 1 # assume a single L2NM service has been created
service_uuid = set(service_uuids).pop()
-
- # ----- Delete Service ---------------------------------------------------------------------------------------------
+ # Delete Connectivity Service
osm_wim.delete_connectivity_service(service_uuid)
-
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == num_services
-
- for context_uuid, num_slices in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == num_slices
-
- # This scenario assumes no services are created beforehand
+ # 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)
+ descriptor_loader.validate()
diff --git a/src/tests/ofc22/deploy_specs.sh b/src/tests/ofc22/deploy_specs.sh
index 874774e1ca50830832e842e49b6fff1114cb85d8..6c3d9db662a8232f1fcccf3835b98d69571b6337 100755
--- a/src/tests/ofc22/deploy_specs.sh
+++ b/src/tests/ofc22/deploy_specs.sh
@@ -20,7 +20,6 @@
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 automation monitoring pathcomp service slice compute webui load_generator"
export TFS_COMPONENTS="context device automation monitoring pathcomp service slice compute webui"
# Set the tag you want to use for your images.
@@ -57,7 +56,7 @@ export CRDB_DATABASE="tfs"
# See ./deploy/all.sh or ./deploy/crdb.sh for additional details
export CRDB_DEPLOY_MODE="single"
-# Disable flag for dropping database, if exists.
+# Disable flag for dropping database, if it exists.
export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch.
@@ -75,20 +74,20 @@ export NATS_REDEPLOY=""
# ----- QuestDB ----------------------------------------------------------------
-# If not already set, set the namespace where QuestDB will be deployed.
+# Set the namespace where QuestDB will be deployed.
export QDB_NAMESPACE="qdb"
-# If not already set, set the database username to be used by Monitoring.
+# Set the database username to be used for QuestDB.
export QDB_USERNAME="admin"
-# If not already set, set the database user's password to be used by Monitoring.
+# Set the database user's password to be used for QuestDB.
export QDB_PASSWORD="quest"
-# If not already set, set the table name to be used by Monitoring.
-export QDB_TABLE="tfs_monitoring"
+# Set the table name to be used by Monitoring for KPIs.
+export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
-## If not already set, disable flag for dropping table if exists.
-#export QDB_DROP_TABLE_IF_EXISTS=""
+# Disable flag for dropping tables if they exist.
+export QDB_DROP_TABLES_IF_EXIST=""
-# If not already set, disable flag for re-deploying QuestDB from scratch.
+# Disable flag for re-deploying QuestDB from scratch.
export QDB_REDEPLOY=""
diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py
index ad2d5703a931c933a9ab4e7162dd1985e5a33d9d..ca1882aaa22ff1ac20d0b1927199a6594a6c441a 100644
--- a/src/tests/ofc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ofc22/tests/test_functional_bootstrap.py
@@ -16,7 +16,7 @@ import logging, time
from common.Constants import DEFAULT_CONTEXT_NAME
from common.proto.context_pb2 import ContextId, Empty
from common.proto.monitoring_pb2 import KpiDescriptorList
-from common.tests.LoadScenario import load_scenario_from_descriptor
+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
@@ -33,45 +33,15 @@ def test_scenario_bootstrap(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
) -> None:
- # ----- List entities - Ensure database is empty -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
+ validate_empty_scenario(context_client)
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 0
-
-
- # ----- Load Scenario ----------------------------------------------------------------------------------------------
- descriptor_loader = load_scenario_from_descriptor(
- DESCRIPTOR_FILE, context_client, device_client, None, None)
-
-
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
-
- for context_uuid, _ in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == 0
+ 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()
- # This scenario assumes no services are created beforehand
+ # 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
diff --git a/src/tests/ofc22/tests/test_functional_cleanup.py b/src/tests/ofc22/tests/test_functional_cleanup.py
index d38b653b226639d5c8c831872a64ea1f9140ef8f..122526840796310519f8fe0feb8921e51467b21f 100644
--- a/src/tests/ofc22/tests/test_functional_cleanup.py
+++ b/src/tests/ofc22/tests/test_functional_cleanup.py
@@ -14,8 +14,8 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId
-from common.tools.descriptor.Loader import DescriptorLoader
+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
@@ -27,64 +27,18 @@ LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
-def test_services_removed(
+def test_scenario_cleanup(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
) -> None:
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, _ in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == 0
-
- for context_uuid, _ in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == 0
-
- # This scenario assumes no services are created beforehand
+ # 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
-
- # ----- Delete Links, Devices, Topologies, Contexts ----------------------------------------------------------------
- for link in descriptor_loader.links:
- context_client.RemoveLink(LinkId(**link['link_id']))
-
- for device in descriptor_loader.devices:
- device_client .DeleteDevice(DeviceId(**device['device_id']))
-
- for context_uuid, topology_list in descriptor_loader.topologies.items():
- for topology in topology_list:
- context_client.RemoveTopology(TopologyId(**topology['topology_id']))
-
- for context in descriptor_loader.contexts:
- context_client.RemoveContext(ContextId(**context['context_id']))
-
-
- # ----- List entities - Ensure database is empty again -------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == 0
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == 0
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == 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/ofc22/tests/test_functional_create_service.py b/src/tests/ofc22/tests/test_functional_create_service.py
index 92e0a74f9d291ea49422580fbdfad2c354aeeee2..dd7761f3871db48752f313dc53e8b7d2e2c38489 100644
--- a/src/tests/ofc22/tests/test_functional_create_service.py
+++ b/src/tests/ofc22/tests/test_functional_create_service.py
@@ -21,7 +21,7 @@ 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 monitoring.client.MonitoringClient import MonitoringClient
-from tests.Fixtures import context_client, device_client, monitoring_client # pylint: disable=unused-import
+from tests.Fixtures import context_client, monitoring_client # pylint: disable=unused-import
from tests.tools.mock_osm.MockOSM import MockOSM
from .Fixtures import osm_wim # pylint: disable=unused-import
from .Objects import WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE
@@ -33,61 +33,27 @@ DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
+ # Load descriptors and validate the base scenario
+ descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
+ descriptor_loader.validate()
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == num_services
-
- for context_uuid, num_slices in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == num_slices
-
- # This scenario assumes no services are created beforehand
+ # 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
-
- # ----- Create Service ---------------------------------------------------------------------------------------------
+ # Create Connectivity Service
service_uuid = osm_wim.create_connectivity_service(WIM_SERVICE_TYPE, WIM_SERVICE_CONNECTION_POINTS)
osm_wim.get_connectivity_service_status(service_uuid)
-
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
- assert len(response.services) == 2 # OLS & L3NM => (L3NM + TAPI)
+ assert len(response.services) == 2 # 1xL3NM + 1xTAPI
for service in response.services:
service_id = service.service_id
@@ -104,7 +70,6 @@ def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): #
raise Exception('Unexpected ServiceType: {:s}'.format(str_service))
-
def test_scenario_kpi_values_created(
monitoring_client: MonitoringClient, # pylint: disable=redefined-outer-name
) -> None:
diff --git a/src/tests/ofc22/tests/test_functional_delete_service.py b/src/tests/ofc22/tests/test_functional_delete_service.py
index 1811f219acf13b5cc17daf39f1931a6f630f997b..4fffc115e6c0ea881dea637dd741f99715d28c6a 100644
--- a/src/tests/ofc22/tests/test_functional_delete_service.py
+++ b/src/tests/ofc22/tests/test_functional_delete_service.py
@@ -14,10 +14,10 @@
import logging
from common.Constants import DEFAULT_CONTEXT_NAME
-from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
+from common.proto.context_pb2 import ContextId, ServiceTypeEnum
from common.tools.descriptor.Loader import DescriptorLoader
-from common.tools.object_factory.Context import json_context_id
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 tests.Fixtures import context_client # pylint: disable=unused-import
from tests.tools.mock_osm.MockOSM import MockOSM
@@ -30,44 +30,27 @@ DESCRIPTOR_FILE = 'ofc22/descriptors_emulated.json'
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # pylint: disable=redefined-outer-name
- # ----- List entities - Ensure service is created ------------------------------------------------------------------
- with open(DESCRIPTOR_FILE, 'r', encoding='UTF-8') as f:
- descriptors = f.read()
-
- descriptor_loader = DescriptorLoader(descriptors)
-
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
+ # Ensure slices and services are created
+ response = context_client.ListSlices(ADMIN_CONTEXT_ID)
+ LOGGER.info('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
+ assert len(response.slices) == 1 # OSM slice
- service_uuids = set()
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.info('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
- assert len(response.services) == 2 # OLS & L3NM => (L3NM + TAPI)
+ assert len(response.services) == 2 # 1xL3NM + 1xTAPI
+ service_uuids = set()
for service in response.services:
service_id = service.service_id
-
- if service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM:
- service_uuid = service_id.service_uuid.uuid
- service_uuids.add(service_uuid)
- osm_wim.conn_info[service_uuid] = {}
-
response = context_client.ListConnections(service_id)
LOGGER.info(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections), grpc_message_to_json_string(response)))
if service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM:
assert len(response.connections) == 1 # 1 connection per service
+ service_uuid = service_id.service_uuid.uuid
+ service_uuids.add(service_uuid)
+ osm_wim.conn_info[service_uuid] = {}
elif service.service_type == ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:
assert len(response.connections) == 1 # 1 connection per service
else:
@@ -78,34 +61,14 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p
assert len(service_uuids) == 1 # assume a single L3NM service has been created
service_uuid = set(service_uuids).pop()
-
- # ----- Delete Service ---------------------------------------------------------------------------------------------
+ # Delete Connectivity Service
osm_wim.delete_connectivity_service(service_uuid)
-
- # ----- List entities - Ensure service is removed ------------------------------------------------------------------
- response = context_client.ListContexts(Empty())
- assert len(response.contexts) == descriptor_loader.num_contexts
-
- for context_uuid, num_topologies in descriptor_loader.num_topologies.items():
- response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))
- assert len(response.topologies) == num_topologies
-
- response = context_client.ListDevices(Empty())
- assert len(response.devices) == descriptor_loader.num_devices
-
- response = context_client.ListLinks(Empty())
- assert len(response.links) == descriptor_loader.num_links
-
- for context_uuid, num_services in descriptor_loader.num_services.items():
- response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))
- assert len(response.services) == num_services
-
- for context_uuid, num_slices in descriptor_loader.num_slices.items():
- response = context_client.ListSlices(ContextId(**json_context_id(context_uuid)))
- assert len(response.slices) == num_slices
-
- # This scenario assumes no services are created beforehand
+ # 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)
+ descriptor_loader.validate()
diff --git a/src/tests/p4/tests/test_functional_bootstrap.py b/src/tests/p4/tests/test_functional_bootstrap.py
index 5e39490f23fe0635eaee502c1b8b8ffb9566f307..97269217336986a6a143a4a7ef94bd8b0710e9b0 100644
--- a/src/tests/p4/tests/test_functional_bootstrap.py
+++ b/src/tests/p4/tests/test_functional_bootstrap.py
@@ -106,8 +106,6 @@ def test_devices_bootstraping(
link_uuid = link['link_id']['link_uuid']['uuid']
LOGGER.info('Adding Link {:s}'.format(link_uuid))
response = context_client.SetLink(Link(**link))
- assert response.name == link_uuid
- context_client.SetLink(Link(**link))
def test_devices_bootstrapped(context_client : ContextClient): # pylint: disable=redefined-outer-name
# ----- List entities - Ensure bevices are created -----------------------------------------------------------------
diff --git a/src/tests/p4/tests/test_functional_cleanup.py b/src/tests/p4/tests/test_functional_cleanup.py
index 852f2a655dd5ba6cc80902a09d3b118b34d8da47..aad56a2104797ed7238241c4d3eda8eab3c1a907 100644
--- a/src/tests/p4/tests/test_functional_cleanup.py
+++ b/src/tests/p4/tests/test_functional_cleanup.py
@@ -58,7 +58,6 @@ def test_scenario_cleanup(
device_uuid = device_id['device_uuid']['uuid']
LOGGER.info('Deleting Device {:s}'.format(device_uuid))
device_client.DeleteDevice(DeviceId(**device_id))
- #expected_events.append(('DeviceEvent', EVENT_REMOVE, json_device_id(device_uuid)))
response = context_client.ListDevices(Empty())
assert len(response.devices) == 0
@@ -72,7 +71,6 @@ def test_scenario_cleanup(
LOGGER.info('Deleting Topology {:s}/{:s}'.format(context_uuid, topology_uuid))
context_client.RemoveTopology(TopologyId(**topology_id))
context_id = json_context_id(context_uuid)
- #expected_events.append(('TopologyEvent', EVENT_REMOVE, json_topology_id(topology_uuid, context_id=context_id)))
# ----- Delete Contexts and Validate Collected Events --------------------------------------------------------------
for context in CONTEXTS:
@@ -80,4 +78,3 @@ def test_scenario_cleanup(
context_uuid = context_id['context_uuid']['uuid']
LOGGER.info('Deleting Context {:s}'.format(context_uuid))
context_client.RemoveContext(ContextId(**context_id))
- #expected_events.append(('ContextEvent', EVENT_REMOVE, json_context_id(context_uuid)))
diff --git a/src/tests/p4/tests/test_functional_create_service.py b/src/tests/p4/tests/test_functional_create_service.py
index beaa23ba3e056fabb528fc7dc5dbebb43b0f019b..76a681eeaff30434663a2391509c3f266e89ecb0 100644
--- a/src/tests/p4/tests/test_functional_create_service.py
+++ b/src/tests/p4/tests/test_functional_create_service.py
@@ -54,15 +54,6 @@ def service_client():
def test_rules_entry(
context_client : ContextClient, device_client : DeviceClient, service_client : ServiceClient): # pylint: disable=redefined-outer-name
-
-
-# for device, _, __ in DEVICES:
-# # Enable device
-# device_p4_with_operational_status = copy.deepcopy(device)
-# device_p4_with_operational_status['device_operational_status'] = \
-# DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED
-# device_client.ConfigureDevice(Device(**device_p4_with_operational_status))
-
# ----- Create Services ---------------------------------------------------------------
for service, endpoints in SERVICES:
# Insert Service (table entries)
@@ -71,4 +62,4 @@ def test_rules_entry(
service_p4 = copy.deepcopy(service)
service_client.CreateService(Service(**service_p4))
service_p4['service_endpoint_ids'].extend(endpoints)
- service_client.UpdateService(Service(**service_p4))
\ No newline at end of file
+ service_client.UpdateService(Service(**service_p4))
diff --git a/src/tests/tools/load_scenario/__main__.py b/src/tests/tools/load_scenario/__main__.py
index 3559f778d7cf850c3bbb4f2d516f45f18423d28c..df1d5d8bf3d729a459ab6570e81e6ea05f47c981 100644
--- a/src/tests/tools/load_scenario/__main__.py
+++ b/src/tests/tools/load_scenario/__main__.py
@@ -13,7 +13,7 @@
# limitations under the License.
import logging, sys
-from common.tests.LoadScenario import load_scenario_from_descriptor
+from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
@@ -29,7 +29,12 @@ def main():
slice_client = SliceClient()
LOGGER.info('Loading scenario...')
- load_scenario_from_descriptor(sys.argv[1], context_client, device_client, service_client, slice_client)
+ descriptor_loader = DescriptorLoader(
+ descriptors_file=sys.argv[1], context_client=context_client, device_client=device_client,
+ service_client=service_client, slice_client=slice_client)
+ results = descriptor_loader.process()
+ check_descriptor_load_results(results, descriptor_loader)
+ descriptor_loader.validate()
LOGGER.info('Done!')
return 0
diff --git a/src/tests/tools/mock_sdn_ctrl/service_descriptor.json b/src/tests/tools/mock_sdn_ctrl/service_descriptor.json
index a4109bc7b18d2855f97f5bb329d4354a04b31607..2d4ed3eaf1834f24ba966fbcaac523ca9a3afb9a 100644
--- a/src/tests/tools/mock_sdn_ctrl/service_descriptor.json
+++ b/src/tests/tools/mock_sdn_ctrl/service_descriptor.json
@@ -12,8 +12,8 @@
{"device_id": {"device_uuid": {"uuid": "R3"}}, "endpoint_uuid": {"uuid": "EXT"}}
],
"service_constraints": [
- {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},
- {"custom": {"constraint_type": "latency[ms]", "constraint_value": "15.2"}}
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 15.2}}
],
"service_config": {"config_rules": [
{"action": 1, "custom": {"resource_key": "/settings", "resource_value": {
diff --git a/src/webui/grafana_dashboard_psql.json b/src/webui/grafana_db_mon_kpis_psql.json
similarity index 91%
rename from src/webui/grafana_dashboard_psql.json
rename to src/webui/grafana_db_mon_kpis_psql.json
index ec89c1647cc1086140b0bbd35354546c405ce910..750e5254ea1e4e689d92fc39cedd22a5ee619e03 100644
--- a/src/webui/grafana_dashboard_psql.json
+++ b/src/webui/grafana_db_mon_kpis_psql.json
@@ -33,7 +33,7 @@
{
"datasource": {
"type": "postgres",
- "uid": "questdb"
+ "uid": "questdb-mon-kpi"
},
"fieldConfig": {
"defaults": {
@@ -162,14 +162,14 @@
{
"datasource": {
"type": "postgres",
- "uid": "questdb"
+ "uid": "questdb-mon-kpi"
},
"format": "time_series",
"group": [],
"hide": false,
"metricColumn": "kpi_value",
"rawQuery": true,
- "rawSql": "SELECT\r\n $__time(timestamp), kpi_value AS metric, device_name, endpoint_name, kpi_sample_type\r\nFROM\r\n tfs_monitoring\r\nWHERE\r\n $__timeFilter(timestamp) AND device_name IN (${device_name}) AND endpoint_name IN (${endpoint_name}) AND kpi_sample_type IN (${kpi_sample_type})\r\nGROUP BY\r\n device_name, endpoint_name, kpi_sample_type\r\nORDER BY\r\n timestamp",
+ "rawSql": "SELECT\r\n $__time(timestamp), kpi_value AS metric, device_name, endpoint_name, kpi_sample_type\r\nFROM\r\n tfs_monitoring_kpis\r\nWHERE\r\n $__timeFilter(timestamp) AND device_name IN (${device_name}) AND endpoint_name IN (${endpoint_name}) AND kpi_sample_type IN (${kpi_sample_type})\r\nGROUP BY\r\n device_name, endpoint_name, kpi_sample_type\r\nORDER BY\r\n timestamp",
"refId": "A",
"select": [
[
@@ -181,7 +181,7 @@
}
]
],
- "table": "monitoring",
+ "table": "tfs_monitoring_kpis",
"timeColumn": "timestamp",
"where": [
{
@@ -227,16 +227,16 @@
},
"datasource": {
"type": "postgres",
- "uid": "questdb"
+ "uid": "questdb-mon-kpi"
},
- "definition": "SELECT DISTINCT device_name FROM tfs_monitoring;",
+ "definition": "SELECT DISTINCT device_name FROM tfs_monitoring_kpis;",
"hide": 0,
"includeAll": true,
"label": "Device",
"multi": true,
"name": "device_name",
"options": [],
- "query": "SELECT DISTINCT device_name FROM tfs_monitoring;",
+ "query": "SELECT DISTINCT device_name FROM tfs_monitoring_kpis;",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@@ -255,16 +255,16 @@
},
"datasource": {
"type": "postgres",
- "uid": "questdb"
+ "uid": "questdb-mon-kpi"
},
- "definition": "SELECT DISTINCT endpoint_name FROM tfs_monitoring WHERE device_name IN (${device_name})",
+ "definition": "SELECT DISTINCT endpoint_name FROM tfs_monitoring_kpis WHERE device_name IN (${device_name})",
"hide": 0,
"includeAll": true,
"label": "EndPoint",
"multi": true,
"name": "endpoint_name",
"options": [],
- "query": "SELECT DISTINCT endpoint_name FROM tfs_monitoring WHERE device_name IN (${device_name})",
+ "query": "SELECT DISTINCT endpoint_name FROM tfs_monitoring_kpis WHERE device_name IN (${device_name})",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@@ -283,16 +283,16 @@
},
"datasource": {
"type": "postgres",
- "uid": "questdb"
+ "uid": "questdb-mon-kpi"
},
- "definition": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring;",
+ "definition": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring_kpis;",
"hide": 0,
"includeAll": true,
"label": "Kpi Sample Type",
"multi": true,
"name": "kpi_sample_type",
"options": [],
- "query": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring;",
+ "query": "SELECT DISTINCT kpi_sample_type FROM tfs_monitoring_kpis;",
"refresh": 2,
"regex": "",
"skipUrlSync": false,
@@ -308,7 +308,7 @@
"timepicker": {},
"timezone": "utc",
"title": "L3 Monitoring",
- "uid": "tf-l3-monit",
+ "uid": "tfs-l3-monit",
"version": 6,
"weekStart": ""
}
diff --git a/src/webui/grafana_backup_dashboard.json b/src/webui/old/grafana_backup_dashboard.json
similarity index 100%
rename from src/webui/grafana_backup_dashboard.json
rename to src/webui/old/grafana_backup_dashboard.json
diff --git a/src/webui/grafana_dashboard.json b/src/webui/old/grafana_dashboard.json
similarity index 100%
rename from src/webui/grafana_dashboard.json
rename to src/webui/old/grafana_dashboard.json
diff --git a/src/webui/service/__init__.py b/src/webui/service/__init__.py
index d5b40b486dd7772cea29fd7d71db949b2954155c..ef5253b876085c152fa7a71ffb5a29cfd1f90516 100644
--- a/src/webui/service/__init__.py
+++ b/src/webui/service/__init__.py
@@ -96,6 +96,7 @@ def create_app(use_config=None, web_app_root=None):
app.register_blueprint(link)
app.jinja_env.globals.update({ # pylint: disable=no-member
+ 'enumerate' : enumerate,
'json_to_list' : json_to_list,
'get_working_context' : get_working_context,
'get_working_topology': get_working_topology,
diff --git a/src/webui/service/device/forms.py b/src/webui/service/device/forms.py
index e496c4d432c7c9d02227141ea6d618984378c185..c6bacac9bc1723a020f3057fad9c9e8306c9dbca 100644
--- a/src/webui/service/device/forms.py
+++ b/src/webui/service/device/forms.py
@@ -12,21 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# external imports
from flask_wtf import FlaskForm
-from wtforms import StringField, SelectField, TextAreaField, SubmitField, BooleanField, Form
-from wtforms.validators import DataRequired, Length, NumberRange, Regexp, ValidationError
+from wtforms import StringField, SelectField, TextAreaField, SubmitField, BooleanField
+from wtforms.validators import DataRequired, Length, NumberRange, ValidationError
from common.proto.context_pb2 import DeviceOperationalStatusEnum
-from webui.utils.form_validators import key_value_validator
class AddDeviceForm(FlaskForm):
device_id = StringField('ID',
validators=[DataRequired(), Length(min=5)])
- device_type = SelectField('Type', choices = [])
- operational_status = SelectField('Operational Status',
- # choices=[(-1, 'Select...'), (0, 'Undefined'), (1, 'Disabled'), (2, 'Enabled')],
- coerce=int,
- validators=[NumberRange(min=0)])
+ device_type = SelectField('Type')
+ operational_status = SelectField('Operational Status', coerce=int, validators=[NumberRange(min=0)])
device_drivers_undefined = BooleanField('UNDEFINED / EMULATED')
device_drivers_openconfig = BooleanField('OPENCONFIG')
device_drivers_transport_api = BooleanField('TRANSPORT_API')
diff --git a/src/webui/service/device/routes.py b/src/webui/service/device/routes.py
index ce3edcfda45859c3e5db83c62fd328ee546762a5..ebf77a35ffdf9c2546ddbdd1bac0c8c1f54a2b56 100644
--- a/src/webui/service/device/routes.py
+++ b/src/webui/service/device/routes.py
@@ -14,16 +14,14 @@
import json
from flask import current_app, render_template, Blueprint, flash, session, redirect, url_for
+from common.DeviceTypes import DeviceTypeEnum
from common.proto.context_pb2 import (
- ConfigActionEnum, Device, DeviceDriverEnum, DeviceId, DeviceList, DeviceOperationalStatusEnum, Empty, TopologyId)
-from common.tools.object_factory.Context import json_context_id
-from common.tools.object_factory.Topology import json_topology_id
+ ConfigActionEnum, Device, DeviceDriverEnum, DeviceId, DeviceList, DeviceOperationalStatusEnum, Empty)
+from common.tools.context_queries.Device import get_device
+from common.tools.context_queries.Topology import get_topology
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
-from webui.service.device.forms import AddDeviceForm
-from common.DeviceTypes import DeviceTypeEnum
-from webui.service.device.forms import ConfigForm
-from webui.service.device.forms import UpdateDeviceForm
+from webui.service.device.forms import AddDeviceForm, ConfigForm, UpdateDeviceForm
device = Blueprint('device', __name__, url_prefix='/device')
context_client = ContextClient()
@@ -39,17 +37,19 @@ def home():
topology_uuid = session['topology_uuid']
context_client.connect()
- json_topo_id = json_topology_id(topology_uuid, context_id=json_context_id(context_uuid))
- grpc_topology = context_client.GetTopology(TopologyId(**json_topo_id))
- topo_device_uuids = {device_id.device_uuid.uuid for device_id in grpc_topology.device_ids}
- grpc_devices: DeviceList = context_client.ListDevices(Empty())
+ grpc_topology = get_topology(context_client, topology_uuid, context_uuid=context_uuid, rw_copy=False)
+ if grpc_topology is None:
+ flash('Context({:s})/Topology({:s}) not found'.format(str(context_uuid), str(topology_uuid)), 'danger')
+ devices = []
+ else:
+ topo_device_uuids = {device_id.device_uuid.uuid for device_id in grpc_topology.device_ids}
+ grpc_devices: DeviceList = context_client.ListDevices(Empty())
+ devices = [
+ device for device in grpc_devices.devices
+ if device.device_id.device_uuid.uuid in topo_device_uuids
+ ]
context_client.close()
- devices = [
- device for device in grpc_devices.devices
- if device.device_id.device_uuid.uuid in topo_device_uuids
- ]
-
return render_template(
'device/home.html', devices=devices, dde=DeviceDriverEnum,
dose=DeviceOperationalStatusEnum)
@@ -71,23 +71,23 @@ def add():
if form.validate_on_submit():
device_obj = Device()
# Device UUID:
- device_obj.device_id.device_uuid.uuid = form.device_id.data
+ device_obj.device_id.device_uuid.uuid = form.device_id.data # pylint: disable=no-member
# Device type:
device_obj.device_type = str(form.device_type.data)
# Device configurations:
- config_rule = device_obj.device_config.config_rules.add()
+ config_rule = device_obj.device_config.config_rules.add() # pylint: disable=no-member
config_rule.action = ConfigActionEnum.CONFIGACTION_SET
config_rule.custom.resource_key = '_connect/address'
config_rule.custom.resource_value = form.device_config_address.data
- config_rule = device_obj.device_config.config_rules.add()
+ config_rule = device_obj.device_config.config_rules.add() # pylint: disable=no-member
config_rule.action = ConfigActionEnum.CONFIGACTION_SET
config_rule.custom.resource_key = '_connect/port'
config_rule.custom.resource_value = form.device_config_port.data
- config_rule = device_obj.device_config.config_rules.add()
+ config_rule = device_obj.device_config.config_rules.add() # pylint: disable=no-member
config_rule.action = ConfigActionEnum.CONFIGACTION_SET
config_rule.custom.resource_key = '_connect/settings'
@@ -105,20 +105,22 @@ def add():
device_obj.device_operational_status = form.operational_status.data
# Device drivers:
+ device_drivers = list()
if form.device_drivers_undefined.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_UNDEFINED)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_UNDEFINED)
if form.device_drivers_openconfig.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG)
if form.device_drivers_transport_api.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API)
if form.device_drivers_p4.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_P4)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_P4)
if form.device_drivers_ietf_network_topology.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY)
if form.device_drivers_onf_tr_352.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352)
if form.device_drivers_xr.data:
- device_obj.device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_XR)
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_XR)
+ device_obj.device_drivers.extend(device_drivers) # pylint: disable=no-member
try:
device_client.connect()
@@ -126,7 +128,7 @@ def add():
device_client.close()
flash(f'New device was created with ID "{response.device_uuid.uuid}".', 'success')
return redirect(url_for('device.home'))
- except Exception as e:
+ except Exception as e: # pylint: disable=broad-except
flash(f'Problem adding the device. {e.details()}', 'danger')
return render_template('device/add.html', form=form,
@@ -134,14 +136,15 @@ def add():
@device.route('detail/<path:device_uuid>', methods=['GET', 'POST'])
def detail(device_uuid: str):
- request = DeviceId()
- request.device_uuid.uuid = device_uuid
context_client.connect()
- response = context_client.GetDevice(request)
+ device_obj = get_device(context_client, device_uuid, rw_copy=False)
+ if device_obj is None:
+ flash('Device({:s}) not found'.format(str(device_uuid)), 'danger')
+ device_obj = Device()
context_client.close()
- return render_template('device/detail.html', device=response,
- dde=DeviceDriverEnum,
- dose=DeviceOperationalStatusEnum)
+
+ return render_template(
+ 'device/detail.html', device=device_obj, dde=DeviceDriverEnum, dose=DeviceOperationalStatusEnum)
@device.get('<path:device_uuid>/delete')
def delete(device_uuid):
@@ -154,13 +157,13 @@ def delete(device_uuid):
# TODO: finalize implementation
request = DeviceId()
- request.device_uuid.uuid = device_uuid
+ request.device_uuid.uuid = device_uuid # pylint: disable=no-member
device_client.connect()
- response = device_client.DeleteDevice(request)
+ device_client.DeleteDevice(request)
device_client.close()
flash(f'Device "{device_uuid}" deleted successfully!', 'success')
- except Exception as e:
+ except Exception as e: # pylint: disable=broad-except
flash(f'Problem deleting device "{device_uuid}": {e.details()}', 'danger')
current_app.logger.exception(e)
return redirect(url_for('device.home'))
@@ -169,25 +172,25 @@ def delete(device_uuid):
def addconfig(device_uuid):
form = ConfigForm()
request = DeviceId()
- request.device_uuid.uuid = device_uuid
+ request.device_uuid.uuid = device_uuid # pylint: disable=no-member
context_client.connect()
response = context_client.GetDevice(request)
context_client.close()
if form.validate_on_submit():
- device = Device()
- device.CopyFrom(response)
- config_rule = device.device_config.config_rules.add()
+ device_obj = Device()
+ device_obj.CopyFrom(response)
+ config_rule = device_obj.device_config.config_rules.add() # pylint: disable=no-member
config_rule.action = ConfigActionEnum.CONFIGACTION_SET
config_rule.custom.resource_key = form.device_key_config.data
config_rule.custom.resource_value = form.device_value_config.data
try:
device_client.connect()
- response: DeviceId = device_client.ConfigureDevice(device)
+ response: DeviceId = device_client.ConfigureDevice(device_obj)
device_client.close()
flash(f'New configuration was created with ID "{response.device_uuid.uuid}".', 'success')
return redirect(url_for('device.home'))
- except Exception as e:
+ except Exception as e: # pylint: disable=broad-except
flash(f'Problem adding the device. {e.details()}', 'danger')
return render_template('device/addconfig.html', form=form, submit_text='Add New Configuration')
@@ -203,28 +206,29 @@ def updateconfig():
def update(device_uuid):
form = UpdateDeviceForm()
request = DeviceId()
- request.device_uuid.uuid = device_uuid
+ request.device_uuid.uuid = device_uuid # pylint: disable=no-member
context_client.connect()
response = context_client.GetDevice(request)
context_client.close()
# listing enum values
form.update_operational_status.choices = []
- for key, value in DeviceOperationalStatusEnum.DESCRIPTOR.values_by_name.items():
- form.update_operational_status.choices.append((DeviceOperationalStatusEnum.Value(key), key.replace('DEVICEOPERATIONALSTATUS_', '')))
+ for key, _ in DeviceOperationalStatusEnum.DESCRIPTOR.values_by_name.items():
+ item = (DeviceOperationalStatusEnum.Value(key), key.replace('DEVICEOPERATIONALSTATUS_', ''))
+ form.update_operational_status.choices.append(item)
form.update_operational_status.default = response.device_operational_status
if form.validate_on_submit():
- device = Device()
- device.CopyFrom(response)
- device.device_operational_status = form.update_operational_status.data
+ device_obj = Device()
+ device_obj.CopyFrom(response)
+ device_obj.device_operational_status = form.update_operational_status.data
try:
device_client.connect()
- response: DeviceId = device_client.ConfigureDevice(device)
+ response: DeviceId = device_client.ConfigureDevice(device_obj)
device_client.close()
flash(f'Status of device with ID "{response.device_uuid.uuid}" was updated.', 'success')
return redirect(url_for('device.home'))
- except Exception as e:
+ except Exception as e: # pylint: disable=broad-except
flash(f'Problem updating the device. {e.details()}', 'danger')
return render_template('device/update.html', device=response, form=form, submit_text='Update Device')
diff --git a/src/webui/service/link/routes.py b/src/webui/service/link/routes.py
index 9324ad0be6d9e72dfd3413863f0590f6ec595c3b..0fda8958e2ab2609969d2c1f68aaae61b7360b68 100644
--- a/src/webui/service/link/routes.py
+++ b/src/webui/service/link/routes.py
@@ -14,10 +14,10 @@
from flask import render_template, Blueprint, flash, session, redirect, url_for
-from common.proto.context_pb2 import Empty, LinkId, LinkList, TopologyId
+from common.proto.context_pb2 import Empty, Link, LinkList
from common.tools.context_queries.EndPoint import get_endpoint_names
-from common.tools.object_factory.Context import json_context_id
-from common.tools.object_factory.Topology import json_topology_id
+from common.tools.context_queries.Link import get_link
+from common.tools.context_queries.Topology import get_topology
from context.client.ContextClient import ContextClient
@@ -33,20 +33,21 @@ def home():
context_uuid = session['context_uuid']
topology_uuid = session['topology_uuid']
+ links, endpoint_ids = list(), list()
+ device_names, endpoints_data = dict(), dict()
+
context_client.connect()
- json_topo_id = json_topology_id(topology_uuid, context_id=json_context_id(context_uuid))
- grpc_topology = context_client.GetTopology(TopologyId(**json_topo_id))
- topo_link_uuids = {link_id.link_uuid.uuid for link_id in grpc_topology.link_ids}
- grpc_links: LinkList = context_client.ListLinks(Empty())
-
- endpoint_ids = []
- links = []
- for link_ in grpc_links.links:
- if link_.link_id.link_uuid.uuid not in topo_link_uuids: continue
- links.append(link_)
- endpoint_ids.extend(link_.link_endpoint_ids)
-
- device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+ grpc_topology = get_topology(context_client, topology_uuid, context_uuid=context_uuid, rw_copy=False)
+ if grpc_topology is None:
+ flash('Context({:s})/Topology({:s}) not found'.format(str(context_uuid), str(topology_uuid)), 'danger')
+ else:
+ topo_link_uuids = {link_id.link_uuid.uuid for link_id in grpc_topology.link_ids}
+ grpc_links: LinkList = context_client.ListLinks(Empty())
+ for link_ in grpc_links.links:
+ if link_.link_id.link_uuid.uuid not in topo_link_uuids: continue
+ links.append(link_)
+ endpoint_ids.extend(link_.link_endpoint_ids)
+ device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
context_client.close()
return render_template('link/home.html', links=links, device_names=device_names, endpoints_data=endpoints_data)
@@ -54,10 +55,13 @@ def home():
@link.route('detail/<path:link_uuid>', methods=('GET', 'POST'))
def detail(link_uuid: str):
- request = LinkId()
- request.link_uuid.uuid = link_uuid # pylint: disable=no-member
context_client.connect()
- response = context_client.GetLink(request)
- device_names, endpoints_data = get_endpoint_names(context_client, response.link_endpoint_ids)
+ link_obj = get_link(context_client, link_uuid, rw_copy=False)
+ if link_obj is None:
+ flash('Link({:s}) not found'.format(str(link_uuid)), 'danger')
+ link_obj = Link()
+ device_names, endpoints_data = dict(), dict()
+ else:
+ device_names, endpoints_data = get_endpoint_names(context_client, link_obj.link_endpoint_ids)
context_client.close()
- return render_template('link/detail.html',link=response, device_names=device_names, endpoints_data=endpoints_data)
+ return render_template('link/detail.html',link=link_obj, device_names=device_names, endpoints_data=endpoints_data)
diff --git a/src/webui/service/main/routes.py b/src/webui/service/main/routes.py
index dcbbf71a6fee6ebd040f14c7d0d2cb07ba9ee085..32cefddf3b2a8251623b60fd9fc039588cd6b9bb 100644
--- a/src/webui/service/main/routes.py
+++ b/src/webui/service/main/routes.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import base64, json, logging, re
+import base64, json, logging #, re
from flask import jsonify, redirect, render_template, Blueprint, flash, session, url_for, request
from common.proto.context_pb2 import ContextList, Empty, TopologyId, TopologyList
from common.tools.descriptor.Loader import DescriptorLoader, compose_notifications
@@ -55,7 +55,7 @@ def process_descriptors(descriptors):
def home():
context_client.connect()
device_client.connect()
- context_topology_form: ContextTopologyForm = ContextTopologyForm()
+ context_topology_form = ContextTopologyForm()
context_topology_form.context_topology.choices.append(('', 'Select...'))
contexts : ContextList = context_client.ListContexts(Empty())
@@ -87,6 +87,10 @@ def home():
#session['topology_name'] = topology_name
MSG = f'Context({context_name})/Topology({topology_name}) successfully selected.'
flash(MSG, 'success')
+
+ context_client.close()
+ device_client.close()
+
return redirect(url_for('main.home'))
#match = re.match('ctx\[([^\]]+)\]\/topo\[([^\]]+)\]', context_topology_uuid)
@@ -101,7 +105,7 @@ def home():
if 'context_topology_uuid' in session:
context_topology_form.context_topology.data = session['context_topology_uuid']
- descriptor_form: DescriptorForm = DescriptorForm()
+ descriptor_form = DescriptorForm()
try:
if descriptor_form.validate_on_submit():
process_descriptors(descriptor_form.descriptors)
diff --git a/src/webui/service/service/routes.py b/src/webui/service/service/routes.py
index ee9b092ae6828d7e2a82c66b1461c2f90853a803..defbe2cb003cc97830d6ec24db01bf8734a7f530 100644
--- a/src/webui/service/service/routes.py
+++ b/src/webui/service/service/routes.py
@@ -14,8 +14,11 @@
import grpc
from flask import current_app, redirect, render_template, Blueprint, flash, session, url_for
-from common.proto.context_pb2 import ContextId, Service, ServiceId, ServiceTypeEnum, ServiceStatusEnum, Connection
+from common.proto.context_pb2 import (
+ IsolationLevelEnum, Service, ServiceId, ServiceTypeEnum, ServiceStatusEnum, Connection)
+from common.tools.context_queries.Context import get_context
from common.tools.context_queries.EndPoint import get_endpoint_names
+from common.tools.context_queries.Service import get_service
from context.client.ContextClient import ContextClient
from service.client.ServiceClient import ServiceClient
@@ -26,93 +29,94 @@ service_client = ServiceClient()
@service.get('/')
def home():
- # flash('This is an info message', 'info')
- # flash('This is a danger message', 'danger')
-
- context_uuid = session.get('context_uuid', '-')
- if context_uuid == "-":
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
flash("Please select a context!", "warning")
return redirect(url_for("main.home"))
- request = ContextId()
- request.context_uuid.uuid = context_uuid
+ context_uuid = session['context_uuid']
+
context_client.connect()
- try:
- service_list = context_client.ListServices(request)
- # print(service_list)
- services = service_list.services
- context_found = True
- except grpc.RpcError as e:
- if e.code() != grpc.StatusCode.NOT_FOUND: raise
- if e.details() != 'Context({:s}) not found'.format(context_uuid): raise
- services = []
- context_found = False
-
- if context_found:
- endpoint_ids = []
- for service_ in services:
- endpoint_ids.extend(service_.service_endpoint_ids)
- device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+
+ context_obj = get_context(context_client, context_uuid, rw_copy=False)
+ if context_obj is None:
+ flash('Context({:s}) not found'.format(str(context_uuid)), 'danger')
+ services, device_names, endpoints_data = list(), list(), list()
else:
- device_names, endpoints_data = [],[]
+ try:
+ services = context_client.ListServices(context_obj.context_id)
+ services = services.services
+ except grpc.RpcError as e:
+ if e.code() != grpc.StatusCode.NOT_FOUND: raise
+ if e.details() != 'Context({:s}) not found'.format(context_uuid): raise
+ services, device_names, endpoints_data = list(), dict(), dict()
+ else:
+ endpoint_ids = list()
+ for service_ in services:
+ endpoint_ids.extend(service_.service_endpoint_ids)
+ device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
context_client.close()
return render_template(
'service/home.html', services=services, device_names=device_names, endpoints_data=endpoints_data,
- context_not_found=not context_found, ste=ServiceTypeEnum, sse=ServiceStatusEnum)
+ ste=ServiceTypeEnum, sse=ServiceStatusEnum)
@service.route('add', methods=['GET', 'POST'])
def add():
flash('Add service route called', 'danger')
raise NotImplementedError()
- return render_template('service/home.html')
+ #return render_template('service/home.html')
@service.get('<path:service_uuid>/detail')
def detail(service_uuid: str):
- context_uuid = session.get('context_uuid', '-')
- if context_uuid == "-":
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
flash("Please select a context!", "warning")
return redirect(url_for("main.home"))
-
- request: ServiceId = ServiceId()
- request.service_uuid.uuid = service_uuid
- request.context_id.context_uuid.uuid = context_uuid
+ context_uuid = session['context_uuid']
+
try:
context_client.connect()
- response: Service = context_client.GetService(request)
- connections: Connection = context_client.ListConnections(request)
- connections = connections.connections
- endpoint_ids = []
- endpoint_ids.extend(response.service_endpoint_ids)
- for connection in connections:
- endpoint_ids.extend(connection.path_hops_endpoint_ids)
- device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+ endpoint_ids = list()
+ service_obj = get_service(context_client, service_uuid, rw_copy=False)
+ if service_obj is None:
+ flash('Context({:s})/Service({:s}) not found'.format(str(context_uuid), str(service_uuid)), 'danger')
+ service_obj = Service()
+ else:
+ endpoint_ids.extend(service_obj.service_endpoint_ids)
+ connections: Connection = context_client.ListConnections(service_obj.service_id)
+ connections = connections.connections
+ for connection in connections: endpoint_ids.extend(connection.path_hops_endpoint_ids)
+
+ if len(endpoint_ids) > 0:
+ device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+ else:
+ device_names, endpoints_data = dict(), dict()
context_client.close()
+
+ return render_template(
+ 'service/detail.html', service=service_obj, connections=connections, device_names=device_names,
+ endpoints_data=endpoints_data, ste=ServiceTypeEnum, sse=ServiceStatusEnum, ile=IsolationLevelEnum)
except Exception as e:
flash('The system encountered an error and cannot show the details of this service.', 'warning')
current_app.logger.exception(e)
return redirect(url_for('service.home'))
- return render_template(
- 'service/detail.html', service=response, connections=connections, device_names=device_names,
- endpoints_data=endpoints_data, ste=ServiceTypeEnum, sse=ServiceStatusEnum)
@service.get('<path:service_uuid>/delete')
def delete(service_uuid: str):
- context_uuid = session.get('context_uuid', '-')
- if context_uuid == "-":
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
flash("Please select a context!", "warning")
return redirect(url_for("main.home"))
+ context_uuid = session['context_uuid']
try:
request = ServiceId()
request.service_uuid.uuid = service_uuid
request.context_id.context_uuid.uuid = context_uuid
service_client.connect()
- response = service_client.DeleteService(request)
+ service_client.DeleteService(request)
service_client.close()
flash('Service "{:s}" deleted successfully!'.format(service_uuid), 'success')
diff --git a/src/webui/service/slice/routes.py b/src/webui/service/slice/routes.py
index 222508418a187bcab18f7d44fccf896c917c6821..cd1b672d5c1014b0e8aa301ed7b5a1f6d910f6df 100644
--- a/src/webui/service/slice/routes.py
+++ b/src/webui/service/slice/routes.py
@@ -11,11 +11,13 @@
# 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 grpc
from flask import current_app, redirect, render_template, Blueprint, flash, session, url_for
-from common.proto.context_pb2 import ContextId, Slice, SliceId, SliceStatusEnum
+from common.proto.context_pb2 import IsolationLevelEnum, Slice, SliceId, SliceStatusEnum
+from common.tools.context_queries.Context import get_context
from common.tools.context_queries.EndPoint import get_endpoint_names
+from common.tools.context_queries.Slice import get_slice
from context.client.ContextClient import ContextClient
from slice.client.SliceClient import SliceClient
@@ -26,92 +28,88 @@ slice_client = SliceClient()
@slice.get('/')
def home():
- context_uuid = session.get('context_uuid', '-')
- if context_uuid == "-":
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
flash("Please select a context!", "warning")
return redirect(url_for("main.home"))
- request = ContextId()
- request.context_uuid.uuid = context_uuid
+ context_uuid = session['context_uuid']
+
context_client.connect()
- try:
- slice_list = context_client.ListSlices(request)
- slices = slice_list.slices
- context_found = True
- except grpc.RpcError as e:
- if e.code() != grpc.StatusCode.NOT_FOUND: raise
- if e.details() != 'Context({:s}) not found'.format(context_uuid): raise
- slices = []
- context_found = False
-
- if context_found:
- endpoint_ids = []
- for slice_ in slices:
- endpoint_ids.extend(slice_.slice_endpoint_ids)
- device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+
+ context_obj = get_context(context_client, context_uuid, rw_copy=False)
+ if context_obj is None:
+ flash('Context({:s}) not found'.format(str(context_uuid)), 'danger')
+ device_names, endpoints_data = list(), list()
else:
- device_names, endpoints_data = [],[]
+ try:
+ slices = context_client.ListSlices(context_obj.context_id)
+ slices = slices.slices
+ except grpc.RpcError as e:
+ if e.code() != grpc.StatusCode.NOT_FOUND: raise
+ if e.details() != 'Context({:s}) not found'.format(context_uuid): raise
+ slices, device_names, endpoints_data = list(), dict(), dict()
+ else:
+ endpoint_ids = list()
+ for slice_ in slices:
+ endpoint_ids.extend(slice_.slice_endpoint_ids)
+ device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
context_client.close()
-
return render_template(
'slice/home.html', slices=slices, device_names=device_names, endpoints_data=endpoints_data,
- context_not_found=not context_found, sse=SliceStatusEnum)
+ sse=SliceStatusEnum)
@slice.route('add', methods=['GET', 'POST'])
def add():
flash('Add slice route called', 'danger')
raise NotImplementedError()
- return render_template('slice/home.html')
+ #return render_template('slice/home.html')
@slice.get('<path:slice_uuid>/detail')
def detail(slice_uuid: str):
- context_uuid = session.get('context_uuid', '-')
- if context_uuid == "-":
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
flash("Please select a context!", "warning")
return redirect(url_for("main.home"))
-
- request: SliceId = SliceId()
- request.slice_uuid.uuid = slice_uuid
- request.context_id.context_uuid.uuid = context_uuid
- req = ContextId()
- req.context_uuid.uuid = context_uuid
+ context_uuid = session['context_uuid']
+
try:
context_client.connect()
- response: Slice = context_client.GetSlice(request)
- services = context_client.ListServices(req)
- endpoint_ids = []
- endpoint_ids.extend(response.slice_endpoint_ids)
- device_names, endpoints_data = get_endpoint_names(context_client, endpoint_ids)
+ slice_obj = get_slice(context_client, slice_uuid, rw_copy=False)
+ if slice_obj is None:
+ flash('Context({:s})/Slice({:s}) not found'.format(str(context_uuid), str(slice_uuid)), 'danger')
+ slice_obj = Slice()
+ else:
+ device_names, endpoints_data = get_endpoint_names(context_client, slice_obj.slice_endpoint_ids)
context_client.close()
+
+ return render_template(
+ 'slice/detail.html', slice=slice_obj, device_names=device_names, endpoints_data=endpoints_data,
+ sse=SliceStatusEnum, ile=IsolationLevelEnum)
except Exception as e:
flash('The system encountered an error and cannot show the details of this slice.', 'warning')
current_app.logger.exception(e)
return redirect(url_for('slice.home'))
- return render_template(
- 'slice/detail.html', slice=response, device_names=device_names, endpoints_data=endpoints_data,
- sse=SliceStatusEnum, services=services)
-
-#@slice.get('<path:slice_uuid>/delete')
-#def delete(slice_uuid: str):
-# context_uuid = session.get('context_uuid', '-')
-# if context_uuid == "-":
-# flash("Please select a context!", "warning")
-# return redirect(url_for("main.home"))
-#
-# try:
-# request = SliceId()
-# request.slice_uuid.uuid = slice_uuid
-# request.context_id.context_uuid.uuid = context_uuid
-# slice_client.connect()
-# response = slice_client.DeleteSlice(request)
-# slice_client.close()
-#
-# flash('Slice "{:s}" deleted successfully!'.format(slice_uuid), 'success')
-# except Exception as e:
-# flash('Problem deleting slice "{:s}": {:s}'.format(slice_uuid, str(e.details())), 'danger')
-# current_app.logger.exception(e)
-# return redirect(url_for('slice.home'))
+
+@slice.get('<path:slice_uuid>/delete')
+def delete(slice_uuid: str):
+ if 'context_uuid' not in session or 'topology_uuid' not in session:
+ flash("Please select a context!", "warning")
+ return redirect(url_for("main.home"))
+ context_uuid = session['context_uuid']
+
+ try:
+ request = SliceId()
+ request.slice_uuid.uuid = slice_uuid
+ request.context_id.context_uuid.uuid = context_uuid
+ slice_client.connect()
+ slice_client.DeleteSlice(request)
+ slice_client.close()
+
+ flash('Slice "{:s}" deleted successfully!'.format(slice_uuid), 'success')
+ except Exception as e:
+ flash('Problem deleting slice "{:s}": {:s}'.format(slice_uuid, str(e.details())), 'danger')
+ current_app.logger.exception(e)
+ return redirect(url_for('slice.home'))
diff --git a/src/webui/service/templates/base.html b/src/webui/service/templates/base.html
index 0aa022f1453eaa33a67212174cf9687a942b10f0..35999ebe1785a033097dd30bfd672ce3b9a91a87 100644
--- a/src/webui/service/templates/base.html
+++ b/src/webui/service/templates/base.html
@@ -103,7 +103,7 @@
</li>
</ul>
<span class="navbar-text" style="color: #fff;">
- Current Context(<b>{{ get_working_context() }}</b>)/Topology(<b>{{ get_working_topology() }}</b>)
+ Selected Context(<b>{{ get_working_context() }}</b>)/Topology(<b>{{ get_working_topology() }}</b>)
</span>
</div>
</div>
diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index de8bb4a81da5e595f33297070697b528dff26ff4..1b4b43f5ad12956ae8bb2b1a843ce5e57ef29a2c 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -29,13 +29,14 @@
<div class="col-sm-3">
<a id="update" class="btn btn-secondary" href="{{ url_for('device.update',device_uuid=device.device_id.device_uuid.uuid) }}">
<i class="bi bi-pencil-square"></i>
- Update
+ Update device
</a>
</div>
<div class="col-sm-3">
<!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete device</button> -->
<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
- <i class="bi bi-x-square"></i>Delete device
+ <i class="bi bi-x-square"></i>
+ Delete device
</button>
</div>
</div>
diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html
index b2160695173064b9863834a4d42c60a69cc913ba..b267f986c5e80af9f26b7beb060b284e2eb5b4d5 100644
--- a/src/webui/service/templates/service/detail.html
+++ b/src/webui/service/templates/service/detail.html
@@ -36,7 +36,8 @@
<div class="col-sm-3">
<!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete service</button> -->
<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
- <i class="bi bi-x-square"></i>Delete service
+ <i class="bi bi-x-square"></i>
+ Delete service
</button>
</div>
</div>
@@ -87,7 +88,7 @@
<thead>
<tr>
<th scope="col">Kind</th>
- <th scope="col">Type</th>
+ <th scope="col">Key/Type</th>
<th scope="col">Value</th>
</tr>
</thead>
@@ -135,6 +136,22 @@
</td>
<td>{{ constraint.endpoint_priority.priority }}</td>
</tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_capacity' %}
+ <tr>
+ <td>SLA Capacity</td>
+ <td>-</td>
+ <td>
+ {{ constraint.sla_capacity.capacity_gbps }} Gbps
+ </td>
+ </tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_latency' %}
+ <tr>
+ <td>SLA E2E Latency</td>
+ <td>-</td>
+ <td>
+ {{ constraint.sla_latency.e2e_latency_ms }} ms
+ </td>
+ </tr>
{% elif constraint.WhichOneof('constraint')=='sla_availability' %}
<tr>
<td>SLA Availability</td>
@@ -144,6 +161,17 @@
{% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active
</td>
</tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_isolation' %}
+ <tr>
+ <td>SLA Isolation</td>
+ <td>-</td>
+ <td>
+ {% for i,isolation_level in enumerate(constraint.sla_isolation.isolation_level) %}
+ {% if i > 0 %}, {% endif %}
+ {{ ile.Name(isolation_level) }}
+ {% endfor %}
+ </td>
+ </tr>
{% else %}
<tr>
<td>-</td>
@@ -185,34 +213,12 @@
{% endfor %}
</tbody>
</table>
-<!-- Modal -->
-<div class="modal fade" id="deleteModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
- aria-labelledby="staticBackdropLabel" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h5 class="modal-title" id="staticBackdropLabel">Delete service?</h5>
- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
- </div>
- <div class="modal-body">
- Are you sure you want to delete the service "{{ service.service_id.service_uuid.uuid }}"?
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">No</button>
- <a type="button" class="btn btn-danger"
- href="{{ url_for('service.delete', service_uuid=service.service_id.service_uuid.uuid) }}"><i
- class="bi bi-exclamation-diamond"></i>Yes</a>
- </div>
- </div>
- </div>
-</div>
-
<table class="table table-striped table-hover">
<thead>
<tr>
<th scope="col">Connection Id</th>
- <th scope="col">Sub-service</th>
+ <th scope="col">Sub-Service</th>
<th scope="col">Path</th>
</tr>
</thead>
@@ -258,8 +264,26 @@
</tbody>
</table>
+<!-- Modal -->
+<div class="modal fade" id="deleteModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
+ aria-labelledby="staticBackdropLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="staticBackdropLabel">Delete service?</h5>
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+ </div>
+ <div class="modal-body">
+ Are you sure you want to delete the service "{{ service.service_id.service_uuid.uuid }}"?
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">No</button>
+ <a type="button" class="btn btn-danger"
+ href="{{ url_for('service.delete', service_uuid=service.service_id.service_uuid.uuid) }}"><i
+ class="bi bi-exclamation-diamond"></i>Yes</a>
+ </div>
+ </div>
+ </div>
+</div>
-
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/webui/service/templates/slice/detail.html b/src/webui/service/templates/slice/detail.html
index 390f882d7058b825ecf9d2bce5689585f99b80aa..2c1b55afb84bbe9d5dde92fe574cca094040b7af 100644
--- a/src/webui/service/templates/slice/detail.html
+++ b/src/webui/service/templates/slice/detail.html
@@ -32,14 +32,14 @@
<i class="bi bi-pencil-square"></i>
Update
</a>
- </div>
- <div class="col-sm-3">-->
+ </div>-->
+ <div class="col-sm-3">
<!-- <button type="button" class="btn btn-danger"><i class="bi bi-x-square"></i>Delete slice</button> -->
- <!--<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
- <i class="bi bi-x-square"></i>Delete slice
+ <button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
+ <i class="bi bi-x-square"></i>
+ Delete slice
</button>
</div>
- -->
</div>
<div class="row mb-3">
@@ -88,7 +88,7 @@
<thead>
<tr>
<th scope="col">Kind</th>
- <th scope="col">Type</th>
+ <th scope="col">Key/Type</th>
<th scope="col">Value</th>
</tr>
</thead>
@@ -136,6 +136,22 @@
</td>
<td>{{ constraint.endpoint_priority.priority }}</td>
</tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_capacity' %}
+ <tr>
+ <td>SLA Capacity</td>
+ <td>-</td>
+ <td>
+ {{ constraint.sla_capacity.capacity_gbps }} Gbps
+ </td>
+ </tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_latency' %}
+ <tr>
+ <td>SLA E2E Latency</td>
+ <td>-</td>
+ <td>
+ {{ constraint.sla_latency.e2e_latency_ms }} ms
+ </td>
+ </tr>
{% elif constraint.WhichOneof('constraint')=='sla_availability' %}
<tr>
<td>SLA Availability</td>
@@ -145,6 +161,17 @@
{% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active
</td>
</tr>
+ {% elif constraint.WhichOneof('constraint')=='sla_isolation' %}
+ <tr>
+ <td>SLA Isolation</td>
+ <td>-</td>
+ <td>
+ {% for i,isolation_level in enumerate(constraint.sla_isolation.isolation_level) %}
+ {% if i > 0 %}, {% endif %}
+ {{ ile.Name(isolation_level) }}
+ {% endfor %}
+ </td>
+ </tr>
{% else %}
<tr>
<td>-</td>
@@ -191,7 +218,7 @@
<table class="table table-striped table-hover">
<thead>
<tr>
- <th scope="col">Service Id</th>
+ <th scope="col">Sub-Services</th>
</tr>
</thead>
<tbody>
@@ -219,7 +246,7 @@
<table class="table table-striped table-hover">
<thead>
<tr>
- <th scope="col">Sub-slices</th>
+ <th scope="col">Sub-Slices</th>
</tr>
</thead>
<tbody>
@@ -244,4 +271,27 @@
</table>
</div>
</div>
-{% endblock %}
\ No newline at end of file
+
+<!-- Modal -->
+<div class="modal fade" id="deleteModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
+ aria-labelledby="staticBackdropLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="staticBackdropLabel">Delete slice?</h5>
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+ </div>
+ <div class="modal-body">
+ Are you sure you want to delete the slice "{{ slice.slice_id.slice_uuid.uuid }}"?
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">No</button>
+ <a type="button" class="btn btn-danger"
+ href="{{ url_for('slice.delete', slice_uuid=slice.slice_id.slice_uuid.uuid) }}"><i
+ class="bi bi-exclamation-diamond"></i>Yes</a>
+ </div>
+ </div>
+ </div>
+</div>
+
+{% endblock %}