fix: policy fixes (831e8509) · Commits · TFS / controller

src/policy/jacoco.exec

0 → 100644

+42.7 KiB

File added.

No diff preview for this file type.

src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java

+66 −53

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import eu.teraflow.policy.service.ServiceService;
		import io.smallrye.mutiny.Multi;
		import io.smallrye.mutiny.Uni;
		import io.smallrye.mutiny.groups.UniJoin;
		import io.smallrye.mutiny.subscription.Cancellable;
		import java.time.Instant;
		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -118,6 +119,7 @@ public class PolicyServiceImpl implements PolicyService {
		new ConcurrentHashMap<>();
		private ConcurrentHashMap<String, PolicyRuleDevice> alarmPolicyRuleDeviceMap =
		new ConcurrentHashMap<>();
		private ConcurrentHashMap<String, Cancellable> subscriptionList = new ConcurrentHashMap<>();

		@Inject
		public PolicyServiceImpl(
		@@ -196,19 +198,26 @@ public class PolicyServiceImpl implements PolicyService {
		"Invalid PolicyRuleConditions in PolicyRule with ID: %s",
		policyRuleBasic.getPolicyRuleId()));
		return policyRuleState;
		}
		contextService.setPolicyRule(policyRule).subscribe().with(x -> {});
		setPolicyRuleServiceToContext(policyRuleService, VALIDATED_POLICYRULE_STATE);
		} else {
		contextService
		.setPolicyRule(policyRule)
		.subscribe()
		.with(
		policyId -> {
		setPolicyRuleServiceToContext(
		policyRuleService, VALIDATED_POLICYRULE_STATE);
		noAlarms = 0;

		// Create an alarmIds list that contains the promised ids returned from setKpiAlarm
		// Create an alarmIds list that contains the promised ids returned from
		// setKpiAlarm
		List<Uni<String>> alarmIds = new ArrayList<Uni<String>>();
		for (AlarmDescriptor alarmDescriptor : alarmDescriptorList) {
		LOGGER.infof("alarmDescriptor:");
		LOGGER.infof(alarmDescriptor.toString());
		alarmIds.add(monitoringService.setKpiAlarm(alarmDescriptor));
		}

		LOGGER.infof("THIS IS A TEST!");
		LOGGER.infof("%s", alarmIds);
		// Transform the alarmIds into promised alarms returned from the
		// getAlarmResponseStream
		List<Multi<AlarmResponse>> alarmResponseStreamList = new ArrayList<>();
		@@ -221,23 +230,28 @@ public class PolicyServiceImpl implements PolicyService {
		alarmPolicyRuleServiceMap.put(id, policyRuleService);

		// TODO: Create infinite subscription
		var alarmSubscription = new AlarmSubscription(id, 259200, 5000);
		return monitoringService.getAlarmResponseStream(alarmSubscription);
		var alarmSubscription =
		new AlarmSubscription(id, 259200, 5000);
		return monitoringService.getAlarmResponseStream(
		alarmSubscription);
		}));
		}

		// Merge the promised alarms into one stream (Multi Object)
		final var multi = Multi.createBy().merging().streams(alarmResponseStreamList);
		setPolicyRuleServiceToContext(policyRuleService, PROVISIONED_POLICYRULE_STATE);
		final var multi =
		Multi.createBy().merging().streams(alarmResponseStreamList);
		setPolicyRuleServiceToContext(
		policyRuleService, PROVISIONED_POLICYRULE_STATE);

		monitorAlarmResponseForService(multi);
		subscriptionList.put(policyId, monitorAlarmResponseForService(multi));

		// TODO: Resubscribe to the stream, if it has ended

		// TODO: Redesign evaluation of action
		// evaluateAction(policyRule, alarmDescriptorList, multi);

		});
		return VALIDATED_POLICYRULE_STATE;
		}
		});
		}

		@@ -428,6 +442,7 @@ public class PolicyServiceImpl implements PolicyService {
		.transform(
		policyRule -> {
		var policyRuleBasic = policyRule.getPolicyRuleType().getPolicyRuleBasic();
		String policyId = policyRuleBasic.getPolicyRuleId();

		policyRule
		.getPolicyRuleType()
		@@ -443,6 +458,9 @@ public class PolicyServiceImpl implements PolicyService {
		"DeletePolicy with id: " + VALID_MESSAGE,
		policyRuleBasic.getPolicyRuleId()));

		contextService.removePolicyRule(policyId).subscribe().with(x -> {});
		subscriptionList.get(policyId).cancel();

		return policyRuleBasic.getPolicyRuleState();
		});
		}
		@@ -485,8 +503,8 @@ public class PolicyServiceImpl implements PolicyService {
		return alarmDescriptorList;
		}

		private void monitorAlarmResponseForService(Multi<AlarmResponse> multi) {
		multi
		private Cancellable monitorAlarmResponseForService(Multi<AlarmResponse> multi) {
		return multi
		.subscribe()
		.with(
		alarmResponse -> {
		@@ -725,7 +743,7 @@ public class PolicyServiceImpl implements PolicyService {
		// TODO: Temp fix for AlarmDescriptor object
		AlarmDescriptor alarmDescriptor =
		new AlarmDescriptor(
		"alarmId-" + gen(),
		"",
		"alarmDescription",
		"alarmName-" + gen(),
		policyRuleCondition.getKpiId(),
		@@ -770,12 +788,7 @@ public class PolicyServiceImpl implements PolicyService {
		final var kpiValueRange = convertPolicyRuleConditionToKpiValueRange(policyRuleCondition);

		return new AlarmDescriptor(
		"alarmId-" + gen(),
		"alarmDescription",
		"alarmName-" + gen(),
		kpiId,
		kpiValueRange,
		getTimeStamp());
		"", "alarmDescription", "alarmName-" + gen(), kpiId, kpiValueRange, getTimeStamp());
		}

		private AlarmDescriptor createAlarmDescriptorWithRange(
		@@ -800,7 +813,7 @@ public class PolicyServiceImpl implements PolicyService {
		}

		return new AlarmDescriptor(
		"alarmId-" + gen(),
		"",
		"alarmDescription",
		"alarmName-" + gen(),
		kpiId,
		@@ -899,7 +912,7 @@ public class PolicyServiceImpl implements PolicyService {

		final var policyRuleTypeService = new PolicyRuleTypeService(policyRuleService);
		final var policyRule = new PolicyRule(policyRuleTypeService);
		contextService.setPolicyRule(policyRule);
		contextService.setPolicyRule(policyRule).subscribe().with(x -> {});
		}

		private void setPolicyRuleDeviceToContext(
		@@ -912,6 +925,6 @@ public class PolicyServiceImpl implements PolicyService {

		final var policyRuleTypeService = new PolicyRuleTypeDevice(policyRuleDevice);
		final var policyRule = new PolicyRule(policyRuleTypeService);
		contextService.setPolicyRule(policyRule);
		contextService.setPolicyRule(policyRule).subscribe().with(x -> {});
		}
		}

src/policy/target/generated-sources/grpc/context/ContextOuterClass.java

+1414 −565

File changed.

Preview size limit exceeded, changes collapsed.

src/policy/target/kubernetes/kubernetes.yml

+28 −52

Original line number	Diff line number	Diff line
		# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		---
		apiVersion: v1
		kind: Service
		metadata:
		annotations:
		app.quarkus.io/commit-id: 8d0654b519e90fe0127e7d1419adce25fa3a179d
		app.quarkus.io/build-timestamp: 2023-07-10 - 09:41:26 +0000
		app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542
		app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app.kubernetes.io/name: policyservice
		app: policyservice
		name: policyservice
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		name: policy
		spec:
		ports:
		- name: http
		port: 9192
		port: 80
		targetPort: 8080
		- name: grpc-server
		port: 6060
		targetPort: 6060
		port: 9000
		targetPort: 9000
		selector:
		app.kubernetes.io/name: policyservice
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		type: ClusterIP
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		annotations:
		app.quarkus.io/commit-id: 8d0654b519e90fe0127e7d1419adce25fa3a179d
		app.quarkus.io/build-timestamp: 2023-07-10 - 09:41:26 +0000
		app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542
		app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app: policyservice
		app.kubernetes.io/name: policyservice
		name: policyservice
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		name: policy
		spec:
		replicas: 1
		selector:
		matchLabels:
		app.kubernetes.io/name: policyservice
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		template:
		metadata:
		annotations:
		app.quarkus.io/commit-id: 8d0654b519e90fe0127e7d1419adce25fa3a179d
		app.quarkus.io/build-timestamp: 2023-07-10 - 09:41:26 +0000
		app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542
		app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app: policyservice
		app.kubernetes.io/name: policyservice
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		spec:
		containers:
		- env:
		@@ -76,13 +65,7 @@ spec:
		valueFrom:
		fieldRef:
		fieldPath: metadata.namespace
		- name: CONTEXT_SERVICE_HOST
		value: contextservice
		- name: SERVICE_SERVICE_HOST
		value: serviceservice
		- name: MONITORING_SERVICE_HOST
		value: monitoringservice
		image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
		image: nuc8/policy:0.1.0
		imagePullPolicy: Always
		livenessProbe:
		failureThreshold: 3
		@@ -90,16 +73,16 @@ spec:
		path: /q/health/live
		port: 8080
		scheme: HTTP
		initialDelaySeconds: 2
		periodSeconds: 10
		initialDelaySeconds: 0
		periodSeconds: 30
		successThreshold: 1
		timeoutSeconds: 10
		name: policyservice
		name: policy
		ports:
		- containerPort: 8080
		name: http
		protocol: TCP
		- containerPort: 6060
		- containerPort: 9000
		name: grpc-server
		protocol: TCP
		readinessProbe:
		@@ -108,14 +91,7 @@ spec:
		path: /q/health/ready
		port: 8080
		scheme: HTTP
		initialDelaySeconds: 2
		periodSeconds: 10
		initialDelaySeconds: 0
		periodSeconds: 30
		successThreshold: 1
		timeoutSeconds: 10
		resources:
		limits:
		cpu: 500m
		memory: 2048Mi
		requests:
		cpu: 50m
		memory: 512Mi