Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... (e6f5006c) · Commits · TFS / controller

deploy/tfs.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type=
		printf "\n"

		echo ">>> Create Secret with Apache Kafka..."
		KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-public -o 'jsonpath={.spec.ports[0].port}')
		KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
		kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
		--from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
		--from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		apiVersion: v1
		kind: Service
		metadata:
		name: kafka-public
		name: kafka-service
		labels:
		app.kubernetes.io/component: message-broker
		app.kubernetes.io/instance: kafka
		@@ -50,7 +50,7 @@ spec:
		app.kubernetes.io/component: message-broker
		app.kubernetes.io/instance: kafka
		app.kubernetes.io/name: kafka
		serviceName: "kafka-public"
		serviceName: "kafka-service"
		replicas: 1
		minReadySeconds: 5
		template:
		@@ -83,7 +83,7 @@ spec:
		- name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
		value: "PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT"
		- name: KAFKA_CFG_ADVERTISED_LISTENERS
		value: "PLAINTEXT://kafka-public.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"
		value: "PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"
		- name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES
		value: "CONTROLLER"
		- name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS

+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