Commit 7de6b21d authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'feat/tid-media-channel-service' of... 

Merge branch 'feat/tid-media-channel-service' 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 c1a3dd47 746c444a

my_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,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=""
@@ -208,7 +208,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

+15 −5
Original line number Diff line number Diff line
@@ -13,10 +13,20 @@ 
// limitations under the License.



syntax = "proto3";

package ip_link;

package ipowdm;



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/device/service/Tools.py

+4 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ def compute_rules_to_add_delete( 
        elif config_rule_kind == 'ipowdm':

            device_uuid = config_rule.ipowdm.endpoint_id.device_id.device_uuid.uuid

            endpoint_uuid = config_rule.ipowdm.endpoint_id.endpoint_uuid.uuid

            ipowdm_ruleset_name = config_rule.ipowdm.rule_set.name

            ipowdm_ruleset_name = config_rule.ipowdm.rule_set.uuid

            IPOWDM_KEY_TEMPLATE = '/device[{:s}]/endpoint[{:s}]/ipowdm_ruleset[{:s}]'

            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)
@@ -430,8 +430,9 @@ def compute_rules_to_add_delete( 
        elif config_rule_kind == 'ipowdm':  # resource management of "ipowdm" rule

            device_uuid = config_rule.ipowdm.endpoint_id.device_id.device_uuid.uuid

            endpoint_uuid = config_rule.ipowdm.endpoint_id.endpoint_uuid.uuid

            IPOWDM_KEY_TEMPLATE = '/device[{:s}]/endpoint[{:s}]/ipowdm_ruleset'

            key_or_path = IPOWDM_KEY_TEMPLATE.format(device_uuid, endpoint_uuid)

            ipowdm_name = config_rule.ipowdm.rule_set.uuid

            IPOWDM_KEY_TEMPLATE = '/device[{:s}]/endpoint[{:s}]/ipowdm_ruleset[{:s}]'

            key_or_path = IPOWDM_KEY_TEMPLATE.format(device_uuid, endpoint_uuid,ipowdm_name)

            request_config_rules.append((

                config_rule.action, key_or_path, grpc_message_to_json(config_rule.ipowdm)

            ))

src/device/service/drivers/__init__.py

+4 −1
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ if LOAD_ALL_DEVICE_DRIVERS: 
        (TransportApiDriver, [

            {

                # Real OLS, specifying TAPI Driver => use TransportApiDriver

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.OPEN_LINE_SYSTEM,

                FilterFieldEnum.DEVICE_TYPE: [

                    DeviceTypeEnum.OPEN_LINE_SYSTEM,

                    DeviceTypeEnum.TERAFLOWSDN_CONTROLLER,

                ],

                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API,

            }

        ]))