Reference ConfigurationAdmin instead of Cycle for cycle time reading

Author: cvabc

io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/BridgeModbusTcpImpl.java

@@ -1,5 +1,6 @@
 package io.openems.edge.bridge.modbus;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.LocalDateTime;
@@ -9,8 +10,14 @@
 import io.openems.edge.bridge.modbus.api.LogVerbosity;
 import io.openems.edge.bridge.modbus.api.task.AbstractTask;
 import io.openems.edge.common.cycle.Cycle;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.*;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
 import org.osgi.service.event.propertytypes.EventTopics;
@@ -55,8 +62,10 @@ public class BridgeModbusTcpImpl extends AbstractModbusBridge
 	private int noSkipIdx = 0;
 	private long cycleIdx = 0;
 
+	private int coreCycleTime = 1000;
+
 	@Reference
-	private Cycle cycle;
+	protected ConfigurationAdmin cm;
 
 	public BridgeModbusTcpImpl() {
 		super(//
@@ -67,26 +76,27 @@ public BridgeModbusTcpImpl() {
 	}
 
 	@Activate
-	private void activate(ComponentContext context, ConfigTcp config) throws UnknownHostException {
+	private void activate(ComponentContext context, ConfigTcp config) throws IOException {
 		super.activate(context, config.id(), config.alias(), config.enabled(), config.logVerbosity(),
 				config.invalidateElementsAfterReadErrors());
 		this.applyConfig(config);
 	}
 
 	@Modified
-	private void modified(ComponentContext context, ConfigTcp config) throws UnknownHostException {
+	private void modified(ComponentContext context, ConfigTcp config) throws IOException {
 		super.modified(context, config.id(), config.alias(), config.enabled(), config.logVerbosity(),
 				config.invalidateElementsAfterReadErrors());
 		this.applyConfig(config);
 		this.closeModbusConnection();
 	}
 
-	private void applyConfig(ConfigTcp config) {
+	private void applyConfig(ConfigTcp config) throws IOException {
 		this.setIpAddress(InetAddressUtils.parseOrNull(config.ip()));
 		this.port = config.port();
-		this.noSkipIdx = (int)Math.ceil(config.intervalBetweenAccesses() * 1.0 / cycle.getCycleTime());
+		this.coreCycleTime = (int) (Integer) this.cm.getConfiguration("Core.Cycle").getProperties().get("cycleTime");
+		this.noSkipIdx = (int)Math.ceil(config.intervalBetweenAccesses() * 1.0 / this.coreCycleTime);
 		this.noSkipIdx = Math.max(this.noSkipIdx, 1);
-		this.logCycle("applyConfig: cycleTime=" + cycle.getCycleTime()
+		this.logCycle("applyConfig: cycleTime=" + this.coreCycleTime
 			+ ", interval=" + config.intervalBetweenAccesses()
 			+ ", noSkipIdx=" + this.noSkipIdx);
 	}
@@ -162,11 +172,11 @@ public void handleEvent(Event event) {
 		}
 
 		if (this.isNewCycle(event)) {
-			shouldSkip = this.cycleIdx % this.noSkipIdx != 0;
-			this.logCycle("handleEvent: Cycle " + this.cycleIdx + (shouldSkip ? " will" : " won't") + " be skipped");
+			this.shouldSkip = this.cycleIdx % this.noSkipIdx != 0;
+			this.logCycle("handleEvent: Cycle " + this.cycleIdx + (this.shouldSkip ? " will" : " won't") + " be skipped");
 			this.cycleIdx++;
 		}
-		if (shouldSkip) {
+		if (this.shouldSkip) {
 			return;
 		}
 

io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java

@@ -1,5 +1,6 @@
 package io.openems.edge.bridge.modbus;
 
+import io.openems.edge.common.test.DummyConfigurationAdmin;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -25,6 +26,9 @@
 import io.openems.edge.common.test.DummyCycle;
 import io.openems.edge.common.test.TestUtils;
 
+import java.util.Dictionary;
+import java.util.Hashtable;
+
 public class BridgeModbusTcpImplTest {
 
 	private static final String MODBUS_ID = "modbus0";
@@ -128,16 +132,20 @@ public void testSkipInterval() throws Exception {
 			slave.addProcessImage(UNIT_ID, processImage);
 			slave.open();
 
-			int NUM_TESTS, MAX_INTERVAL;
+			var cm = new DummyConfigurationAdmin();
+			var cfg = cm.createFactoryConfiguration("Core.Cycle", null);
+			Dictionary<String, Object> properties = new Hashtable<>();
+			properties.put("cycleTime", 100);
+			cfg.update(properties);
 
 			// interval = 0, should not change original modbus behavior
-			NUM_TESTS = 1;
-			for (int i = 0; i < NUM_TESTS; i++) {
+			int numTests = 1;
+			for (int i = 0; i < numTests; i++) {
 				var sut = new BridgeModbusTcpImpl();
 				var device = new MyModbusComponent(DEVICE_ID, sut, UNIT_ID);
 				var test = new ComponentTest(sut) //
 						.addComponent(device) //
-						.addReference("cycle", new DummyCycle(CYCLE_TIME));
+						.addReference("cm", cm);
 
 				test.activate(MyConfigTcp.create() //
 						.setId(MODBUS_ID) //
@@ -167,17 +175,17 @@ public void testSkipInterval() throws Exception {
 				// Important! Otherwise, new sut cannot connect to the slave (only 1 slave thread)
 				sut.deactivate();
 			}
-			// 0 <= interval < MAX_INTERVAL
-			NUM_TESTS = 7;
-			MAX_INTERVAL = CYCLE_TIME * 3;
-			for (int i = 0; i < NUM_TESTS; i++) {
+			// 0 <= interval < maxInterval
+			numTests = 7;
+			int maxInterval = CYCLE_TIME * 3;
+			for (int i = 0; i < numTests; i++) {
 				var sut = new BridgeModbusTcpImpl();
 				var device = new MyModbusComponent(DEVICE_ID, sut, UNIT_ID);
 				var test = new ComponentTest(sut) //
-						.addComponent(device) //
-						.addReference("cycle", new DummyCycle(CYCLE_TIME));
+						.addComponent(device)
+						.addReference("cm", cm);
 
-				int interval = MAX_INTERVAL * i / NUM_TESTS;
+				int interval = maxInterval * i / numTests;
 				int skips = (int)Math.ceil(interval * 1.0 / CYCLE_TIME) - 1;
 
 				System.out.println("Interval=" + interval + ", skips=" + skips);