Pre-merge code cleanup (7ac2084f) · Commits · TFS / controller

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ import context.ContextOuterClass.ServiceId;
		import io.quarkus.grpc.GrpcService;
		import io.smallrye.mutiny.Uni;
		import javax.inject.Inject;
		import org.eclipse.microprofile.metrics.MetricUnits;
		import org.eclipse.microprofile.metrics.annotation.Counted;
		import org.eclipse.microprofile.metrics.annotation.Timed;
		import policy.Policy;
		import policy.Policy.PolicyRuleBasic;
		import policy.Policy.PolicyRuleDevice;
		@@ -41,6 +44,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_policyAddService_counter")
		@Timed(name = "policy_policyAddService_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleState> policyAddService(PolicyRuleService request) {
		final var policyRuleService = serializer.deserialize(request);

		@@ -51,6 +56,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_policyUpdateService_counter")
		@Timed(name = "policy_policyUpdateService_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleState> policyUpdateService(PolicyRuleService request) {
		final var policyRuleService = serializer.deserialize(request);

		@@ -61,6 +68,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_policyAddDevice_counter")
		@Timed(name = "policy_policyAddDevice_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleState> policyAddDevice(PolicyRuleDevice request) {
		final var policyRuleDevice = serializer.deserialize(request);

		@@ -71,6 +80,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_policyUpdateDevice_counter")
		@Timed(name = "policy_policyUpdateDevice_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleState> policyUpdateDevice(PolicyRuleDevice request) {
		final var policyRuleDevice = serializer.deserialize(request);

		@@ -81,6 +92,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_policyDelete_counter")
		@Timed(name = "policy_policyDelete_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleState> policyDelete(PolicyRuleId request) {
		final var policyRuleId = serializer.deserialize(request);

		@@ -88,6 +101,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_getPolicyService_counter")
		@Timed(name = "policy_getPolicyService_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleService> getPolicyService(PolicyRuleId request) {
		final var policyRuleBasic = PolicyRuleBasic.newBuilder().setPolicyRuleId(request).build();

		@@ -96,6 +111,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_getPolicyDevice_counter")
		@Timed(name = "policy_getPolicyDevice_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleDevice> getPolicyDevice(PolicyRuleId request) {
		final var policyRuleBasic = PolicyRuleBasic.newBuilder().setPolicyRuleId(request).build();

		@@ -104,6 +121,8 @@ public class PolicyGatewayImpl implements PolicyGateway {
		}

		@Override
		@Counted(name = "policy_getPolicyByServiceId_counter")
		@Timed(name = "policy_getPolicyByServiceId_histogram", unit = MetricUnits.MILLISECONDS)
		public Uni<PolicyRuleServiceList> getPolicyByServiceId(ServiceId request) {
		return Uni.createFrom().item(() -> Policy.PolicyRuleServiceList.newBuilder().build());
		}

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

+11 −10

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ import monitoring.Monitoring;
		import monitoring.Monitoring.AlarmID;
		import monitoring.Monitoring.KpiId;
		import monitoring.Monitoring.SubscriptionID;
		import org.jboss.logging.Logger;
		import policy.Policy;
		import policy.Policy.PolicyRuleId;
		import policy.PolicyAction;
		@@ -110,8 +109,6 @@ import policy.PolicyCondition;
		@Singleton
		public class Serializer {

		private static final Logger LOGGER = Logger.getLogger(Serializer.class);

		public DeviceId serializeDeviceId(String expectedDeviceId) {
		final var builder = DeviceId.newBuilder();
		final var uuid = serializeUuid(expectedDeviceId);
		@@ -1576,8 +1573,8 @@ public class Serializer {
		serializedKpiValueMax = serialize(kpiValueMax);
		}

		builder.setKpiMaxValue(serializedKpiValueMax);
		builder.setKpiMinValue(serializedKpiValueMin);
		builder.setKpiMaxValue(serializedKpiValueMax);

		return builder.build();
		}
		@@ -1614,24 +1611,24 @@ public class Serializer {
		public Monitoring.AlarmDescriptor serialize(AlarmDescriptor alarmDescriptor) {
		final var builder = Monitoring.AlarmDescriptor.newBuilder();

		// final var alarmId = alarmDescriptor.getAlarmId();
		final var alarmId = alarmDescriptor.getAlarmId();
		final var alarmDescription = alarmDescriptor.getAlarmDescription();
		final var name = alarmDescriptor.getName();
		final var kpiId = alarmDescriptor.getKpiId();
		final var kpiValueRange = alarmDescriptor.getKpiValueRange();
		// final var timestamp = alarmDescriptor.getTimestamp();
		final var timestamp = alarmDescriptor.getTimestamp();

		// final var serializedAlarmId = serializeAlarmId(alarmId);
		final var serializedAlarmId = serializeAlarmId(alarmId);
		final var serializedKpiId = serializeKpiId(kpiId);
		final var serializedKpiValueRange = serialize(kpiValueRange);
		// final var serializedTimestamp = serialize(timestamp);
		final var serializedTimestamp = serialize(timestamp);

		// builder.setAlarmId(serializedAlarmId);
		builder.setAlarmId(serializedAlarmId);
		builder.setAlarmDescription(alarmDescription);
		builder.setName(name);
		builder.setKpiId(serializedKpiId);
		builder.setKpiValueRange(serializedKpiValueRange);
		// builder.setTimestamp(serializedTimestamp);
		builder.setTimestamp(serializedTimestamp);

		return builder.build();
		}
		@@ -2277,6 +2274,8 @@ public class Serializer {
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;
		case XR:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;
		case IETF_L2VPN:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN;
		case UNDEFINED:
		default:
		return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED;
		@@ -2298,6 +2297,8 @@ public class Serializer {
		return DeviceDriverEnum.ONF_TR_352;
		case DEVICEDRIVER_XR:
		return DeviceDriverEnum.XR;
		case DEVICEDRIVER_IETF_L2VPN:
		return DeviceDriverEnum.IETF_L2VPN;
		case DEVICEDRIVER_UNDEFINED:
		case UNRECOGNIZED:
		default:

src/tests/p4/tests/test_functional_cleanup.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ def test_scenario_cleanup(
		device_id = device['device_id']
		device_uuid = device_id['device_uuid']['uuid']
		LOGGER.info('Deleting Device {:s}'.format(device_uuid))
		context_client.RemoveDevice(DeviceId(**device_id))
		device_client.DeleteDevice(DeviceId(**device_id))

		response = context_client.ListDevices(Empty())
		assert len(response.devices) == 0

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

+1 −1

File changed.

Contains only whitespace changes.

src/policy/src/main/java/eu/teraflow/policy/common/Util.java

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.