From e827571806b82ffa2a2d3675a292a13d52c5ea47 Mon Sep 17 00:00:00 2001
From: a-rhernandez <alvaro.ramirezhernandez.practicas@telefonica.com>
Date: Wed, 29 Jan 2025 09:19:10 +0100
Subject: [PATCH] Fix: Deployment Changes
---
my_deploy.sh | 4 +-
src/pcep/Dockerfile | 2 +-
src/pcep/database/LSP_DB.py | 3 +-
src/pcep/requirements.in | 2 +
src/pcep/service/PcepServiceServicerImpl.py | 84 ++++++++++-----------
5 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/my_deploy.sh b/my_deploy.sh
index f06586d4c..45bc2b2d0 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -20,7 +20,7 @@
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
# Set the list of components, separated by spaces, you want to build images for, and deploy.
-export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
+export TFS_COMPONENTS="context device pathcomp service slice nbi webui pcep"
# Uncomment to activate Monitoring (old)
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -29,7 +29,7 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene
#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api"
# Uncomment to activate pcep
-export TFS_COMPONENTS="${TFS_COMPONENTS} pcep"
+# export TFS_COMPONENTS="${TFS_COMPONENTS} pcep"
# Uncomment to activate BGP-LS Speaker
#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"
diff --git a/src/pcep/Dockerfile b/src/pcep/Dockerfile
index 8464ab719..c4f4c2ea9 100644
--- a/src/pcep/Dockerfile
+++ b/src/pcep/Dockerfile
@@ -16,7 +16,7 @@ FROM python:3.9-slim
# Install dependencies
RUN apt-get --yes --quiet --quiet update && \
- apt-get --yes --quiet --quiet install wget g++ && \
+ apt-get --yes --quiet --quiet install wget g++ libxml2-dev libxslt-dev iputils-ping && \
rm -rf /var/lib/apt/lists/*
# Set Python to show logs as they occur
diff --git a/src/pcep/database/LSP_DB.py b/src/pcep/database/LSP_DB.py
index 06441f7a8..ce9414b62 100644
--- a/src/pcep/database/LSP_DB.py
+++ b/src/pcep/database/LSP_DB.py
@@ -14,7 +14,8 @@ class LspDB:
self.db_engine = LSPEngine.get_engine()
if self.db_engine is None:
LOGGER.error('Unable to get SQLAlchemy DB Engine...')
- return False
+ return None
+ #return False
self.db_name = DB_NAME
self.Session = sessionmaker(bind=self.db_engine)
diff --git a/src/pcep/requirements.in b/src/pcep/requirements.in
index 8517fe446..73b143b05 100644
--- a/src/pcep/requirements.in
+++ b/src/pcep/requirements.in
@@ -15,6 +15,7 @@
anytree==2.8.0
APScheduler==3.8.1
+lxml==4.9.3
#networkx==2.6.3
#pydot==1.4.2
#redis==4.1.2
@@ -34,6 +35,7 @@ protobuf==3.20.*
prometheus_client==0.13.0
#DB
+psycopg2-binary==2.9.*
SQLAlchemy==1.4.*
sqlalchemy-cockroachdb==1.4.*
SQLAlchemy-Utils==0.38.*
\ No newline at end of file
diff --git a/src/pcep/service/PcepServiceServicerImpl.py b/src/pcep/service/PcepServiceServicerImpl.py
index 39eca7cf3..b0db895f9 100644
--- a/src/pcep/service/PcepServiceServicerImpl.py
+++ b/src/pcep/service/PcepServiceServicerImpl.py
@@ -42,7 +42,7 @@ class PcepServiceServicerImpl(PcepServiceServicer):
LOGGER.debug("(ConfiguratePCE) Create pce instance %s",request)
configurateIP=self.pcepServer.connectToJavaPcep(request.address)
#return PceIpRp(addressRp=configurateIP)
- return PceIpRp(addressRp="10.95.90.56")
+ return PceIpRp(addressRp="10.95.90.150")
@safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
def sendRequest(self, request : RequestRq, context : grpc.ServicerContext) -> RequestRp:
@@ -63,51 +63,51 @@ class PcepServiceServicerImpl(PcepServiceServicer):
- @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
- def GetLSPDescriptor(self, request: LspID, grpc_context: grpc.ServicerContext) -> LspDescriptor:
- response = LspDescriptor()
- LOGGER.info(f"Received gRPC message object: {request}")
+ # @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
+ # def GetLSPDescriptor(self, request: LspID, grpc_context: grpc.ServicerContext) -> LspDescriptor:
+ # response = LspDescriptor()
+ # LOGGER.info(f"Received gRPC message object: {request}")
- try:
- # Obtener el identificador del LSP desde la solicitud
- lsp_id_to_search = request.lsp_id.uuid # El LspID contiene el lsp_id que se busca
- row = self.lsp_db_obj.search_db_row_by_id(LspModel, 'lsp_id', lsp_id_to_search)
+ # try:
+ # # Obtener el identificador del LSP desde la solicitud
+ # lsp_id_to_search = request.lsp_id.uuid # El LspID contiene el lsp_id que se busca
+ # row = self.lsp_db_obj.search_db_row_by_id(LspModel, 'lsp_id', lsp_id_to_search)
- if row is None:
- LOGGER.info(f"No matching row found for LSP id: {lsp_id_to_search}")
- return Empty() # Si no se encuentra el LSP, devolvemos un Empty
+ # if row is None:
+ # LOGGER.info(f"No matching row found for LSP id: {lsp_id_to_search}")
+ # return Empty() # Si no se encuentra el LSP, devolvemos un Empty
- # Convertir la fila obtenida a un LspDescriptor y devolverla
- response = LspModel.convert_row_to_LspDescriptor(row)
- return response
+ # # Convertir la fila obtenida a un LspDescriptor y devolverla
+ # response = LspModel.convert_row_to_LspDescriptor(row)
+ # return response
- except Exception as e:
- LOGGER.error(f"Unable to search LSP id. Error: {e}")
- raise e
+ # except Exception as e:
+ # LOGGER.error(f"Unable to search LSP id. Error: {e}")
+ # raise e
- @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
- def SetKpiDescriptor(self, request: LspDescriptor, grpc_context: grpc.ServicerContext # type: ignore
- ) -> LspID: # type: ignore
- response = LspID()
- LOGGER.info("Received gRPC message object: {:}".format(request))
- try:
- lsp_to_insert = LspModel.convert_LspDescriptor_to_row(request)
- if (self.lsp_db_obj.add_row_to_db(lsp_to_insert)):
- response.lsp_id.uuid = request.lsp_id.uuid
- # LOGGER.info("Added Row: {:}".format(response))
- return response
- except Exception as e:
- LOGGER.info("Unable to create LspModel class object. {:}".format(e))
+ # @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
+ # def SetKpiDescriptor(self, request: LspDescriptor, grpc_context: grpc.ServicerContext # type: ignore
+ # ) -> LspID: # type: ignore
+ # response = LspID()
+ # LOGGER.info("Received gRPC message object: {:}".format(request))
+ # try:
+ # lsp_to_insert = LspModel.convert_LspDescriptor_to_row(request)
+ # if (self.lsp_db_obj.add_row_to_db(lsp_to_insert)):
+ # response.lsp_id.uuid = request.lsp_id.uuid
+ # # LOGGER.info("Added Row: {:}".format(response))
+ # return response
+ # except Exception as e:
+ # LOGGER.info("Unable to create LspModel class object. {:}".format(e))
- @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
- def DeleteKpiDescriptor(self, request: LspID, grpc_context: grpc.ServicerContext # type: ignore
- ) -> Empty: # type: ignore
- LOGGER.info("Received gRPC message object: {:}".format(request))
- try:
- lsp_id_to_search = request.lsp_id.uuid # El LspID contiene el lsp_id que se busca
- self.lsp_db_obj.delete_db_row_by_id(LspModel, 'kpi_id', lsp_id_to_search)
- except Exception as e:
- LOGGER.info('Unable to search kpi id. {:}'.format(e))
- finally:
- return Empty()
\ No newline at end of file
+ # @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
+ # def DeleteKpiDescriptor(self, request: LspID, grpc_context: grpc.ServicerContext # type: ignore
+ # ) -> Empty: # type: ignore
+ # LOGGER.info("Received gRPC message object: {:}".format(request))
+ # try:
+ # lsp_id_to_search = request.lsp_id.uuid # El LspID contiene el lsp_id que se busca
+ # self.lsp_db_obj.delete_db_row_by_id(LspModel, 'kpi_id', lsp_id_to_search)
+ # except Exception as e:
+ # LOGGER.info('Unable to search kpi id. {:}'.format(e))
+ # finally:
+ # return Empty()
\ No newline at end of file
--
GitLab