From 28b6adc4e6321e31ddf6a3848998b9c88d6c12cd Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Wed, 12 Jul 2023 15:56:07 +0000 Subject: [PATCH] Pre-merge header fixing and code cleanup --- deploy/tfs.sh | 1 - manifests/serviceservice.yaml | 2 +- manifests/teservice.yaml | 2 +- my_deploy.sh | 6 +++--- src/service/client/TEServiceClient.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deploy/tfs.sh b/deploy/tfs.sh index ddc0d979c..e6a0c0c10 100755 --- a/deploy/tfs.sh +++ b/deploy/tfs.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -e ######################################################################################################################## # Read deployment settings diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml index 3865fd6c0..7d7bdaa4e 100644 --- a/manifests/serviceservice.yaml +++ b/manifests/serviceservice.yaml @@ -36,7 +36,7 @@ spec: - containerPort: 9192 env: - name: LOG_LEVEL - value: "DEBUG" + value: "INFO" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:3030"] diff --git a/manifests/teservice.yaml b/manifests/teservice.yaml index 30002bc52..15f1619df 100644 --- a/manifests/teservice.yaml +++ b/manifests/teservice.yaml @@ -1,4 +1,4 @@ -# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# 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. diff --git a/my_deploy.sh b/my_deploy.sh index f6664a858..888fc9890 100755 --- a/my_deploy.sh +++ b/my_deploy.sh @@ -22,9 +22,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 pathcomp service slice compute webui load_generator" -# Uncomment to activate TE -export TFS_COMPONENTS="${TFS_COMPONENTS} te" - # Uncomment to activate Monitoring #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" @@ -37,6 +34,9 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} te" # Uncomment to activate L3 CyberSecurity #export TFS_COMPONENTS="${TFS_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector" +# Uncomment to activate TE +#export TFS_COMPONENTS="${TFS_COMPONENTS} te" + # Set the tag you want to use for your images. export TFS_IMAGE_TAG="dev" diff --git a/src/service/client/TEServiceClient.py b/src/service/client/TEServiceClient.py index 8bbbe8f9b..19ca95bce 100644 --- a/src/service/client/TEServiceClient.py +++ b/src/service/client/TEServiceClient.py @@ -1,4 +1,4 @@ -# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/) +# 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. -- GitLab