Fix ZtpDelete rpc (f835b3da) · Commits · TFS / controller

src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -76,12 +76,11 @@ public class AutomationGatewayImpl implements AutomationGateway {

		@Override
		public Uni<Automation.DeviceRoleState> ztpDelete(Automation.DeviceRole request) {
		return Uni.createFrom()
		.item(
		() ->
		Automation.DeviceRoleState.newBuilder()
		.setDevRoleId(request.getDevRoleId())
		.build());
		final var devRoleId = request.getDevRoleId().getDevRoleId().getUuid();
		return automationService
		.deleteDevice(devRoleId)
		.onItem()
		.transform(device -> transformToDeviceRoleState(device, devRoleId, DeviceState.DELETED));
		}

		@Override

src/automation/src/main/java/eu/teraflow/automation/ContextSubscriber.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ public class ContextSubscriber {
		break;
		case UPDATE:
		LOGGER.warnf(
		"Received %s for device [%s]. " +
		"No automation action on an already updated device",
		"Received %s for device [%s]. "
		+ "No automation action on an already updated device",
		event, deviceId);
		break;
		case UNDEFINED:

src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java

+47 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,53 @@ class AutomationServiceTest {
		final var uuid = serializer.serializeUuid(UUID_VALUE);
		final var deviceRoleId = Automation.DeviceRoleId.newBuilder().setDevRoleId(uuid).build();
		final var deviceRole = Automation.DeviceRole.newBuilder().setDevRoleId(deviceRoleId).build();
		final var DEVICE_ID = "0f14d0ab-9608-7862-a9e4-5ed26688389b";
		final var DEVICE_ROLE_ID = "0f14d0ab-9608-7862-a9e4-5ed26688389a";
		final var DEVICE_TYPE = "ztp";

		final var deviceDrivers = List.of(DeviceDriverEnum.IETF_NETWORK_TOPOLOGY, DeviceDriverEnum.P4);

		final var topologyIdA = new TopologyId("contextIdA", "idA");
		final var deviceIdA = "deviceIdA";
		final var idA = "idA";
		final var endPointIdA = new EndPointId(topologyIdA, deviceIdA, idA);

		final var endPointTypeA = "endPointTypeA";
		final var kpiSampleTypesA =
		List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED);
		final var locationTypeRegionA = new LocationTypeRegion("ATH");
		final var locationA = new Location(locationTypeRegionA);
		final var endPointA =
		new EndPointBuilder(endPointIdA, endPointTypeA, kpiSampleTypesA)
		.location(locationA)
		.build();

		final var topologyIdB = new TopologyId("contextIdB", "idB");
		final var deviceIdB = "deviceIdB";
		final var idB = "idB";
		final var endPointIdB = new EndPointId(topologyIdB, deviceIdB, idB);
		final var endPointTypeB = "endPointTypeB";
		final var kpiSampleTypesB =
		List.of(KpiSampleType.BYTES_RECEIVED, KpiSampleType.BYTES_TRANSMITTED);
		final var locationTypeRegionB = new LocationTypeRegion("ATH");
		final var locationB = new Location(locationTypeRegionB);
		final var endPointB =
		new EndPointBuilder(endPointIdB, endPointTypeB, kpiSampleTypesB)
		.location(locationB)
		.build();

		final var endPoints = List.of(endPointA, endPointB);

		final var emptyDeviceConfig = new DeviceConfig(List.of());
		final var device =
		new Device(
		DEVICE_ID,
		DEVICE_TYPE,
		emptyDeviceConfig,
		DeviceOperationalStatus.ENABLED,
		deviceDrivers,
		endPoints);
		Mockito.when(contextGateway.getDevice(Mockito.any())).thenReturn(Uni.createFrom().item(device));

		client
		.ztpDelete(deviceRole)

src/automation/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java

+120 −4

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ public final class KpiSampleTypes {
		* <code>KPISAMPLETYPE_PACKETS_RECEIVED = 102;</code>
		*/
		KPISAMPLETYPE_PACKETS_RECEIVED(102),
		/**
		* <code>KPISAMPLETYPE_PACKETS_DROPPED = 103;</code>
		*/
		KPISAMPLETYPE_PACKETS_DROPPED(103),
		/**
		* <code>KPISAMPLETYPE_BYTES_TRANSMITTED = 201;</code>
		*/
		@@ -39,6 +43,50 @@ public final class KpiSampleTypes {
		* <code>KPISAMPLETYPE_BYTES_RECEIVED = 202;</code>
		*/
		KPISAMPLETYPE_BYTES_RECEIVED(202),
		/**
		* <code>KPISAMPLETYPE_BYTES_DROPPED = 203;</code>
		*/
		KPISAMPLETYPE_BYTES_DROPPED(203),
		/**
		* <pre>
		*. can be used by both optical and L3 without any issue
		* </pre>
		*
		* <code>KPISAMPLETYPE_ML_CONFIDENCE = 401;</code>
		*/
		KPISAMPLETYPE_ML_CONFIDENCE(401),
		/**
		* <pre>
		*. can be used by both optical and L3 without any issue
		* </pre>
		*
		* <code>KPISAMPLETYPE_OPTICAL_SECURITY_STATUS = 501;</code>
		*/
		KPISAMPLETYPE_OPTICAL_SECURITY_STATUS(501),
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS = 601;</code>
		*/
		KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS(601),
		/**
		* <code>KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS = 602;</code>
		*/
		KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS(602),
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_ATTACKERS = 603;</code>
		*/
		KPISAMPLETYPE_L3_UNIQUE_ATTACKERS(603),
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS = 604;</code>
		*/
		KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS(604),
		/**
		* <code>KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO = 605;</code>
		*/
		KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO(605),
		/**
		* <code>KPISAMPLETYPE_SERVICE_LATENCY_MS = 701;</code>
		*/
		KPISAMPLETYPE_SERVICE_LATENCY_MS(701),
		UNRECOGNIZED(-1),
		;

		@@ -54,6 +102,10 @@ public final class KpiSampleTypes {
		* <code>KPISAMPLETYPE_PACKETS_RECEIVED = 102;</code>
		*/
		public static final int KPISAMPLETYPE_PACKETS_RECEIVED_VALUE = 102;
		/**
		* <code>KPISAMPLETYPE_PACKETS_DROPPED = 103;</code>
		*/
		public static final int KPISAMPLETYPE_PACKETS_DROPPED_VALUE = 103;
		/**
		* <code>KPISAMPLETYPE_BYTES_TRANSMITTED = 201;</code>
		*/
		@@ -62,6 +114,50 @@ public final class KpiSampleTypes {
		* <code>KPISAMPLETYPE_BYTES_RECEIVED = 202;</code>
		*/
		public static final int KPISAMPLETYPE_BYTES_RECEIVED_VALUE = 202;
		/**
		* <code>KPISAMPLETYPE_BYTES_DROPPED = 203;</code>
		*/
		public static final int KPISAMPLETYPE_BYTES_DROPPED_VALUE = 203;
		/**
		* <pre>
		*. can be used by both optical and L3 without any issue
		* </pre>
		*
		* <code>KPISAMPLETYPE_ML_CONFIDENCE = 401;</code>
		*/
		public static final int KPISAMPLETYPE_ML_CONFIDENCE_VALUE = 401;
		/**
		* <pre>
		*. can be used by both optical and L3 without any issue
		* </pre>
		*
		* <code>KPISAMPLETYPE_OPTICAL_SECURITY_STATUS = 501;</code>
		*/
		public static final int KPISAMPLETYPE_OPTICAL_SECURITY_STATUS_VALUE = 501;
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS = 601;</code>
		*/
		public static final int KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS_VALUE = 601;
		/**
		* <code>KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS = 602;</code>
		*/
		public static final int KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS_VALUE = 602;
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_ATTACKERS = 603;</code>
		*/
		public static final int KPISAMPLETYPE_L3_UNIQUE_ATTACKERS_VALUE = 603;
		/**
		* <code>KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS = 604;</code>
		*/
		public static final int KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS_VALUE = 604;
		/**
		* <code>KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO = 605;</code>
		*/
		public static final int KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO_VALUE = 605;
		/**
		* <code>KPISAMPLETYPE_SERVICE_LATENCY_MS = 701;</code>
		*/
		public static final int KPISAMPLETYPE_SERVICE_LATENCY_MS_VALUE = 701;


		public final int getNumber() {
		@@ -91,8 +187,18 @@ public final class KpiSampleTypes {
		case 0: return KPISAMPLETYPE_UNKNOWN;
		case 101: return KPISAMPLETYPE_PACKETS_TRANSMITTED;
		case 102: return KPISAMPLETYPE_PACKETS_RECEIVED;
		case 103: return KPISAMPLETYPE_PACKETS_DROPPED;
		case 201: return KPISAMPLETYPE_BYTES_TRANSMITTED;
		case 202: return KPISAMPLETYPE_BYTES_RECEIVED;
		case 203: return KPISAMPLETYPE_BYTES_DROPPED;
		case 401: return KPISAMPLETYPE_ML_CONFIDENCE;
		case 501: return KPISAMPLETYPE_OPTICAL_SECURITY_STATUS;
		case 601: return KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS;
		case 602: return KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS;
		case 603: return KPISAMPLETYPE_L3_UNIQUE_ATTACKERS;
		case 604: return KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CLIENTS;
		case 605: return KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO;
		case 701: return KPISAMPLETYPE_SERVICE_LATENCY_MS;
		default: return null;
		}
		}
		@@ -159,12 +265,22 @@ public final class KpiSampleTypes {
		static {
		java.lang.String[] descriptorData = {
		"\n\026kpi_sample_types.proto\022\020kpi_sample_typ" +
		"es*\276\001\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" +
		"es*\327\004\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" +
		"KNOWN\020\000\022%\n!KPISAMPLETYPE_PACKETS_TRANSMI" +
		"TTED\020e\022\"\n\036KPISAMPLETYPE_PACKETS_RECEIVED" +
		"\020f\022$\n\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001" +
		"\022!\n\034KPISAMPLETYPE_BYTES_RECEIVED\020\312\001b\006pro" +
		"to3"
		"\020f\022!\n\035KPISAMPLETYPE_PACKETS_DROPPED\020g\022$\n" +
		"\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001\022!\n\034K" +
		"PISAMPLETYPE_BYTES_RECEIVED\020\312\001\022 \n\033KPISAM" +
		"PLETYPE_BYTES_DROPPED\020\313\001\022 \n\033KPISAMPLETYP" +
		"E_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLETYPE_OPTI" +
		"CAL_SECURITY_STATUS\020\365\003\022)\n$KPISAMPLETYPE_" +
		"L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KPISAMPLETY" +
		"PE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&\n!KPISAMP" +
		"LETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220\n+KPISAMP" +
		"LETYPE_L3_UNIQUE_COMPROMISED_CLIENTS\020\334\004\022" +
		",\n\'KPISAMPLETYPE_L3_SECURITY_STATUS_CRYP" +
		"TO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_LATENCY_M" +
		"S\020\275\005b\006proto3"
		};
		descriptor = com.google.protobuf.Descriptors.FileDescriptor
		.internalBuildGeneratedFileFrom(descriptorData,

src/automation/target/generated-sources/grpc/monitoring/Monitoring.java

+4343 −2252

File changed.

Preview size limit exceeded, changes collapsed.