Commit 7f34b7f3 authored by Antonio Gines Buendia Lopez's avatar Antonio Gines Buendia Lopez
Browse files

Merge branch 'develop' into...

Merge branch 'develop' into feat/364-elig-path-computation-extended-component-pce-for-externalized-optical-slice-computation
parents f027b53e bf9f7c11
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ enum AnalyzerOperationMode {
message Analyzer {
  AnalyzerId                 analyzer_id          = 1;
  string                     algorithm_name       = 2;  // The algorithm to be executed
  float                      duration_s           = 3;  // Termiate the data analytics thread after duration (seconds); 0 = infinity time
  float                      duration_s           = 3;  // Terminate the data analytics thread after duration (seconds); 0 = infinity time
  repeated kpi_manager.KpiId input_kpi_ids        = 4;  // The KPI Ids to be processed by the analyzer
  repeated kpi_manager.KpiId output_kpi_ids       = 5;  // The KPI Ids produced by the analyzer
  AnalyzerOperationMode      operation_mode       = 6;  // Operation mode of the analyzer
+3 −10
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ enum ZSMServiceStateEnum {
  ZSM_REMOVED = 5;       // ZSM loop is removed
}

enum ZSMTypeEnum {
  ZSMTYPE_UNKNOWN = 0;
}

message ZSMCreateRequest {
  context.ServiceId           target_service_id = 1;
  context.ServiceId           telemetry_service_id = 2;
@@ -62,9 +58,6 @@ message ZSMServiceState {
// Basic ZSM service attributes
message ZSMService {
  ZSMServiceID zsmServiceId = 1;

  context.ServiceId serviceId = 2;
  policy.PolicyRuleList policyList = 3;

  // TODO: When new Analytics and updated Monitoring are in place, add the necessary binding to them
}
+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ enum ServiceTypeEnum {
  SERVICETYPE_IP_LINK = 11;
  SERVICETYPE_TAPI_LSP = 12;
  SERVICETYPE_IPOWDM = 13;
  SERVICETYPE_UPF = 14;
}

enum ServiceStatusEnum {
+14 −14
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ syntax = "proto3";
package policy;

import "context.proto";
import "policy_condition.proto";
import "policy_action.proto";
import "monitoring.proto"; // to be migrated to: "kpi_manager.proto"

service PolicyService {
  rpc PolicyAddService (PolicyRuleService) returns (PolicyRuleState) {}
@@ -36,8 +34,8 @@ enum PolicyRuleStateEnum {
  POLICY_FAILED = 1;        // Rule failed
  POLICY_INSERTED = 2;      // Rule is just inserted
  POLICY_VALIDATED = 3;     // Rule content is correct
  POLICY_PROVISIONED = 4;   // Rule subscribed to Monitoring
  POLICY_ACTIVE = 5;        // Rule is currently active (alarm is just thrown by Monitoring)
  POLICY_PROVISIONED = 4;   // Rule subscribed to Analyzer
  POLICY_ACTIVE = 5;        // Rule is currently active (alarm is just thrown by Analyzer)
  POLICY_ENFORCED = 6;      // Rule action is successfully enforced
  POLICY_INEFFECTIVE = 7;   // The applied rule action did not work as expected
  POLICY_EFFECTIVE = 8;     // The applied rule action did work as expected
@@ -45,24 +43,26 @@ enum PolicyRuleStateEnum {
  POLICY_REMOVED = 10;      // Operator requires to remove a policy
}

message PolicyRuleState {
  PolicyRuleStateEnum policyRuleState = 1;
  string policyRuleStateMessage = 2;
}

message PolicyRuleId {
  context.Uuid uuid = 1;
}

message PolicyRuleState {
  PolicyRuleStateEnum policyRuleState = 1;
  string policyRuleStateMessage = 2;
message PolicyRuleKpiId {
  context.Uuid policyRuleKpiUuid = 1;        // Same as defined in kpi_manager.proto
}

// Basic policy rule attributes
message PolicyRuleBasic {
  PolicyRuleId policyRuleId = 1;
  PolicyRuleState policyRuleState = 2; //policy.proto:58:12: Explicit 'optional' labels are disallowed in the Proto3 syntax. To define 'optional' fields in Proto3, simply remove the 'optional' label, as fields are 'optional' by default.
  uint32 priority = 3;
  monitoring.KpiId    kpiId       = 4;  // to be migrated to: "kpi_manager.KpiId"

  // Event-Condition-Action (ECA) model
  repeated PolicyRuleAction actionList = 5;        // One or more actions should be applied
  PolicyRuleId policyRuleId = 1;                  // Unique rule ID
  PolicyRuleState policyRuleState = 2;            // Rule lifecycle information
  uint32 policyRulePriority = 3;                  // The priority of this rule
  repeated PolicyRuleAction actionList = 4;       // One or more actions should be applied
  repeated PolicyRuleKpiId policyRuleKpiList = 5; // List of KPIs associated with this policy
}

// Service-oriented policy rule
+0 −5
Original line number Diff line number Diff line
@@ -35,8 +35,3 @@ message PolicyRuleActionConfig {
  string action_key = 1;
  string action_value = 2;
}

// message PolicyRuleAction {
//   PolicyRuleActionEnum action = 1;
//   repeated string parameters = 2;
// }
Loading