Commit 475bd6c1 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code clean up

parent afaf66ee

proto/ip_link.proto

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



syntax = "proto3";

package ipowdm;

package ip_link;



message RuleEndpoint {

    string uuid = 1;

proto/ipowdm.proto

+25 −2
Original line number Diff line number Diff line
@@ -20,8 +20,30 @@ message RuleEndpoint { 
    string ip_address = 2;

    string ip_mask = 3;

    int32 vlan_id = 4;

    float power = 5;

    float frequency = 6;



}



message DigitalSubCarrierId {

    int32 sub_carrier_id = 1;

    string active = 2;

}



message DigitalSubCarriersGroup {

    int32 digital_sub_carriers_group_id = 1;

    repeated DigitalSubCarrierId digital_sub_carrier_id = 4;

}



message Component {

    string name = 1;

    float frequency = 2;

    float target_output_power = 3;

    int32 operational_mode = 4;

    repeated DigitalSubCarriersGroup digital_sub_carriers_group = 5;

    string operation = 6;

}



message Transceiver {

    repeated Component components = 1;

}



message IpowdmRuleSet {
@@ -29,4 +51,5 @@ message IpowdmRuleSet { 
    repeated RuleEndpoint dst = 2;

    int32 bw = 3;

    string uuid = 4;

    Transceiver transceiver = 5;

}
 
 No newline at end of file

src/common/type_checkers/Assertions.py

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ def validate_service_type_enum(message): 
        'SERVICETYPE_OPTICAL_CONNECTIVITY',

        'SERVICETYPE_QKD',

        'SERVICETYPE_IPOWDM',

        'SERVICETYPE_TAPI_LSP',

    ]



def validate_service_state_enum(message):

src/device/service/Tools.py

+8 −0
Original line number Diff line number Diff line
@@ -410,6 +410,14 @@ def compute_rules_to_add_delete( 
            key_or_path = IPOWDM_KEY_TEMPLATE.format(device_uuid, endpoint_uuid, ipowdm_ruleset_name)

            context_config_rules[key_or_path] = grpc_message_to_json(config_rule.ipowdm)

            LOGGER.debug('context_config_rules [%s] = %s', key_or_path, context_config_rules[key_or_path])

        elif config_rule_kind == 'tapi_lsp':

            device_uuid = config_rule.tapi_lsp.endpoint_id.device_id.device_uuid.uuid # get the device name

            endpoint_uuid = config_rule.tapi_lsp.endpoint_id.endpoint_uuid.uuid       # get the endpoint name

            tapi_lsp_ruleset_name = config_rule.tapi_lsp.rule_set.name                # get the ip_link name

            TAPI_LSP_KEY_TEMPLATE = '/device[{:s}]/endpoint[{:s}]/tapi_lsp_ruleset[{:s}]'

            key_or_path = TAPI_LSP_KEY_TEMPLATE.format(device_uuid, endpoint_uuid, tapi_lsp_ruleset_name)

            context_config_rules[key_or_path] = grpc_message_to_json(config_rule.tapi_lsp)

            LOGGER.debug('context_config_rules [%s] = {context_config_rules[%s]}',key_or_path, key_or_path)



    request_config_rules = []

    for config_rule in request.device_config.config_rules:

src/device/service/drivers/transport_api/Tools.py

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ def create_connectivity_service( 
        ]

    }

    results = []

    # Commented out actual HTTP request - just logging for now

    LOGGER.info('Would create Connectivity service {:s}: {:s}'.format(str(uuid), str(data)))

    # try:

    #     LOGGER.info('Connectivity service {:s}: {:s}'.format(str(uuid), str(data)))