Commit 68229a21 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Merge branch... 

Merge branch 'feat/396-sssa-integration-of-optical-controller-with-closed-loop-services' of ssh://labs.etsi.org:29419/tfs/controller into feat/412-cttc-e2e-dscm-pluggable-improvements-and-tests
parents 43e1339e c3056c09

proto/context.proto

+2 −1
Original line number Diff line number Diff line
@@ -260,7 +260,8 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_GNMI_NOKIA_SRLINUX = 19;

  DEVICEDRIVER_OPENROADM = 20;

  DEVICEDRIVER_RESTCONF_OPENCONFIG = 21;

  DEVICEDRIVER_CUSTOM_IPOWDM = 22;

  DEVICEDRIVER_NETCONF_OC_PLUGGABLE = 22;

  DEVICEDRIVER_CUSTOM_IPOWDM = 23;

}



enum DeviceOperationalStatusEnum {

proto/kpi_sample_types.proto

+5 −1
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ enum KpiSampleType { 
    KPISAMPLETYPE_INT_DROP_REASON    = 2202;



    // PLUGGABLES

    KPISAMPLETYPE_PRE_FEC_BER              = 2301;

    KPISAMPLETYPE_PRE_FEC_BER_PLUGGABLE    = 2301;

    KPISAMPLETYPE_RECEIVED_POWER_PLUGGABLE = 2302;



    // PLUGGABLES Aggregated Output KPIs

    KPISAMPLETYPE_PRE_FEC_BER_PLUGGABLE_AGG_OUTPUT    = 3301;

    KPISAMPLETYPE_RECEIVED_POWER_PLUGGABLE_AGG_OUTPUT = 3302;

}

proto/policy_action.proto

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ enum PolicyRuleActionEnum { 
  POLICYRULE_ACTION_ADD_SERVICE_CONSTRAINT = 3;

  POLICY_RULE_ACTION_CALL_SERVICE_RPC = 4;

  POLICY_RULE_ACTION_RECALCULATE_PATH = 5;

  POLICY_RULE_ACTION_GENERATE_FAILURE_NOTIFICATION = 6;

}



// Action configuration

proto/telemetry_frontend.proto

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ message CollectorId { 
   context.Timestamp  start_time    = 5; // Timestamp when Collector start execution

   context.Timestamp  end_time      = 6; // Timestamp when Collector stop execution

   INTCollector       int_collector = 7; // Extra optional information about INT collectors

   CollectorMetaInfo  coll_meta_info= 8; // Extra optional collector information

 }



message INTCollector {
@@ -45,6 +46,11 @@ message INTCollector { 
    string context_id     = 4; // Context identifier related to this collector

}



message CollectorMetaInfo {

  context.DeviceDriverEnum  device_driver = 1;

  string                    device_type   = 2;

}



message CollectorFilter {

  // Collector that fulfill the filter are those that match ALL the following fields.

  // An empty list means: any value is accepted.

src/analytics/backend/service/AnalyzerHelper.py

+4 −3
Original line number Diff line number Diff line
@@ -43,11 +43,12 @@ class AnalyzerHelper: 
        return cluster



    @staticmethod

    def initialize_kafka_consumer():    # TODO: update to receive topic and group_id as parameters

        """Initialize the Kafka consumer."""

    def initialize_kafka_consumer(group_id='analytics-backend'):

        """Initialize the Kafka consumer with a unique group_id so each streamer

        receives its own copy of all messages from the topic."""

        consumer_conf = {

            'bootstrap.servers': KafkaConfig.get_kafka_address(),

            'group.id': 'analytics-backend',

            'group.id': group_id,

            'auto.offset.reset': 'latest'

        }

        consumer = Consumer(consumer_conf)