Commit 37977f22 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 51765439

manifests/interdomainservice.yaml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ spec: 
              value: "INFO"

            - name: TOPOLOGY_ABSTRACTOR

              value: "DISABLE"

            - name: DLT_INTEGRATION

              value: "DISABLE"

          readinessProbe:

            exec:

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

my_deploy.sh

+9 −8
Original line number Diff line number Diff line
@@ -62,12 +62,13 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene 
# Uncomment to activate E2E Orchestrator

#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"



# Uncomment to activate DLT

export TFS_COMPONENTS="${TFS_COMPONENTS} interdomain dlt"

export KEY_DIRECTORY_PATH="src/dlt/gateway/keys/priv_sk"

export CERT_DIRECTORY_PATH="src/dlt/gateway/keys/cert.pem"

export TLS_CERT_PATH="src/dlt/gateway/keys/ca.crt"



# Uncomment to activate DLT and Interdomain

#export TFS_COMPONENTS="${TFS_COMPONENTS} interdomain dlt"

#if [[ "$TFS_COMPONENTS" == *"dlt"* ]]; then

#    export KEY_DIRECTORY_PATH="src/dlt/gateway/keys/priv_sk"

#    export CERT_DIRECTORY_PATH="src/dlt/gateway/keys/cert.pem"

#    export TLS_CERT_PATH="src/dlt/gateway/keys/ca.crt"

#fi



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

export TFS_IMAGE_TAG="dev"
@@ -116,7 +117,7 @@ export CRDB_DATABASE="tfs" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS="YES"

export CRDB_DROP_DATABASE_IF_EXISTS=""



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""
@@ -168,7 +169,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis" 
export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"



# Disable flag for dropping tables if they exist.

export QDB_DROP_TABLES_IF_EXIST="YES"

export QDB_DROP_TABLES_IF_EXIST=""



# Disable flag for re-deploying QuestDB from scratch.

export QDB_REDEPLOY=""

src/interdomain/service/__main__.py

+10 −11
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 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 interdomain.Config import is_dlt_enabled

#from .topology_abstractor.TopologyAbstractor import TopologyAbstractor

from .topology_abstractor.TopologyAbstractor import TopologyAbstractor

from .topology_abstractor.DltRecorder import DLTRecorder

from .InterdomainService import InterdomainService

from .RemoteDomainClients import RemoteDomainClients
@@ -65,14 +65,13 @@ def main(): 
    grpc_service.start()



    # Subscribe to Context Events

    # topology_abstractor_enabled = is_topology_abstractor_enabled()

    # if topology_abstractor_enabled:

    #     topology_abstractor = TopologyAbstractor()

    #     topology_abstractor.start()

    topology_abstractor_enabled = is_topology_abstractor_enabled()

    if topology_abstractor_enabled:

        topology_abstractor = TopologyAbstractor()

        topology_abstractor.start()



    # Subscribe to Context Events

    #dlt_enabled = is_dlt_enabled() #How to change the config?

    dlt_enabled = True

    dlt_enabled = is_dlt_enabled()

    if dlt_enabled:

        LOGGER.info('Starting DLT functionality...')

        dlt_recorder = DLTRecorder()
@@ -82,8 +81,8 @@ def main(): 
    while not terminate.wait(timeout=1.0): pass



    LOGGER.info('Terminating...')

    # if topology_abstractor_enabled:

    #     topology_abstractor.stop()

    if topology_abstractor_enabled:

        topology_abstractor.stop()

    if dlt_enabled:

         dlt_recorder.stop()

    grpc_service.stop()

src/interdomain/service/topology_abstractor/DltRecordSender.py

+11 −14
Original line number Diff line number Diff line
@@ -12,10 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import logging

import asyncio





import asyncio, logging

from typing import Dict, List, Tuple

from common.proto.context_pb2 import Device, Link, Service, Slice, TopologyId

from common.proto.dlt_connector_pb2 import DltDeviceId, DltLinkId, DltServiceId, DltSliceId
@@ -71,6 +68,7 @@ class DltRecordSender: 
        if not self.dlt_connector_client:

            LOGGER.error('DLT Connector Client is None, cannot commit records.')

            return



        tasks = []  # List to hold all the async tasks



        for dlt_record_uuid in self.dlt_record_uuids:
@@ -108,4 +106,3 @@ class DltRecordSender: 


        if tasks:

            await asyncio.gather(*tasks)  # Run all the tasks concurrently

src/interdomain/service/topology_abstractor/DltRecorder.py

+17 −16
Original line number Diff line number Diff line
@@ -14,8 +14,10 @@ 


import logging, threading, asyncio, time

from typing import Dict, Optional

from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME, ServiceNameEnum

from common.proto.context_pb2 import ContextEvent, ContextId, Device, DeviceEvent, DeviceId, LinkId, LinkEvent, TopologyId, TopologyEvent

from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME

from common.proto.context_pb2 import (

    ContextEvent, ContextId, DeviceEvent, DeviceId, LinkId, LinkEvent, TopologyId, TopologyEvent

)

from common.tools.context_queries.Context import create_context

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id
@@ -44,7 +46,6 @@ class DLTRecorder(threading.Thread): 
        self.update_event_queue = asyncio.Queue()

        self.remove_event_queue = asyncio.Queue()





    def stop(self):

        self.terminate.set()
@@ -57,7 +58,6 @@ class DLTRecorder(threading.Thread): 
        #self.create_topologies()

        self.context_event_collector.start()





        batch_timeout = 1  # Time in seconds to wait before processing whatever tasks are available

        last_task_time = time.time()
@@ -188,11 +188,13 @@ class DLTRecorder(threading.Thread): 
        device = self.context_client.GetDevice(device_id)

        topology_id = self.find_topology_for_device(device_id)

        if topology_id:

            LOGGER.debug('DEVICE_INFO({:s}), DEVICE_ID ({:s})'.format(str(device.device_id.device_uuid.uuid), grpc_message_to_json_string(device_id)))



            LOGGER.debug('DEVICE_INFO({:s}), DEVICE_ID ({:s})'.format(

                str(device.device_id.device_uuid.uuid),

                grpc_message_to_json_string(device_id)

            ))

            dlt_record_sender.add_device(topology_id, device)

        else:

            LOGGER.warning(f"Topology not found for device {device_id.device_uuid.uuid}")

            LOGGER.warning("Topology not found for device {:s}".format(str(device_id.device_uuid.uuid)))



    def process_link_event(self, event: LinkEvent, dlt_record_sender: DltRecordSender) -> None:

        link_id = event.link_id
@@ -201,5 +203,4 @@ class DLTRecorder(threading.Thread): 
        if topology_id:

            dlt_record_sender.add_link(topology_id, link)

        else:

            LOGGER.warning(f"Topology not found for link {link_id.link_uuid.uuid}")

            LOGGER.warning("Topology not found for link {:s}".format(str(link_id.link_uuid.uuid)))