From d89126d436b6268ae6f51bb09114cbcfc6eab2fd Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 8 Feb 2024 18:02:17 +0000
Subject: [PATCH] BGPLS Speaker component:
- Updated Manifest resources
- Removed unneeded imports
- Corrected dependencies in Dockerfile
- Added missing requirements
---
manifests/bgpls_speakerservice.yaml | 8 ++++----
src/bgpls_speaker/Dockerfile | 6 ++----
src/bgpls_speaker/requirements.in | 1 +
.../service/BgplsServiceServicerImpl.py | 17 ++++++-----------
src/bgpls_speaker/service/__main__.py | 9 ++-------
5 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/manifests/bgpls_speakerservice.yaml b/manifests/bgpls_speakerservice.yaml
index 91e3c5271..aa985d13e 100644
--- a/manifests/bgpls_speakerservice.yaml
+++ b/manifests/bgpls_speakerservice.yaml
@@ -45,11 +45,11 @@ spec:
command: ["/bin/grpc_health_probe", "-addr=:20030"]
resources:
requests:
- cpu: 50m
- memory: 64Mi
+ cpu: 250m
+ memory: 128Mi
limits:
- cpu: 500m
- memory: 512Mi
+ cpu: 1000m
+ memory: 1024Mi
---
apiVersion: v1
kind: Service
diff --git a/src/bgpls_speaker/Dockerfile b/src/bgpls_speaker/Dockerfile
index d90ebf82b..efb4f0e57 100644
--- a/src/bgpls_speaker/Dockerfile
+++ b/src/bgpls_speaker/Dockerfile
@@ -135,10 +135,8 @@ COPY --from=build /var/teraflow/bgpls/service/java/netphony-topology/target/bgp-
# Add component files into working directory
WORKDIR /var/teraflow
-COPY src/context/. context/
-COPY src/device/. device/
-COPY src/pathcomp/frontend/. pathcomp/frontend/
-COPY src/service/. service/
+COPY src/context/__init__.py context/__init__.py
+COPY src/context/client/. context/client/
COPY src/bgpls_speaker/. bgpls_speaker/
# Start the service
diff --git a/src/bgpls_speaker/requirements.in b/src/bgpls_speaker/requirements.in
index b4a94b3cd..ad4499418 100644
--- a/src/bgpls_speaker/requirements.in
+++ b/src/bgpls_speaker/requirements.in
@@ -12,5 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+lxml==4.9.1
pytz==2021.3
xmltodict==0.12.0
diff --git a/src/bgpls_speaker/service/BgplsServiceServicerImpl.py b/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
index 5e61afafb..cc87bf095 100644
--- a/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
+++ b/src/bgpls_speaker/service/BgplsServiceServicerImpl.py
@@ -12,21 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import grpc, json, logging
-from typing import Optional
+import grpc, logging
from bgpls_speaker.service.tools.DiscoveredDBManager import DiscoveredDBManager, GetContextDevices
from bgpls_speaker.service.tools.GrpcServer import GrpcServer
from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
-from common.method_wrappers.ServiceExceptions import AlreadyExistsException, InvalidArgumentException
-from common.proto.context_pb2 import (DeviceId, Empty, EndPointId, Link, LinkId, Service, ServiceId, ServiceStatusEnum, ServiceTypeEnum, TopologyId,ContextId,Topology
- ,Device,DeviceDriverEnum, Uuid)
-from common.proto.pathcomp_pb2 import PathCompRequest
-from common.proto.service_pb2_grpc import ServiceServiceServicer
-from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string
+from common.proto.context_pb2 import DeviceId, Empty, EndPointId, Link, LinkId, Uuid
from context.client.ContextClient import ContextClient
-from pathcomp.frontend.client.PathCompClient import PathCompClient
-from common.proto.bgpls_pb2 import (BgplsSpeaker,BgplsSpeakerId, DiscoveredDeviceList,DiscoveredDevice,
- DiscoveredLink,DiscoveredLinkList,NodeDescriptors,BgplsSpeakerList)
+from common.proto.bgpls_pb2 import (
+ BgplsSpeaker, BgplsSpeakerId, DiscoveredDeviceList, DiscoveredDevice,
+ DiscoveredLink, DiscoveredLinkList, NodeDescriptors, BgplsSpeakerList
+)
from common.proto.bgpls_pb2_grpc import BgplsServiceServicer
LOGGER = logging.getLogger(__name__)
diff --git a/src/bgpls_speaker/service/__main__.py b/src/bgpls_speaker/service/__main__.py
index 3d3317e30..6f5595565 100644
--- a/src/bgpls_speaker/service/__main__.py
+++ b/src/bgpls_speaker/service/__main__.py
@@ -12,16 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import logging, signal, sys, threading, time
+import logging, signal, sys, threading
from prometheus_client import start_http_server
-from common.Constants import ServiceNameEnum
-from common.Settings import (
- ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,
- wait_for_environment_variables)
-from context.client.ContextClient import ContextClient
+from common.Settings import get_log_level, get_metrics_port
from .tools.DiscoveredDBManager import DiscoveredDBManager
from .BgplsService import BgplsService
-from .tools.JavaRunner import JavaRunner
from .tools.GrpcServer import GrpcServer
terminate = threading.Event()
--
GitLab