Commit 2a866649 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Refactor pluggable configuration handling and add test message utilities

parent 381bb2f3
Loading
Loading
Loading
Loading
+1 −23
Original line number Diff line number Diff line
@@ -53,25 +53,6 @@ def translate_pluggable_config_to_netconf(
        channel_name = component_name
        LOGGER.debug(f"Using fallback component_name: {channel_name}")
    
    if not hasattr(pluggable_config, 'center_frequency_mhz'):
        raise ValueError("center_frequency_mhz is required and must be greater than 0 in PluggableConfig")
    center_frequency_mhz = int(pluggable_config.center_frequency_mhz)
    
    if not hasattr(pluggable_config, 'operational_mode'):
        raise ValueError("operational_mode is required and must be greater than 0 in PluggableConfig")
    operational_mode = pluggable_config.operational_mode
    
    if not hasattr(pluggable_config, 'target_output_power_dbm'):
        raise ValueError("target_output_power_dbm is required in PluggableConfig")
    target_output_power = pluggable_config.target_output_power_dbm
    
    if not hasattr(pluggable_config, 'line_port'):
        raise ValueError("line_port is required in PluggableConfig")
    line_port = pluggable_config.line_port
    
    LOGGER.debug(f"Extracted config values: freq={center_frequency_mhz} MHz, "
                 f"op_mode={operational_mode}, power={target_output_power} dBm, line_port={line_port}")
    
    # Build digital subcarriers groups
    digital_sub_carriers_groups = []
    
@@ -94,13 +75,10 @@ def translate_pluggable_config_to_netconf(
    # Build the final configuration dictionary
    config = {
        "name": channel_name,
        "frequency": center_frequency_mhz,
        "operational_mode": operational_mode, 
        "target_output_power": target_output_power,
        "digital_sub_carriers_group": digital_sub_carriers_groups
    }
    
    LOGGER.info(f"Translated pluggable config to NETCONF format: component={channel_name}, "
                f"frequency={center_frequency_mhz} MHz, groups={len(digital_sub_carriers_groups)}")
                f"groups={len(digital_sub_carriers_groups)}")
    
    return config
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ from common.proto.pluggables_pb2 import (
    PluggableId, Pluggable, ListPluggablesResponse, View
)
from pluggables.client.PluggablesClient import PluggablesClient
from pluggables.tests.testmessages import (
from src.pluggables.tests.test_pluggables_messages import (
    create_pluggable_request, create_list_pluggables_request,
    create_get_pluggable_request, create_delete_pluggable_request,
    create_configure_pluggable_request,
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from common.proto.context_pb2 import Empty
from common.proto.pluggables_pb2 import Pluggable, View
from context.client.ContextClient import ContextClient
from pluggables.client.PluggablesClient import PluggablesClient
from pluggables.tests.testmessages import (
from src.pluggables.tests.test_pluggables_messages import (
    create_pluggable_request, create_list_pluggables_request,
    create_get_pluggable_request, create_delete_pluggable_request,
    create_configure_pluggable_request