Commit 942fcc39 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch... 

Merge branch 'feat/327-tid-new-service-to-ipowdm-controller-to-manage-transceivers-configuration-on-external-agent' of https://labs.etsi.org/rep/tfs/controller into feat/327-tid-new-service-to-ipowdm-controller-to-manage-transceivers-configuration-on-external-agent
parents bbd80642 af0b4eb9

my_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ export CRDB_PASSWORD="tfs123" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS=""

export CRDB_DROP_DATABASE_IF_EXISTS="YES"



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""
@@ -211,7 +211,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=""

export QDB_DROP_TABLES_IF_EXIST="YES"



# Disable flag for re-deploying QuestDB from scratch.

export QDB_REDEPLOY=""

proto/ip_link.proto

+14 −4
Original line number Diff line number Diff line
@@ -15,8 +15,18 @@ 
syntax = "proto3";

package ip_link;



message IpLinkRuleSet {

  string  ip   = 1;

  string  mask = 3;

  string  vlan = 4;

message RuleEndpoint {

    string uuid = 1;

    string ip_address = 2;

    string ip_mask = 3;

    int32 vlan_id = 4;

    float power = 5;

    float frequency = 6;

}



message IpowdmRuleSet {

    repeated RuleEndpoint src = 1;

    repeated RuleEndpoint dst = 2;

    int32 bw = 3;

    string uuid = 4;

}
 
 No newline at end of file

proto/tapi_media_channel.proto

0 → 100644
+19 −0
Original line number Diff line number Diff line 
syntax = "proto3";

package tapi_media_channel;



message MediaChannelRuleSet {

  string  input_sip   = 1;

  string  output_sip  = 2;

  string  uuid = 3;

  string  bw   = 4;

  string  tenant_uuid = 5;

  string  layer_protocol_name = 6;

  string  layer_protocol_qualifier = 7;

  string  lower_frequency_mhz = 8;

  string  upper_frequency_mhz = 9;

  repeated string link_uuid_path = 10;

  string  granularity    = 11;

  string  grid_type      = 12;

  string  direction      = 13;

  string  url            = 14;

}

src/common/tools/object_factory/Service.py

+10 −0
Original line number Diff line number Diff line
@@ -113,3 +113,13 @@ def json_service_ipowdm_planned( 
        service_uuid, ServiceTypeEnum.SERVICETYPE_IPOWDM, context_id=json_context_id(context_uuid),

        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)



def json_service_tapi_lsp_planned(

        service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [],

        config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME

    ):



    return json_service(

        service_uuid, ServiceTypeEnum.SERVICETYPE_TAPI_LSP, context_id=json_context_id(context_uuid),

        status=ServiceStatusEnum.SERVICESTATUS_PLANNED, endpoint_ids=endpoint_ids, constraints=constraints,

        config_rules=config_rules)

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):