refactor(policy): add monitoring proto changes

Merge request reports

Loading
+2 −1
Changes for src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ public class PolicyRuleService {
                    !serviceId.getContextId().isBlank(), "Context Id of Service Id must not be empty.");
            checkArgument(!serviceId.getId().isBlank(), "Service Id must not be empty.");
            this.serviceId = serviceId;
            checkArgument(!deviceIds.isEmpty(), "Device Ids must not be empty.");
            // TODO If device list not empty
            // checkArgument(!deviceIds.isEmpty(), "Device Ids must not be empty.");
            this.deviceIds = deviceIds;
            this.isValid = true;
            this.exceptionMessage = "";
+12 −15
Changes for src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java: 12 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -16,29 +16,26 @@

package eu.teraflow.policy.monitoring.model;

import eu.teraflow.policy.common.Util;
import java.util.List;

public class AlarmDescriptor {
    private final String alarmId;
    private final String alarmDescription;
    private final String name;
    private final List<String> kpiIds;
    private final List<KpiValueRange> kpiValueRanges;
    private final String kpiId;
    private final KpiValueRange kpiValueRange;
    private final double timestamp;

    public AlarmDescriptor(
            String alarmId,
            String alarmDescription,
            String name,
            List<String> kpiIds,
            List<KpiValueRange> kpiValueRanges,
            String kpiId,
            KpiValueRange kpiValueRange,
            double timestamp) {
        this.alarmId = alarmId;
        this.alarmDescription = alarmDescription;
        this.name = name;
        this.kpiIds = kpiIds;
        this.kpiValueRanges = kpiValueRanges;
        this.kpiId = kpiId;
        this.kpiValueRange = kpiValueRange;
        this.timestamp = timestamp;
    }

@@ -54,12 +51,12 @@ public class AlarmDescriptor {
        return name;
    }

    public List<String> getKpiIds() {
        return kpiIds;
    public String getKpiId() {
        return kpiId;
    }

    public List<KpiValueRange> getKpiValueRanges() {
        return kpiValueRanges;
    public KpiValueRange getKpiValueRange() {
        return kpiValueRange;
    }

    public double getTimestamp() {
@@ -74,8 +71,8 @@ public class AlarmDescriptor {
                alarmId,
                alarmDescription,
                name,
                Util.toString(kpiIds),
                Util.toString(kpiValueRanges),
                kpiId,
                kpiValueRange,
                timestamp);
    }
}
+10 −13
Changes for src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java: 10 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -16,34 +16,31 @@

package eu.teraflow.policy.monitoring.model;

import eu.teraflow.policy.common.Util;
import java.util.List;

public class AlarmResponse {

    private final String alarmId;
    private final String text;
    private final KpiValue<?> kpiValue;

    public AlarmResponse(String alarmId, String text, KpiValue<?> kpiValue) {
    private final List<Kpi> kpiList;

    public AlarmResponse(String alarmId, List<Kpi> kpiList) {
        this.alarmId = alarmId;
        this.text = text;
        this.kpiValue = kpiValue;
        this.kpiList = kpiList;
    }

    public String getAlarmId() {
        return alarmId;
    }

    public String getText() {
        return text;
    }

    public KpiValue getKpiValue() {
        return kpiValue;
    public List<Kpi> getKpiList() {
        return kpiList;
    }

    @Override
    public String toString() {
        return String.format(
                "%s:{alarmId:\"%s\", text:\"%s\", %s}",
                getClass().getSimpleName(), alarmId, text, kpiValue);
                "%s:{alarmId:\"%s\", %s}", getClass().getSimpleName(), alarmId, Util.toString(kpiList));
    }
}
+48 −0
Changes for src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
/*
* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
*
* 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.
*/

package eu.teraflow.policy.monitoring.model;

public class MonitorKpiRequest {
    private final String kpiId;
    private final float monitoringWindow;
    private final float samplingRate;

    public MonitorKpiRequest(String kpiId, float monitoringWindow, float samplingRate) {
        this.kpiId = kpiId;
        this.monitoringWindow = monitoringWindow;
        this.samplingRate = samplingRate;
    }

    public String getKpiId() {
        return kpiId;
    }

    public float getMonitoringWindow() {
        return monitoringWindow;
    }

    public float getSamplingRate() {
        return samplingRate;
    }

    @Override
    public String toString() {
        return String.format(
                "%s:{KpiId:\"%s\", [%s], [%s]}",
                getClass().getSimpleName(), kpiId, monitoringWindow, samplingRate);
    }
}
+46 −0
Changes for src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java: 46 added lines, 0 removed lines.
Original line number Diff line number Diff line
/*
* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
*
* 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.
*/

package eu.teraflow.policy.monitoring.model;

import eu.teraflow.policy.common.Util;
import java.util.List;

public class SubsResponse {

    private final String subscriptionId;
    private final List<Kpi> kpiList;

    public SubsResponse(String subscriptionId, List<Kpi> kpiList) {
        this.subscriptionId = subscriptionId;
        this.kpiList = kpiList;
    }

    public String getSubscriptionId() {
        return subscriptionId;
    }

    public List<Kpi> getKpiList() {
        return kpiList;
    }

    @Override
    public String toString() {
        return String.format(
                "%s:{subscriptionId:\"%s\", %s}",
                getClass().getSimpleName(), subscriptionId, Util.toString(kpiList));
    }
}
Loading
Loading