demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Provide basic properties for access point (#17519)

Browse Source 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
Jacob Laursen 2024-10-07 20:20:07 +02:00 committed by Ciprian Pascu
parent 34c5e14499
commit fefa11cfe7
5 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/UniFiBindingConstants.java
View File

@ -116,7 +116,6 @@ public final class UniFiBindingConstants {
public static final String PARAMETER_VOUCHER_DATA_QUOTA = "voucherDataQuota";
public static final String PARAMETER_PORT_NUMBER = "portNumber";
public static final String PARAMETER_MAC_ADDRESS = "macAddress";
public static final String PARAMETER_WIFI_NAME = "wifi";
// UniFi device types
public static final String DEVICE_TYPE_UAP = "uap";

12
bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/api/dto/UniFiDevice.java
View File

@ -38,6 +38,10 @@ public class UniFiDevice implements HasId {
private String model;
private String version;
private String serial;
private String type;
private String name;
@ -67,6 +71,14 @@ public class UniFiDevice implements HasId {
return model;
}
public String getVersion() {
return version;
}
public String getSerial() {
return serial;
}
public String getName() {
return name == null || name.isBlank() ? mac : name;
}

14
bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiAccessPointThingHandler.java
View File

@ -15,6 +15,8 @@ package org.openhab.binding.unifi.internal.handler;
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.CHANNEL_AP_ENABLE;
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.DEVICE_TYPE_UAP;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.unifi.internal.UniFiAccessPointThingConfig;
@ -30,8 +32,6 @@ import org.openhab.core.thing.ThingStatus;
import org.openhab.core.thing.ThingStatusDetail;
import org.openhab.core.types.Command;
import org.openhab.core.types.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* An access point managed by the UniFi controller software.
@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory;
@NonNullByDefault
public class UniFiAccessPointThingHandler extends UniFiBaseThingHandler<UniFiDevice, UniFiAccessPointThingConfig> {
private final Logger logger = LoggerFactory.getLogger(UniFiAccessPointThingHandler.class);
private UniFiAccessPointThingConfig config = new UniFiAccessPointThingConfig();
public UniFiAccessPointThingHandler(final Thing thing) {
@ -92,6 +90,14 @@ public class UniFiAccessPointThingHandler extends UniFiBaseThingHandler<UniFiDev
return state;
}
@Override
protected void updateProperties(final UniFiDevice device) {
updateProperties(Map.of( //
Thing.PROPERTY_MODEL_ID, device.getModel(), //
Thing.PROPERTY_FIRMWARE_VERSION, device.getVersion(), //
Thing.PROPERTY_SERIAL_NUMBER, device.getSerial()));
}
@Override
protected boolean handleCommand(final UniFiController controller, final UniFiDevice device,
final ChannelUID channelUID, final Command command) throws UniFiException {

11
bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiBaseThingHandler.java
View File

@ -132,6 +132,8 @@ public abstract class UniFiBaseThingHandler<E, C> extends BaseThingHandler {
final @Nullable E entity = getEntity();
getThing().getChannels().forEach(channel -> updateState(entity, channel.getUID()));
updateProperties(entity);
}
}
@ -183,6 +185,15 @@ public abstract class UniFiBaseThingHandler<E, C> extends BaseThingHandler {
*/
protected abstract State getChannelState(E entity, String channelId);
/**
* Updates relevant Thing properties from the UniFi entity object.
* Default implementation does not update any properties.
*
* @param entity UniFi entity object to get the properties information from
*/
protected void updateProperties(E entity) {
}
/**
* Send the given command to the UniFi controller.
*

5
bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiThingDiscoveryService.java
View File

@ -19,7 +19,6 @@ import static org.openhab.binding.unifi.internal.UniFiBindingConstants.PARAMETER
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.PARAMETER_SID;
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.PARAMETER_SITE;
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.PARAMETER_WID;
import static org.openhab.binding.unifi.internal.UniFiBindingConstants.PARAMETER_WIFI_NAME;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@ -107,9 +106,7 @@ public class UniFiThingDiscoveryService extends AbstractThingHandlerDiscoverySer
for (final UniFiWlan wlan : cache.getWlans()) {
final ThingUID thingUID = new ThingUID(UniFiBindingConstants.THING_TYPE_WLAN, bridgeUID,
stripIdShort(wlan.getId()));
final String siteName = wlan.getSite() == null ? "" : wlan.getSite().getName();
final Map<String, Object> properties = Map.of(PARAMETER_WID, wlan.getId(), PARAMETER_SITE, siteName,
PARAMETER_WIFI_NAME, wlan.getName());
final Map<String, Object> properties = Map.of(PARAMETER_WID, wlan.getId());
thingDiscovered(DiscoveryResultBuilder.create(thingUID).withThingType(UniFiBindingConstants.THING_TYPE_WLAN)
.withBridge(bridgeUID).withRepresentationProperty(PARAMETER_WID).withTTL(TTL_SECONDS)