Merge branch 'feat/policy_recalculatePath' into 'develop'

feat: add recalculatePath as action to Policy

See merge request !115

proto/policy_action.proto

@@ -26,6 +26,8 @@ enum PolicyRuleActionEnum {
   POLICYRULE_ACTION_SET_DEVICE_STATUS = 1;
   POLICYRULE_ACTION_ADD_SERVICE_CONFIGRULE = 2;
   POLICYRULE_ACTION_ADD_SERVICE_CONSTRAINT = 3;
+  POLICY_RULE_ACTION_CALL_SERVICE_RPC = 4;
+  POLICY_RULE_ACTION_RECALCULATE_PATH = 5;
 }
 
 // Action configuration
@@ -37,4 +39,4 @@ message PolicyRuleActionConfig {
 // message PolicyRuleAction {
 //   PolicyRuleActionEnum action = 1;
 //   repeated string parameters = 2;
-// }
+// }
\ No newline at end of file

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

@@ -21,6 +21,7 @@ import eu.teraflow.policy.context.model.Device;
 import eu.teraflow.policy.context.model.EndPointId;
 import eu.teraflow.policy.context.model.Service;
 import eu.teraflow.policy.context.model.ServiceId;
+import eu.teraflow.policy.model.PolicyRuleService;
 import io.smallrye.mutiny.Uni;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,73 +43,44 @@ public class PolicyRuleConditionValidator {
         this.contextService = contextService;
     }
 
-    public Uni<Boolean> validateDeviceId(String deviceId) {
-        final var isDeviceIdValid = isDeviceIdValid(deviceId);
-
-        isDeviceIdValid
-                .subscribe()
-                .with(
-                        deviceIdIdBooleanValue -> {
-                            if (Boolean.FALSE.equals(deviceIdIdBooleanValue)) {
-                                LOGGER.errorf(INVALID_MESSAGE, deviceId);
-                            }
-                            LOGGER.infof(VALID_MESSAGE, deviceId);
-                        });
-
-        return isDeviceIdValid;
-    }
-
-    public Uni<Boolean> validateServiceId(ServiceId serviceId) {
-        final var isServiceIdValid = isServiceIdValid(serviceId);
-
-        isServiceIdValid
-                .subscribe()
-                .with(
-                        serviceIdBooleanValue -> {
-                            if (Boolean.FALSE.equals(serviceIdBooleanValue)) {
-                                LOGGER.errorf(INVALID_MESSAGE, serviceId);
-                            }
-                        });
-
-        return isServiceIdValid;
-    }
-
-    public Uni<Boolean> validateUpdatedPolicyRuleId(String updatedPolicyRuleId) {
-        final var isUpdatedPolicyRuleIdValid = isUpdatedPolicyRuleIdValid(updatedPolicyRuleId);
-
-        isUpdatedPolicyRuleIdValid
-                .subscribe()
-                .with(
-                        serviceIdBooleanValue -> {
-                            if (Boolean.FALSE.equals(serviceIdBooleanValue)) {
-                                LOGGER.errorf(INVALID_MESSAGE, updatedPolicyRuleId);
-                            }
-                        });
-
-        return isUpdatedPolicyRuleIdValid;
-    }
-
-    private Uni<Boolean> isDeviceIdValid(String deviceId) {
+    public Uni<Boolean> isDeviceIdValid(String deviceId) {
         return contextService
                 .getDevice(deviceId)
+                .onFailure()
+                .recoverWithItem((Device) null)
                 .onItem()
                 .transform(device -> checkIfDeviceIdExists(device, deviceId));
     }
 
     private boolean checkIfDeviceIdExists(Device device, String deviceId) {
-        final var deviceDeviceId = device.getDeviceId();
+        if (device == null) {
+            return false;
+        }
 
+        final var deviceDeviceId = device.getDeviceId();
         return deviceDeviceId.equals(deviceId);
     }
 
-    private Uni<Boolean> isServiceIdValid(ServiceId serviceId) {
+    public Uni<Boolean> isServiceIdValid(ServiceId serviceId, List<String> deviceIds) {
         return contextService
                 .getService(serviceId)
+                .onFailure()
+                .recoverWithItem((Service) null)
                 .onItem()
-                .transform(service -> checkIfServiceIdExists(service, serviceId));
+                .transform(service -> checkIfServiceIsValid(service, serviceId, deviceIds));
+    }
+
+    private boolean checkIfServiceIsValid(
+            Service service, ServiceId serviceId, List<String> deviceIds) {
+        return (checkIfServiceIdExists(service, serviceId)
+                && checkIfServicesDeviceIdsExist(service, deviceIds));
     }
 
     private boolean checkIfServiceIdExists(Service service, ServiceId serviceId) {
+        if (service == null) {
+            return false;
+        }
+
         final var serviceServiceIdServiceId = service.getServiceId();
         final var serviceServiceIdContextId = serviceServiceIdServiceId.getContextId();
         final var serviceServiceIdId = serviceServiceIdServiceId.getId();
@@ -117,14 +89,11 @@ public class PolicyRuleConditionValidator {
                 && serviceServiceIdId.equals(serviceId.getId());
     }
 
-    public Uni<Boolean> isServicesDeviceIdsValid(ServiceId serviceId, List<String> deviceIds) {
-        return contextService
-                .getService(serviceId)
-                .onItem()
-                .transform(service -> checkIfServicesDeviceIdsExist(service, deviceIds));
-    }
-
     private boolean checkIfServicesDeviceIdsExist(Service service, List<String> deviceIds) {
+        if (deviceIds.isEmpty()) {
+            return true;
+        }
+
         List<String> serviceDeviceIds = new ArrayList<>();
         for (EndPointId serviceEndPointId : service.getServiceEndPointIds()) {
             serviceDeviceIds.add(serviceEndPointId.getDeviceId());
@@ -133,7 +102,7 @@ public class PolicyRuleConditionValidator {
         return deviceIds.containsAll(serviceDeviceIds);
     }
 
-    private Uni<Boolean> isUpdatedPolicyRuleIdValid(String updatedPolicyRuleId) {
+    public Uni<Boolean> isUpdatedPolicyRuleIdValid(String updatedPolicyRuleId) {
         return contextService
                 .getPolicyRule(updatedPolicyRuleId)
                 .onItem()
@@ -146,4 +115,25 @@ public class PolicyRuleConditionValidator {
                 .ifNull()
                 .continueWith(false);
     }
+
+    public Uni<Boolean> isPolicyRuleServiceValid(String updatedPolicyRuleId, ServiceId serviceId) {
+        return contextService
+                .getPolicyRule(updatedPolicyRuleId)
+                .onItem()
+                .ifNotNull()
+                .transform(
+                        policyRule -> {
+                            var policyRuleService =
+                                    (PolicyRuleService) policyRule.getPolicyRuleType().getPolicyRuleType();
+                            if (policyRuleService.getServiceId().getId().equals(serviceId.getId())) {
+                                return true;
+                            }
+                            return false;
+                        })
+                .onItem()
+                .ifNull()
+                .continueWith(false)
+                .onFailure()
+                .recoverWithItem(false);
+    }
 }

src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java

@@ -20,5 +20,7 @@ public enum ServiceStatusEnum {
     UNDEFINED,
     PLANNED,
     ACTIVE,
-    PENDING_REMOVAL
+    PENDING_REMOVAL,
+    SLA_VIOLATED,
+    UPDATING
 }

src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java

@@ -20,5 +20,8 @@ public enum PolicyRuleActionEnum {
     POLICY_RULE_ACTION_NO_ACTION,
     POLICY_RULE_ACTION_SET_DEVICE_STATUS,
     POLICY_RULE_ACTION_ADD_SERVICE_CONFIGRULE,
-    POLICY_RULE_ACTION_ADD_SERVICE_CONSTRAINT
+    POLICY_RULE_ACTION_ADD_SERVICE_CONSTRAINT,
+    POLICY_RULE_ACTION_CALL_SERVICE_RPC,
+    // This is temporary
+    POLICY_RULE_ACTION_RECALCULATE_PATH
 }

src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java

@@ -22,6 +22,7 @@ public class AlarmSubscription {
     private final float subscriptionTimeoutS;
     private final float subscriptionFrequencyMs;
 
+    // TODO: Refactor the AlarmSubscription constructor to allow infinite subscriptionTimeoutS
     public AlarmSubscription(
             String alarmId, float subscriptionTimeoutS, float subscriptionFrequencyMs) {
         this.alarmId = alarmId;

src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java

@@ -16,6 +16,7 @@
 
 package eu.teraflow.policy.service;
 
+import eu.teraflow.policy.context.model.Empty;
 import eu.teraflow.policy.context.model.Service;
 import eu.teraflow.policy.context.model.ServiceId;
 import io.smallrye.mutiny.Uni;
@@ -23,4 +24,6 @@ import io.smallrye.mutiny.Uni;
 public interface ServiceGateway {
 
     Uni<ServiceId> updateService(Service service);
+
+    Uni<Empty> recomputeConnections(Service service);
 }

src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java

@@ -17,16 +17,19 @@
 package eu.teraflow.policy.service;
 
 import eu.teraflow.policy.Serializer;
+import eu.teraflow.policy.context.model.Empty;
 import eu.teraflow.policy.context.model.Service;
 import eu.teraflow.policy.context.model.ServiceId;
 import io.quarkus.grpc.GrpcClient;
 import io.smallrye.mutiny.Uni;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import org.jboss.logging.Logger;
 import service.MutinyServiceServiceGrpc.MutinyServiceServiceStub;
 
 @ApplicationScoped
 public class ServiceGatewayImpl implements ServiceGateway {
+    private static final Logger LOGGER = Logger.getLogger(ServiceGatewayImpl.class);
 
     @GrpcClient("service")
     MutinyServiceServiceStub streamingDelegateService;
@@ -47,4 +50,23 @@ public class ServiceGatewayImpl implements ServiceGateway {
                 .onItem()
                 .transform(serializer::deserialize);
     }
+
+    @Override
+    public Uni<Empty> recomputeConnections(Service service) {
+        service.getServiceEndPointIds().clear();
+        service.getServiceConstraints().clear();
+        final var serializedService = serializer.serialize(service);
+        LOGGER.info(serializedService);
+
+        return streamingDelegateService
+                .recomputeConnections(serializedService)
+                .onItem()
+                .transform(serializer::deserializeEmpty)
+                .onFailure()
+                .invoke(
+                        x -> {
+                            LOGGER.info("recomputeConnections failed with:");
+                            LOGGER.info(x);
+                        });
+    }
 }

src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java

@@ -16,6 +16,7 @@
 
 package eu.teraflow.policy.service;
 
+import eu.teraflow.policy.context.model.Empty;
 import eu.teraflow.policy.context.model.Service;
 import eu.teraflow.policy.context.model.ServiceId;
 import io.smallrye.mutiny.Uni;
@@ -23,4 +24,6 @@ import io.smallrye.mutiny.Uni;
 public interface ServiceService {
 
     Uni<ServiceId> updateService(Service service);
+
+    Uni<Empty> recomputeConnections(Service service);
 }

src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java

@@ -16,6 +16,7 @@
 
 package eu.teraflow.policy.service;
 
+import eu.teraflow.policy.context.model.Empty;
 import eu.teraflow.policy.context.model.Service;
 import eu.teraflow.policy.context.model.ServiceId;
 import io.smallrye.mutiny.Uni;
@@ -36,4 +37,9 @@ public class ServiceServiceImpl implements ServiceService {
     public Uni<ServiceId> updateService(Service service) {
         return serviceGateway.updateService(service);
     }
+
+    @Override
+    public Uni<Empty> recomputeConnections(Service service) {
+        return serviceGateway.recomputeConnections(service);
+    }
 }

src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java

@@ -1914,8 +1914,7 @@ class SerializerTest {
                         ServiceStatusEnum.SLA_VIOLATED,
                         ContextOuterClass.ServiceStatusEnum.SERVICESTATUS_SLA_VIOLATED),
                 Arguments.of(
-                        ServiceStatusEnum.UPDATING,
-                        ContextOuterClass.ServiceStatusEnum.SERVICESTATUS_UPDATING),
+                        ServiceStatusEnum.UPDATING, ContextOuterClass.ServiceStatusEnum.SERVICESTATUS_UPDATING),
                 Arguments.of(
                         ServiceStatusEnum.UNDEFINED,
                         ContextOuterClass.ServiceStatusEnum.SERVICESTATUS_UNDEFINED));