Merge PR #191: IDM: Update to networkdevice interface

nymea · Jan 9, 2025 · 42075c1 · 42075c1
2 parents 4fd2dc4 + 9c0222a
commit 42075c1
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 23 deletions.
diff --git a/idm/integrationpluginidm.cpp b/idm/integrationpluginidm.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2024, nymea GmbH
 * Contact: [email protected]
 *
 * This file is part of nymea.
@@ -50,37 +50,49 @@ void IntegrationPluginIdm::discoverThings(ThingDiscoveryInfo *info)
     qCDebug(dcIdm()) << "Discovering network...";
     NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover();
     connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, discoveryReply, &NetworkDeviceDiscoveryReply::deleteLater);
-    connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=](){
-        ThingDescriptors descriptors;
+    connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [this, discoveryReply, info](){
         qCDebug(dcIdm()) << "Discovery finished. Found" << discoveryReply->networkDeviceInfos().count() << "devices";
         foreach (const NetworkDeviceInfo &networkDeviceInfo, discoveryReply->networkDeviceInfos()) {
             qCDebug(dcIdm()) << networkDeviceInfo;
             QString title;
-            if (networkDeviceInfo.hostName().isEmpty()) {
-                title += networkDeviceInfo.address().toString();
-            } else {
-                title += networkDeviceInfo.address().toString() + " (" + networkDeviceInfo.hostName() + ")";
-            }
-
             QString description;
-            if (networkDeviceInfo.macAddressManufacturer().isEmpty()) {
-                description = networkDeviceInfo.macAddress();
-            } else {
-                description = networkDeviceInfo.macAddress() + " (" + networkDeviceInfo.macAddressManufacturer() + ")";
+            switch (networkDeviceInfo.monitorMode()) {
+            case NetworkDeviceInfo::MonitorModeMac:
+                description = networkDeviceInfo.address().toString();
+                if (!networkDeviceInfo.macAddressInfos().constFirst().vendorName().isEmpty())
+                    description += " - " + networkDeviceInfo.macAddressInfos().constFirst().vendorName();
+
+                if (networkDeviceInfo.hostName().isEmpty()) {
+                    title = networkDeviceInfo.macAddressInfos().constFirst().macAddress().toString();
+                } else {
+                    title = networkDeviceInfo.hostName() + " (" + networkDeviceInfo.macAddressInfos().constFirst().macAddress().toString() + ")";
+                }
+
+                break;
+            case NetworkDeviceInfo::MonitorModeHostName:
+                title = networkDeviceInfo.hostName();
+                description = networkDeviceInfo.address().toString();
+                break;
+            case NetworkDeviceInfo::MonitorModeIp:
+                title = "Network device " + networkDeviceInfo.address().toString();
+                description = "Interface: " + networkDeviceInfo.networkInterface().name();
+                break;
             }
 
+            ParamList params;
+            params << Param(navigator2ThingMacAddressParamTypeId, networkDeviceInfo.thingParamValueAddress());
+            params << Param(navigator2ThingHostNameParamTypeId, networkDeviceInfo.thingParamValueHostName());
+            params << Param(navigator2ThingAddressParamTypeId, networkDeviceInfo.thingParamValueAddress());
             ThingDescriptor descriptor(navigator2ThingClassId, title, description);
+            descriptor.setParams(params);
 
             // Check if we already have set up this device
-            Things existingThings = myThings().filterByParam(navigator2ThingMacAddressParamTypeId, networkDeviceInfo.macAddress());
-            if (existingThings.count() == 1) {
-                qCDebug(dcIdm()) << "This thing already exists in the system." << existingThings.first() << networkDeviceInfo;
-                descriptor.setThingId(existingThings.first()->id());
+            Thing *existingThing = myThings().findByParams(params);
+            if (existingThing) {
+                qCDebug(dcIdm()) << "This thing already exists in the system." << existingThing << networkDeviceInfo;
+                descriptor.setThingId(existingThing->id());
             }
 
-            ParamList params;
-            params << Param(navigator2ThingMacAddressParamTypeId, networkDeviceInfo.macAddress());
-            descriptor.setParams(params);
             info->addThingDescriptor(descriptor);
         }
         info->finish(Thing::ThingErrorNoError);
@@ -113,7 +125,7 @@ void IntegrationPluginIdm::setupThing(ThingSetupInfo *info)
         }
 
         // Create the monitor
-        NetworkDeviceMonitor *monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(macAddress);
+        NetworkDeviceMonitor *monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(thing);
         m_monitors.insert(thing, monitor);
 
         QHostAddress address = monitor->networkDeviceInfo().address();

diff --git a/idm/integrationpluginidm.h b/idm/integrationpluginidm.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2024, nymea GmbH
 * Contact: [email protected]
 *
 * This file is part of nymea.

diff --git a/idm/integrationpluginidm.json b/idm/integrationpluginidm.json
@@ -13,13 +13,30 @@
                     "displayName": "Navigator 2.0",
                     "id": "1c95ac91-4eca-4cbf-b0f4-d60d35d069ed",
                     "createMethods": ["user", "discovery"],
-                    "interfaces": ["thermostat", "smartmeterconsumer", "connectable" ],
+                    "interfaces": ["thermostat", "smartmeterconsumer", "connectable", "networkdevice"],
                     "paramTypes": [
                         {
                             "id": "d178ca29-41a1-4f56-82ec-76a833c1de50",
                             "name": "macAddress",
                             "displayName": "MAC address",
                             "type": "QString",
+                            "inputType": "MacAddress",
+                            "defaultValue": ""
+                        },
+                        {
+                            "id": "c3cc7351-ab16-4bab-9d92-0588c82e6180",
+                            "name": "hostName",
+                            "displayName": "Host name",
+                            "type": "QString",
+                            "inputType": "TextLine",
+                            "defaultValue": ""
+                        },
+                        {
+                            "id": "63114206-3b76-4a9e-8510-cb552d3e32c2",
+                            "name": "address",
+                            "displayName": "IP address",
+                            "type": "QString",
+                            "inputType": "IPv4Address",
                             "defaultValue": ""
                         }
                     ],