Commit 28b6adc4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge header fixing and code cleanup

parent f65b106e

deploy/tfs.sh

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ 
# See the License for the specific language governing permissions and

# See the License for the specific language governing permissions and

# limitations under the License.

# limitations under the License.





set -e





########################################################################################################################

########################################################################################################################

# Read deployment settings

# Read deployment settings

manifests/serviceservice.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ spec: 
        - containerPort: 9192

        - containerPort: 9192

        env:

        env:

        - name: LOG_LEVEL

        - name: LOG_LEVEL

          value: "DEBUG"

          value: "INFO"

        readinessProbe:

        readinessProbe:

          exec:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:3030"]

            command: ["/bin/grpc_health_probe", "-addr=:3030"]

manifests/teservice.yaml

+1 −1
Original line number Original line Diff line number Diff line 
# 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");

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# you may not use this file except in compliance with the License.

my_deploy.sh

+3 −3
Original line number Original line Diff line number Diff line
@@ -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.

# 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"

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

# Uncomment to activate Monitoring

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -37,6 +34,9 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} te" 
# Uncomment to activate L3 CyberSecurity

# Uncomment to activate L3 CyberSecurity

#export TFS_COMPONENTS="${TFS_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector"

#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.

# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"

export TFS_IMAGE_TAG="dev"

src/service/client/TEServiceClient.py

+1 −1
Original line number Original line Diff line number Diff line 
# 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");

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# you may not use this file except in compliance with the License.