Index: sources/device/DeviceView.cpp
===================================================================
diff -u -rf0a80523d37c862fd24064522216b0bd53a2cc33 -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634
--- sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision f0a80523d37c862fd24064522216b0bd53a2cc33)
+++ sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634)
@@ -548,7 +548,46 @@
     subnetMask(fields[eSUBNETMASK].trimmed());
     gateway(fields[eGATEWAY].trimmed());
     dns(fields[eDNS2].isEmpty() ?   fields[eDNS1].trimmed() :
-                                    QStringLiteral("%1,\n%2").arg(fields[eDNS1].trimmed())
+                                    QStringLiteral("%1,%2").arg(fields[eDNS1].trimmed())
                                                             .arg(fields[eDNS2].trimmed()));
 
 }
+
+// ================================================= ConnectWifi
+void VDevice::doInitConnectWifi() {
+    // Nothing for now.
+    connectWifi("");
+}
+
+void VDevice::connectWifiRequest(const QString &) {
+    // Nothing for now.
+}
+
+void VDevice::doConnectWifi(const bool &vConnect, const QString &vSsid, const QString &vPassword) {
+    DeviceConnectWifiRequestData data;
+    data.mConnect   = vConnect;
+    data.mSsid      = vSsid;
+    data.mPassword  = vPassword;
+
+    emit didAttributeRequest(data);
+}
+
+void VDevice::onAttributeResponse(const DeviceConnectWifiResponseData &vData) {
+    LOG_DEBUG(QStringLiteral("*********** onAttributeResponse : %1 %2").arg(vData.mCompleted )
+                                                                            .arg(vData.mCompleted ));
+
+    // this has to be called to let Gui to set to old value that device controller provided.
+    status(vData.mMessage);
+    accepted(vData.mAccepted);
+    reason  (vData.mReason  );
+
+    if ( vData.mCompleted ) {
+        if ( vData.mAccepted ) {
+            // rescan once connect/disconnect has completed
+            wifiListRequest({});
+        }
+    }
+
+    // has to be the last one
+    response(true);
+}