refactor: renamed all Automation occurences to Ztp (de5f7528) · Commits · TFS / controller

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

+13 −15

Original line number	Original line	Diff line number	Diff line
	@@ -14,11 +14,11 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package eu.teraflow.automation;		package eu.teraflow.ztp;

	import eu.teraflow.automation.context.ContextService;		import eu.teraflow.ztp.context.ContextService;
	import eu.teraflow.automation.context.model.Event;		import eu.teraflow.ztp.context.model.Event;
	import eu.teraflow.automation.context.model.EventTypeEnum;		import eu.teraflow.ztp.context.model.EventTypeEnum;
	import io.quarkus.runtime.StartupEvent;		import io.quarkus.runtime.StartupEvent;
	import java.time.Duration;		import java.time.Duration;
	import javax.enterprise.context.ApplicationScoped;		import javax.enterprise.context.ApplicationScoped;
	@@ -32,17 +32,15 @@ public class ContextSubscriber {
	private static final Logger LOGGER = Logger.getLogger(ContextSubscriber.class);		private static final Logger LOGGER = Logger.getLogger(ContextSubscriber.class);

	private final ContextService contextService;		private final ContextService contextService;
	private final AutomationService automationService;		private final ZtpService ztpService;
	private final AutomationConfiguration automationConfiguration;		private final ZtpConfiguration ztpConfiguration;

	@Inject		@Inject
	public ContextSubscriber(		public ContextSubscriber(
	ContextService contextService,		ContextService contextService, ZtpService ztpService, ZtpConfiguration ztpConfiguration) {
	AutomationService automationService,
	AutomationConfiguration automationConfiguration) {
	this.contextService = contextService;		this.contextService = contextService;
	this.automationService = automationService;		this.ztpService = ztpService;
	this.automationConfiguration = automationConfiguration;		this.ztpConfiguration = ztpConfiguration;
	}		}

	public void listenForDeviceEvents() {		public void listenForDeviceEvents() {
	@@ -71,16 +69,16 @@ public class ContextSubscriber {
	switch (eventType) {		switch (eventType) {
	case CREATE:		case CREATE:
	LOGGER.infof("Received %s for device [%s]", event, deviceId);		LOGGER.infof("Received %s for device [%s]", event, deviceId);
	automationService.addDevice(deviceEvent.getDeviceId());		ztpService.addDevice(deviceEvent.getDeviceId());
	break;		break;
	case REMOVE:		case REMOVE:
	LOGGER.infof("Received %s for device [%s]", event, deviceId);		LOGGER.infof("Received %s for device [%s]", event, deviceId);
	automationService.deleteDevice(deviceEvent.getDeviceId());		ztpService.deleteDevice(deviceEvent.getDeviceId());
	break;		break;
	case UPDATE:		case UPDATE:
	LOGGER.warnf(		LOGGER.warnf(
	"Received %s for device [%s]. "		"Received %s for device [%s]. "
	+ "No automation action on an already updated device",		+ "No ztp action on an already updated device",
	event, deviceId);		event, deviceId);
	break;		break;
	case UNDEFINED:		case UNDEFINED:
	@@ -92,7 +90,7 @@ public class ContextSubscriber {

	void onStart(@Observes StartupEvent ev) {		void onStart(@Observes StartupEvent ev) {

	if (automationConfiguration.shouldSubscribeToContextComponent()) {		if (ztpConfiguration.shouldSubscribeToContextComponent()) {
	LOGGER.info("Subscribing to Context service for device events...");		LOGGER.info("Subscribing to Context service for device events...");
	listenForDeviceEvents();		listenForDeviceEvents();
	} else {		} else {

src/automation/src/main/java/eu/teraflow/automation/Serializer.java→src/automation/src/main/java/eu/teraflow/ztp/Serializer.java

+55 −55

Original line number	Original line	Diff line number	Diff line
	@@ -14,11 +14,9 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package eu.teraflow.automation;		package eu.teraflow.ztp;

	import acl.Acl;		import acl.Acl;
	import automation.Automation;
	import automation.Automation.ZtpDeviceState;
	import context.ContextOuterClass;		import context.ContextOuterClass;
	import context.ContextOuterClass.ConfigRule_ACL;		import context.ContextOuterClass.ConfigRule_ACL;
	import context.ContextOuterClass.ConfigRule_Custom;		import context.ContextOuterClass.ConfigRule_Custom;
	@@ -27,43 +25,45 @@ import context.ContextOuterClass.DeviceId;
	import context.ContextOuterClass.DeviceOperationalStatusEnum;		import context.ContextOuterClass.DeviceOperationalStatusEnum;
	import context.ContextOuterClass.Location.LocationCase;		import context.ContextOuterClass.Location.LocationCase;
	import context.ContextOuterClass.Uuid;		import context.ContextOuterClass.Uuid;
	import eu.teraflow.automation.acl.AclAction;		import eu.teraflow.ztp.acl.AclAction;
	import eu.teraflow.automation.acl.AclEntry;		import eu.teraflow.ztp.acl.AclEntry;
	import eu.teraflow.automation.acl.AclForwardActionEnum;		import eu.teraflow.ztp.acl.AclForwardActionEnum;
	import eu.teraflow.automation.acl.AclLogActionEnum;		import eu.teraflow.ztp.acl.AclLogActionEnum;
	import eu.teraflow.automation.acl.AclMatch;		import eu.teraflow.ztp.acl.AclMatch;
	import eu.teraflow.automation.acl.AclRuleSet;		import eu.teraflow.ztp.acl.AclRuleSet;
	import eu.teraflow.automation.acl.AclRuleTypeEnum;		import eu.teraflow.ztp.acl.AclRuleTypeEnum;
	import eu.teraflow.automation.context.model.ConfigActionEnum;		import eu.teraflow.ztp.context.model.ConfigActionEnum;
	import eu.teraflow.automation.context.model.ConfigRule;		import eu.teraflow.ztp.context.model.ConfigRule;
	import eu.teraflow.automation.context.model.ConfigRuleAcl;		import eu.teraflow.ztp.context.model.ConfigRuleAcl;
	import eu.teraflow.automation.context.model.ConfigRuleCustom;		import eu.teraflow.ztp.context.model.ConfigRuleCustom;
	import eu.teraflow.automation.context.model.ConfigRuleTypeAcl;		import eu.teraflow.ztp.context.model.ConfigRuleTypeAcl;
	import eu.teraflow.automation.context.model.ConfigRuleTypeCustom;		import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom;
	import eu.teraflow.automation.context.model.Device;		import eu.teraflow.ztp.context.model.Device;
	import eu.teraflow.automation.context.model.DeviceConfig;		import eu.teraflow.ztp.context.model.DeviceConfig;
	import eu.teraflow.automation.context.model.DeviceDriverEnum;		import eu.teraflow.ztp.context.model.DeviceDriverEnum;
	import eu.teraflow.automation.context.model.DeviceEvent;		import eu.teraflow.ztp.context.model.DeviceEvent;
	import eu.teraflow.automation.context.model.DeviceOperationalStatus;		import eu.teraflow.ztp.context.model.DeviceOperationalStatus;
	import eu.teraflow.automation.context.model.Empty;		import eu.teraflow.ztp.context.model.Empty;
	import eu.teraflow.automation.context.model.EndPoint;		import eu.teraflow.ztp.context.model.EndPoint;
	import eu.teraflow.automation.context.model.EndPointId;		import eu.teraflow.ztp.context.model.EndPointId;
	import eu.teraflow.automation.context.model.Event;		import eu.teraflow.ztp.context.model.Event;
	import eu.teraflow.automation.context.model.EventTypeEnum;		import eu.teraflow.ztp.context.model.EventTypeEnum;
	import eu.teraflow.automation.context.model.GpsPosition;		import eu.teraflow.ztp.context.model.GpsPosition;
	import eu.teraflow.automation.context.model.Location;		import eu.teraflow.ztp.context.model.Location;
	import eu.teraflow.automation.context.model.LocationTypeGpsPosition;		import eu.teraflow.ztp.context.model.LocationTypeGpsPosition;
	import eu.teraflow.automation.context.model.LocationTypeRegion;		import eu.teraflow.ztp.context.model.LocationTypeRegion;
	import eu.teraflow.automation.context.model.TopologyId;		import eu.teraflow.ztp.context.model.TopologyId;
	import eu.teraflow.automation.kpi_sample_types.model.KpiSampleType;		import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType;
	import eu.teraflow.automation.model.DeviceRole;		import eu.teraflow.ztp.model.DeviceRole;
	import eu.teraflow.automation.model.DeviceRoleConfig;		import eu.teraflow.ztp.model.DeviceRoleConfig;
	import eu.teraflow.automation.model.DeviceRoleId;		import eu.teraflow.ztp.model.DeviceRoleId;
	import eu.teraflow.automation.model.DeviceRoleType;		import eu.teraflow.ztp.model.DeviceRoleType;
	import eu.teraflow.automation.model.DeviceState;		import eu.teraflow.ztp.model.DeviceState;
	import java.util.stream.Collectors;		import java.util.stream.Collectors;
	import javax.inject.Singleton;		import javax.inject.Singleton;
	import kpi_sample_types.KpiSampleTypes;		import kpi_sample_types.KpiSampleTypes;
			import ztp.Ztp;
			import ztp.Ztp.ZtpDeviceState;

	@Singleton		@Singleton
	public class Serializer {		public class Serializer {
	@@ -81,8 +81,8 @@ public class Serializer {
	return deviceId.getDeviceUuid().getUuid();		return deviceId.getDeviceUuid().getUuid();
	}		}

	public Automation.DeviceRoleId serialize(DeviceRoleId deviceRoleId) {		public Ztp.DeviceRoleId serialize(DeviceRoleId deviceRoleId) {
	final var builder = Automation.DeviceRoleId.newBuilder();		final var builder = Ztp.DeviceRoleId.newBuilder();

	final var deviceRoleDevRoleId = deviceRoleId.getId();		final var deviceRoleDevRoleId = deviceRoleId.getId();
	final var deviceRoleDeviceId = deviceRoleId.getDeviceId();		final var deviceRoleDeviceId = deviceRoleId.getDeviceId();
	@@ -98,29 +98,29 @@ public class Serializer {
	return builder.build();		return builder.build();
	}		}

	public DeviceRoleId deserialize(Automation.DeviceRoleId deviceRoleId) {		public DeviceRoleId deserialize(Ztp.DeviceRoleId deviceRoleId) {
	final var devRoleId = deserialize(deviceRoleId.getDevRoleId());		final var devRoleId = deserialize(deviceRoleId.getDevRoleId());
	final var devId = deserialize(deviceRoleId.getDevId());		final var devId = deserialize(deviceRoleId.getDevId());

	return new DeviceRoleId(devRoleId, devId);		return new DeviceRoleId(devRoleId, devId);
	}		}

	public Automation.DeviceRoleType serialize(DeviceRoleType deviceRoleType) {		public Ztp.DeviceRoleType serialize(DeviceRoleType deviceRoleType) {
	switch (deviceRoleType) {		switch (deviceRoleType) {
	case NONE:		case NONE:
	return Automation.DeviceRoleType.NONE;		return Ztp.DeviceRoleType.NONE;
	case DEV_OPS:		case DEV_OPS:
	return Automation.DeviceRoleType.DEV_OPS;		return Ztp.DeviceRoleType.DEV_OPS;
	case DEV_CONF:		case DEV_CONF:
	return Automation.DeviceRoleType.DEV_CONF;		return Ztp.DeviceRoleType.DEV_CONF;
	case PIPELINE_CONF:		case PIPELINE_CONF:
	return Automation.DeviceRoleType.PIPELINE_CONF;		return Ztp.DeviceRoleType.PIPELINE_CONF;
	default:		default:
	return Automation.DeviceRoleType.UNRECOGNIZED;		return Ztp.DeviceRoleType.UNRECOGNIZED;
	}		}
	}		}

	public DeviceRoleType deserialize(Automation.DeviceRoleType serializedDeviceRoleType) {		public DeviceRoleType deserialize(Ztp.DeviceRoleType serializedDeviceRoleType) {
	switch (serializedDeviceRoleType) {		switch (serializedDeviceRoleType) {
	case DEV_OPS:		case DEV_OPS:
	return DeviceRoleType.DEV_OPS;		return DeviceRoleType.DEV_OPS;
	@@ -135,7 +135,7 @@ public class Serializer {
	}		}
	}		}

	public Automation.ZtpDeviceState serialize(DeviceState deviceState) {		public Ztp.ZtpDeviceState serialize(DeviceState deviceState) {
	switch (deviceState) {		switch (deviceState) {
	case CREATED:		case CREATED:
	return ZtpDeviceState.ZTP_DEV_STATE_CREATED;		return ZtpDeviceState.ZTP_DEV_STATE_CREATED;
	@@ -150,7 +150,7 @@ public class Serializer {
	}		}
	}		}

	public DeviceState deserialize(Automation.ZtpDeviceState serializedDeviceState) {		public DeviceState deserialize(Ztp.ZtpDeviceState serializedDeviceState) {
	switch (serializedDeviceState) {		switch (serializedDeviceState) {
	case ZTP_DEV_STATE_CREATED:		case ZTP_DEV_STATE_CREATED:
	return DeviceState.CREATED;		return DeviceState.CREATED;
	@@ -165,8 +165,8 @@ public class Serializer {
	}		}
	}		}

	public Automation.DeviceRole serialize(DeviceRole deviceRole) {		public Ztp.DeviceRole serialize(DeviceRole deviceRole) {
	final var builder = Automation.DeviceRole.newBuilder();		final var builder = Ztp.DeviceRole.newBuilder();
	final var serializedDeviceRoleId = serialize(deviceRole.getDeviceRoleId());		final var serializedDeviceRoleId = serialize(deviceRole.getDeviceRoleId());
	final var serializedDeviceRoleType = serialize(deviceRole.getType());		final var serializedDeviceRoleType = serialize(deviceRole.getType());

	@@ -176,15 +176,15 @@ public class Serializer {
	return builder.build();		return builder.build();
	}		}

	public DeviceRole deserialize(Automation.DeviceRole deviceRole) {		public DeviceRole deserialize(Ztp.DeviceRole deviceRole) {
	final var deviceRoleId = deserialize(deviceRole.getDevRoleId());		final var deviceRoleId = deserialize(deviceRole.getDevRoleId());
	final var deviceRoleType = deserialize(deviceRole.getDevRoleType());		final var deviceRoleType = deserialize(deviceRole.getDevRoleType());

	return new DeviceRole(deviceRoleId, deviceRoleType);		return new DeviceRole(deviceRoleId, deviceRoleType);
	}		}

	public Automation.DeviceRoleConfig serialize(DeviceRoleConfig deviceRoleConfig) {		public Ztp.DeviceRoleConfig serialize(DeviceRoleConfig deviceRoleConfig) {
	final var builder = Automation.DeviceRoleConfig.newBuilder();		final var builder = Ztp.DeviceRoleConfig.newBuilder();
	final var serializedDeviceRole = serialize(deviceRoleConfig.getDeviceRole());		final var serializedDeviceRole = serialize(deviceRoleConfig.getDeviceRole());
	final var serializedDeviceConfig = serialize(deviceRoleConfig.getDeviceConfig());		final var serializedDeviceConfig = serialize(deviceRoleConfig.getDeviceConfig());

	@@ -194,7 +194,7 @@ public class Serializer {
	return builder.build();		return builder.build();
	}		}

	public DeviceRoleConfig deserialize(Automation.DeviceRoleConfig deviceRoleConfig) {		public DeviceRoleConfig deserialize(Ztp.DeviceRoleConfig deviceRoleConfig) {
	final var deviceRole = deserialize(deviceRoleConfig.getDevRole());		final var deviceRole = deserialize(deviceRoleConfig.getDevRole());
	final var deviceConfig = deserialize(deviceRoleConfig.getDevConfig());		final var deviceConfig = deserialize(deviceRoleConfig.getDevConfig());

src/automation/src/main/java/eu/teraflow/automation/SimpleLivenessCheck.java→src/automation/src/main/java/eu/teraflow/ztp/SimpleLivenessCheck.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package eu.teraflow.automation;		package eu.teraflow.ztp;

	import javax.enterprise.context.ApplicationScoped;		import javax.enterprise.context.ApplicationScoped;
	import org.eclipse.microprofile.health.HealthCheck;		import org.eclipse.microprofile.health.HealthCheck;
	@@ -27,6 +27,6 @@ public class SimpleLivenessCheck implements HealthCheck {

	@Override		@Override
	public HealthCheckResponse call() {		public HealthCheckResponse call() {
	return HealthCheckResponse.up("Automation Service is live");		return HealthCheckResponse.up("Ztp Service is live");
	}		}
	}		}

src/automation/src/main/java/eu/teraflow/automation/SimpleReadinessCheck.java→src/automation/src/main/java/eu/teraflow/ztp/SimpleReadinessCheck.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package eu.teraflow.automation;		package eu.teraflow.ztp;

	import javax.enterprise.context.ApplicationScoped;		import javax.enterprise.context.ApplicationScoped;
	import org.eclipse.microprofile.health.HealthCheck;		import org.eclipse.microprofile.health.HealthCheck;
	@@ -28,6 +28,6 @@ public class SimpleReadinessCheck implements HealthCheck {
	@Override		@Override
	public HealthCheckResponse call() {		public HealthCheckResponse call() {

	return HealthCheckResponse.up("Automation Service is ready");		return HealthCheckResponse.up("Ztp Service is ready");
	}		}
	}		}

src/automation/src/main/java/eu/teraflow/automation/AutomationConfiguration.java→src/automation/src/main/java/eu/teraflow/ztp/ZtpConfiguration.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,12 +14,12 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package eu.teraflow.automation;		package eu.teraflow.ztp;

	import io.smallrye.config.ConfigMapping;		import io.smallrye.config.ConfigMapping;

	@ConfigMapping(prefix = "automation")		@ConfigMapping(prefix = "ztp")
	public interface AutomationConfiguration {		public interface ZtpConfiguration {

	boolean shouldSubscribeToContextComponent();		boolean shouldSubscribeToContextComponent();
	}		}