Commit ea9755c6 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into...

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/tid-media-channel-service
parents e14c3f50 bf9f7c11
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ stages:
  - unit_test
  - end2end_test

workflow:
  rules:
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
      when: always
    - when: never

# include the individual .gitlab-ci.yml of each micro-service and tests
include:
  #- local: '/manifests/.gitlab-ci.yml'
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
import cmd, logging
from .MockOSM import MockOSM

logging.basicConfig(level=logging.DEBUG)
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)

+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 {
Loading