From b21913f5bede735d5d938f0e9895484187350a5e Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 22 Apr 2023 22:42:35 +0200 Subject: [PATCH] [hue] Fix NUPnP discovery (#14871) * Fix NUPnP discovery Fixes #14852 * Declare hybrid connection due to cloud discovery --------- Signed-off-by: Jacob Laursen --- .../binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java | 2 +- .../src/main/resources/OH-INF/addon/addon.xml | 2 +- .../hue/internal/discovery/HueBridgeNupnpDiscoveryOSGITest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java index 45cf01272..5adcc716b 100644 --- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java +++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscovery.java @@ -49,7 +49,7 @@ import com.google.gson.reflect.TypeToken; @NonNullByDefault public class HueBridgeNupnpDiscovery extends AbstractDiscoveryService { - private static final String MODEL_NAME_PHILIPS_HUE = "\"name\":\"Philips Hue\""; + private static final String MODEL_NAME_PHILIPS_HUE = "\"name\":\"Philips hue\""; protected static final String BRIDGE_INDICATOR = "fffe"; private static final String DISCOVERY_URL = "https://discovery.meethue.com/"; protected static final String LABEL_PATTERN = "Philips Hue (%s)"; diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/addon/addon.xml index da2b5ff59..15d1023fa 100644 --- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/addon/addon.xml @@ -6,6 +6,6 @@ binding Hue Binding The Hue Binding integrates the Philips Hue system. It allows to control Hue bulbs. - local + hybrid diff --git a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscoveryOSGITest.java b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscoveryOSGITest.java index 2540e9422..5d9ceb18d 100644 --- a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscoveryOSGITest.java +++ b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeNupnpDiscoveryOSGITest.java @@ -57,7 +57,7 @@ public class HueBridgeNupnpDiscoveryOSGITest extends JavaOSGiTest { final String validBridgeDiscoveryResult = "[{\"id\":\"" + sn1 + "\",\"internalipaddress\":" + ip1 + "},{\"id\":\"" + sn2 + "\",\"internalipaddress\":" + ip2 + "}]"; String discoveryResult; - String expBridgeDescription = "{\"name\":\"Philips Hue\",\"datastoreversion\":\"113\",\"swversion\":\"1948086000\",\"apiversion\":\"1.48.0\",\"mac\":\"00:11:22:33:44\",\"bridgeid\":\"$SN\",\"factorynew\":false,\"replacesbridgeid\":null,\"modelid\":\"BSB002\",\"starterkitid\":\"\"}"; + String expBridgeDescription = "{\"name\":\"Philips hue\",\"datastoreversion\":\"149\",\"swversion\":\"1957113050\",\"apiversion\":\"1.57.0\",\"mac\":\"00:11:22:33:44\",\"bridgeid\":\"$SN\",\"factorynew\":false,\"replacesbridgeid\":null,\"modelid\":\"BSB002\",\"starterkitid\":\"\"}"; private void checkDiscoveryResult(DiscoveryResult result, String expIp, String expSn) { assertThat(result.getBridgeUID(), nullValue());