[dsmr] Add bridgeUID to thingUID during discovery (openhab#8446)

Signed-off-by: Wouter Born <github@maindrain.net>
andrewfg · Oct 8, 2020 · 789ee34 · 789ee34
1 parent 27eaf31
commit 789ee34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/....dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRDiscoveryService.java b/....dsmr/src/main/java/org/openhab/binding/dsmr/internal/discovery/DSMRDiscoveryService.java
@@ -70,7 +70,7 @@ public DSMRDiscoveryService() {
  public boolean meterDiscovered(DSMRMeterDescriptor meterDescriptor, ThingUID dsmrBridgeUID) {
  DSMRMeterType meterType = meterDescriptor.getMeterType();
  ThingTypeUID thingTypeUID = meterType.getThingTypeUID();
- ThingUID thingUID = new ThingUID(thingTypeUID, meterDescriptor.getChannelId());
+ ThingUID thingUID = new ThingUID(thingTypeUID, dsmrBridgeUID, meterDescriptor.getChannelId());
 
  // Construct the configuration for this meter
  Map<String, Object> properties = new HashMap<>();

diff --git a/.../test/java/org/openhab/binding/dsmr/internal/discovery/DSMRMeterDiscoveryServiceTest.java b/.../test/java/org/openhab/binding/dsmr/internal/discovery/DSMRMeterDiscoveryServiceTest.java
@@ -27,6 +27,7 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.thing.Thing;
+import org.eclipse.smarthome.core.thing.ThingUID;
 import org.eclipse.smarthome.io.transport.serial.PortInUseException;
 import org.junit.Before;
 import org.junit.Test;
@@ -95,6 +96,7 @@ protected void reportConfigurationValidationResults(List<DSMRMeterType> invalidC
  return detectMetersRef.get().next();
  });
  when(thing.getHandler()).thenReturn(meterHandler);
+ when(bridge.getThing().getUID()).thenReturn(new ThingUID("dsmr:dsmrBridge:22e5393c"));
  when(bridge.getThing().getThings()).thenReturn(things);
 
  service.telegramReceived(expected);
@@ -122,6 +124,7 @@ protected void reportUnregisteredMeters() {
  unregisteredMeter.set(true);
  }
  };
+ when(bridge.getThing().getUID()).thenReturn(new ThingUID("dsmr:dsmrBridge:22e5393c"));
  when(bridge.getThing().getThings()).thenReturn(Collections.emptyList());
 
  service.telegramReceived(telegram);