Commit 89bcbb06 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Update deployment scripts and Dockerfile for component adjustments 

- Modify my_deploy.sh to uncomment resource_manager and pcep components.
- Update quick_deploy.sh to include resource_manager in the default components.
- Remove PCEP from DEFAULT_SERVICE_GRPC_PORTS in Constants.py.
- Upgrade OpenJDK installation from version 17 to 21 in Dockerfile.
parent 1b8078ac

my_deploy.sh

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

export TFS_COMPONENTS="context device pathcomp service slice nbi webui"



# Uncomment to activate Monitoring (old)

export TFS_COMPONENTS="${TFS_COMPONENTS} resource_manager"



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -34,11 +31,14 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} resource_manager" 
# Uncomment to activate QoS Profiles

#export TFS_COMPONENTS="${TFS_COMPONENTS} qos_profile"



# Uncomment to activate pcep

# export TFS_COMPONENTS="${TFS_COMPONENTS} pcep"



# Uncomment to activate BGP-LS Speaker

# export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"ç



# Uncomment to activate Resource Manager

export TFS_COMPONENTS="${TFS_COMPONENTS} resource_manager "



# Uncomment to activate PCEP

export TFS_COMPONENTS="${TFS_COMPONENTS} pcep"



# Uncomment to activate Optical Controller

#   To manage optical connections, "service" requires "opticalcontroller" to be deployed

quick_deploy.sh

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} 


# 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 pathcomp service slice nbi webui pcep"}

export TFS_COMPONENTS="context device pathcomp service slice nbi webui resource_manager pcep"



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}

src/common/Constants.py

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ DEFAULT_SERVICE_GRPC_PORTS = { 
    ServiceNameEnum.OPTICALATTACKMANAGER   .value : 10005,

    ServiceNameEnum.INTERDOMAIN            .value : 10010,

    ServiceNameEnum.PATHCOMP               .value : 10020,

    ServiceNameEnum.PCEP                   .value : 10050,

    ServiceNameEnum.TE                     .value : 10030,

    ServiceNameEnum.FORECASTER             .value : 10040,

    ServiceNameEnum.E2EORCHESTRATOR        .value : 10050,

src/pcep/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ RUN python3 -m pip install --upgrade pip 
RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools



# Install OpenJDK-11

# Install OpenJDK-21

RUN apt-get update && \

    apt-get install -y openjdk-17-jre && \

    apt-get install -y openjdk-21-jre && \

    apt-get clean;



# Get common Python packages