SDKtool: Add basic commands to add/remove devices

Change-Id: I2df53b2585875c4dc5fcba3012901530b963e70d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

src/tools/sdktool/adddeviceoperation.cpp

@@ -0,0 +1,408 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "adddeviceoperation.h"
+
+#include "addkeysoperation.h"
+#include "findkeyoperation.h"
+#include "findvalueoperation.h"
+#include "getoperation.h"
+#include "rmkeysoperation.h"
+
+#include "settings.h"
+
+#include <iostream>
+
+const char DEVICEMANAGER_ID[] = "DeviceManager";
+const char DEFAULT_DEVICES_ID[] = "DefaultDevices";
+const char DEVICE_LIST_ID[] = "DeviceList";
+
+const char DEVICE_ID_ID[] = "InternalId";
+
+AddDeviceOperation::AddDeviceOperation()
+{ }
+
+QString AddDeviceOperation::name() const
+{
+    return QLatin1String("addDev");
+}
+
+QString AddDeviceOperation::helpText() const
+{
+    return QLatin1String("add a Device to Qt Creator");
+}
+
+QString AddDeviceOperation::argumentsHelpText() const
+{
+    return QLatin1String("    --id <ID>                                  id of the new kit (required).\n"
+                         "    --name <NAME>                              display name of the new kit (required).\n"
+                         "    --type <INT>                               type (required).\n"
+                         "    --authentication <INT>                     authentication.\n"
+                         "    --b2qHardware <STRING>                     Boot2Qt Platform Info Hardware.\n"
+                         "    --b2qSoftware <STRING>                     Boot2Qt Platform Info Software.\n"
+                         "    --freePorts <STRING>                       Free ports specification.\n"
+                         "    --host <STRING>                            Host.\n"
+                         "    --debugServerKey <STRING>                  Debug server key.\n"
+                         "    --keyFile <STRING>                         Key file.\n"
+                         "    --origin <INT>                             origin.\n"
+                         "    --osType <STRING>                          Os Type.\n"
+                         "    --password <STRING>                        Password.\n"
+                         "    --sshPort <INT>                            ssh port.\n"
+                         "    --timeout <INT>                            timeout.\n"
+                         "    --uname <STRING>                           uname.\n"
+                         "    <KEY> <TYPE:VALUE>                         extra key value pairs\n");
+}
+
+bool AddDeviceOperation::setArguments(const QStringList &args)
+{
+    m_authentication = -1;
+    m_origin = -1;
+    m_sshPort = 0;
+    m_timeout = 5;
+    m_type = -1;
+    m_version = 0;
+
+    for (int i = 0; i < args.count(); ++i) {
+        const QString current = args.at(i);
+        const QString next = ((i + 1) < args.count()) ? args.at(i + 1) : QString();
+
+        if (current == QLatin1String("--id")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_id = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--name")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_displayName = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--authentication")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            bool ok;
+            m_authentication = next.toInt(&ok);
+            if (!ok)
+                return false;
+            continue;
+        }
+
+        if (current == QLatin1String("--b2qHardware")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_b2q_platformHardware = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--b2qSoftware")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_b2q_platformSoftware = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--freePorts")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_freePortsSpec = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--host")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_host = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--debugServerKey")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_debugServer = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--keyFile")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_keyFile = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--origin")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            bool ok;
+            m_origin = next.toInt(&ok);
+            if (!ok)
+                return false;
+            continue;
+        }
+
+        if (current == QLatin1String("--osType")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_osType = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--password")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_password = next;
+            continue;
+        }
+
+        if (current == QLatin1String("--sshPort")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            bool ok;
+            m_sshPort = next.toInt(&ok);
+            if (!ok)
+                return false;
+            continue;
+        }
+
+        if (current == QLatin1String("--timeout")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            bool ok;
+            m_timeout = next.toInt(&ok);
+            if (!ok)
+                return false;
+            continue;
+        }
+
+        if (current == QLatin1String("--type")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            bool ok;
+            m_type = next.toInt(&ok);
+            if (!ok)
+                return false;
+            continue;
+        }
+
+
+        if (current == QLatin1String("--uname")) {
+            if (next.isNull())
+                return false;
+            ++i; // skip next;
+            m_uname = next;
+            continue;
+        }
+
+        if (next.isNull())
+            return false;
+        ++i; // skip next;
+        KeyValuePair pair(current, next);
+        if (!pair.value.isValid())
+            return false;
+        m_extra << pair;
+    }
+
+    if (m_id.isEmpty())
+        std::cerr << "No id given for device." << std::endl << std::endl;
+    if (m_displayName.isEmpty())
+        std::cerr << "No name given for device." << std::endl << std::endl;
+
+    return !m_id.isEmpty() && !m_displayName.isEmpty() && m_type >= 0;
+}
+
+int AddDeviceOperation::execute() const
+{
+    QVariantMap map = load(QLatin1String("devices"));
+    if (map.isEmpty())
+        map = initializeDevices();
+
+    QVariantMap result = addDevice(map, m_id, m_displayName, m_type, m_authentication,
+                                   m_b2q_platformHardware, m_b2q_platformSoftware, m_debugServer,
+                                   m_freePortsSpec, m_host, m_keyFile, m_origin, m_osType,
+                                   m_password, m_sshPort, m_timeout, m_uname, m_version, m_extra);
+
+    if (result.isEmpty() || map == result)
+        return 2;
+
+    return save(result, QLatin1String("devices")) ? 0 : 3;
+}
+
+#ifdef WITH_TESTS
+bool AddDeviceOperation::test() const
+{
+    QVariantMap map = initializeDevices();
+
+    QVariantMap result = addDevice(map, QLatin1String("test id"), QLatin1String("test name"),
+                                   1, 2, QLatin1String("HW"), QLatin1String("SW"),
+                                   QLatin1String("debugServer"), QLatin1String("ports"),
+                                   QLatin1String("host"), QLatin1String("keyfile"), 3,
+                                   QLatin1String("ostype"), QLatin1String("passwd"), 4, 5,
+                                   QLatin1String("uname"), 6, KeyValuePairList());
+
+    QVariantMap data = result.value(QLatin1String(DEVICEMANAGER_ID)).toMap();
+    QVariantList devList = data.value(QLatin1String(DEVICE_LIST_ID)).toList();
+    if (devList.count() != 1)
+        return false;
+    QVariantMap dev = devList.at(0).toMap();
+    if (dev.count() != 17)
+        return false;
+    if (dev.value(QLatin1String("Authentication")).toInt() != 2)
+        return false;
+    if (dev.value(QLatin1String("DebugServerKey")).toString() != QLatin1String("debugServer"))
+        return false;
+    if (dev.value(QLatin1String("FreePortsSpec")).toString() != QLatin1String("ports"))
+        return false;
+    if (dev.value(QLatin1String("Host")).toString() != QLatin1String("host"))
+        return false;
+    if (dev.value(QLatin1String("InternalId")).toString() != QLatin1String("test id"))
+        return false;
+    if (dev.value(QLatin1String("KeyFile")).toString() != QLatin1String("keyfile"))
+        return false;
+    if (dev.value(QLatin1String("Name")).toString() != QLatin1String("test name"))
+        return false;
+    if (dev.value(QLatin1String("Origin")).toInt() != 3)
+        return false;
+    if (dev.value(QLatin1String("OsType")).toString() != QLatin1String("ostype"))
+        return false;
+    if (dev.value(QLatin1String("Password")).toString() != QLatin1String("passwd"))
+        return false;
+    if (dev.value(QLatin1String("SshPort")).toInt() != 4)
+        return false;
+    if (dev.value(QLatin1String("Timeout")).toInt() != 5)
+        return false;
+    if (dev.value(QLatin1String("Type")).toInt() != 1)
+        return false;
+    if (dev.value(QLatin1String("Uname")).toString() != QLatin1String("uname"))
+        return false;
+    if (dev.value(QLatin1String("Version")).toInt() != 6)
+        return false;
+
+    return true;
+}
+#endif
+
+QVariantMap AddDeviceOperation::addDevice(const QVariantMap &map,
+                                          const QString &id, const QString &displayName, int type,
+                                          int auth, const QString &hwPlatform, const QString &swPlatform,
+                                          const QString &debugServer, const QString &freePorts,
+                                          const QString &host, const QString &keyFile,
+                                          int origin, const QString &osType, const QString &passwd,
+                                          int sshPort, int timeout, const QString &uname, int version,
+                                          const KeyValuePairList &extra)
+{
+    QVariantMap result = map;
+    QVariantMap dmMap = map.value(QLatin1String(DEVICEMANAGER_ID)).toMap();
+
+    QVariantList devList = dmMap.value(QLatin1String(DEVICE_LIST_ID)).toList();
+    foreach (const QVariant &dev, devList) {
+        QVariantMap devData = dev.toMap();
+        QString current = devData.value(QLatin1String(DEVICE_ID_ID)).toString();
+        if (current == id) {
+            std::cerr << "Device " << qPrintable(id) << " already exists!" << std::endl;
+            return result;
+        }
+    }
+
+    QVariantMap devMap
+            = AddKeysOperation::addKeys(QVariantMap(),
+                                        createDevice(id, displayName, type, auth, hwPlatform,
+                                                     swPlatform, debugServer, freePorts, host,
+                                                     keyFile, origin, osType, passwd, sshPort,
+                                                     timeout, uname, version, extra));
+
+    devList.append(devMap);
+
+    dmMap.insert(QLatin1String(DEVICE_LIST_ID), devList);
+
+    result.insert(QLatin1String(DEVICEMANAGER_ID), dmMap);
+
+    return result;
+}
+
+QVariantMap AddDeviceOperation::initializeDevices()
+{
+    QVariantMap dmData;
+    dmData.insert(QLatin1String(DEFAULT_DEVICES_ID), QVariant());
+    dmData.insert(QLatin1String(DEVICE_LIST_ID), QVariantList());
+
+    QVariantMap data;
+    data.insert(QLatin1String(DEVICEMANAGER_ID), dmData);
+    return data;
+}
+
+Operation::KeyValuePairList AddDeviceOperation::createDevice(const QString &id, const QString &displayName,
+                                                             int type, int auth, const QString &hwPlatform,
+                                                             const QString &swPlatform, const QString &debugServer,
+                                                             const QString &freePorts, const QString &host,
+                                                             const QString &keyFile, int origin,
+                                                             const QString &osType, const QString &passwd,
+                                                             int sshPort, int timeout, const QString &uname,
+                                                             int version, const Operation::KeyValuePairList &extra)
+{
+    Operation::KeyValuePairList dev;
+    dev.append(KeyValuePair(QLatin1String(DEVICE_ID_ID), QVariant(id)));
+    dev.append(KeyValuePair(QLatin1String("Name"), QVariant(displayName)));
+    dev.append(KeyValuePair(QLatin1String("Type"), QVariant(type)));
+
+    dev.append(KeyValuePair(QLatin1String("Authentication"), QVariant(auth)));
+    dev.append(KeyValuePair(QLatin1String("Boot2Qt.PlatformInfoHardware"), QVariant(hwPlatform)));
+    dev.append(KeyValuePair(QLatin1String("Boot2Qt.PlatformInfoSoftware"), QVariant(swPlatform)));
+    dev.append(KeyValuePair(QLatin1String("DebugServerKey"), QVariant(debugServer)));
+    dev.append(KeyValuePair(QLatin1String("FreePortsSpec"), QVariant(freePorts)));
+    dev.append(KeyValuePair(QLatin1String("Host"), QVariant(host)));
+    dev.append(KeyValuePair(QLatin1String("KeyFile"), QVariant(keyFile)));
+    dev.append(KeyValuePair(QLatin1String("Origin"), QVariant(origin)));
+    dev.append(KeyValuePair(QLatin1String("OsType"), QVariant(osType)));
+    dev.append(KeyValuePair(QLatin1String("Password"), QVariant(passwd)));
+    dev.append(KeyValuePair(QLatin1String("SshPort"), QVariant(sshPort)));
+    dev.append(KeyValuePair(QLatin1String("Timeout"), QVariant(timeout)));
+    dev.append(KeyValuePair(QLatin1String("Uname"), QVariant(uname)));
+    dev.append(KeyValuePair(QLatin1String("Version"), QVariant(version)));
+
+    dev.append(extra);
+
+    return dev;
+}

src/tools/sdktool/adddeviceoperation.h

@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef ADDDEVICEOPERATION_H
+#define ADDDEVICEOPERATION_H
+
+#include "operation.h"
+
+#include <QString>
+
+extern const char DEVICEMANAGER_ID[];
+extern const char DEFAULT_DEVICES_ID[];
+extern const char DEVICE_LIST_ID[];
+
+extern const char DEVICE_ID_ID[];
+
+class AddDeviceOperation : public Operation
+{
+public:
+    AddDeviceOperation();
+
+    QString name() const;
+    QString helpText() const;
+    QString argumentsHelpText() const;
+
+    bool setArguments(const QStringList &args);
+
+    int execute() const;
+
+#ifdef WITH_TESTS
+    bool test() const;
+#endif
+
+    static QVariantMap addDevice(const QVariantMap &map,
+                                 const QString &id, const QString &displayName, int type,
+                                 int auth, const QString &hwPlatform, const QString &swPlatform,
+                                 const QString &debugServer, const QString &freePorts,
+                                 const QString &host, const QString &keyFile,
+                                 int origin, const QString &osType, const QString &passwd,
+                                 int sshPort, int timeout, const QString &uname, int version,
+                                 const KeyValuePairList &extra);
+
+    static QVariantMap initializeDevices();
+
+private:
+    static KeyValuePairList createDevice(const QString &id, const QString &displayName, int type,
+                                         int auth, const QString &hwPlatform, const QString &swPlatform,
+                                         const QString &debugServer, const QString &freePorts,
+                                         const QString &host, const QString &keyFile,
+                                         int origin, const QString &osType, const QString &passwd,
+                                         int sshPort, int timeout, const QString &uname, int version,
+                                         const KeyValuePairList &extra);
+
+    int m_authentication;
+    QString m_b2q_platformHardware;
+    QString m_b2q_platformSoftware;
+    QString m_debugServer;
+    QString m_freePortsSpec;
+    QString m_host;
+    QString m_id;
+    QString m_keyFile;
+    QString m_displayName;
+    int m_origin;
+    QString m_osType;
+    QString m_password;
+    int m_sshPort;
+    int m_timeout;
+    int m_type;
+    QString m_uname;
+    int m_version;
+    KeyValuePairList m_extra;
+};
+
+#endif // ADDDEVICEOPERATION_H

src/tools/sdktool/main.cpp

@@ -32,6 +32,7 @@
 #include "operation.h"
 
 #include "adddebuggeroperation.h"
+#include "adddeviceoperation.h"
 #include "addkeysoperation.h"
 #include "addkitoperation.h"
 #include "addqtoperation.h"
@@ -40,6 +41,7 @@
 #include "findvalueoperation.h"
 #include "getoperation.h"
 #include "rmdebuggeroperation.h"
+#include "rmdeviceoperation.h"
 #include "rmkeysoperation.h"
 #include "rmkitoperation.h"
 #include "rmqtoperation.h"
@@ -163,6 +165,7 @@ int main(int argc, char *argv[])
 
     QList<Operation *> operations;
     operations << new AddDebuggerOperation
+               << new AddDeviceOperation
                << new AddKeysOperation
                << new AddKitOperation
                << new AddQtOperation
@@ -171,6 +174,7 @@ int main(int argc, char *argv[])
                << new FindValueOperation
                << new GetOperation
                << new RmDebuggerOperation
+               << new RmDeviceOperation
                << new RmKeysOperation
                << new RmKitOperation
                << new RmQtOperation

src/tools/sdktool/rmdeviceoperation.cpp

@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "rmdeviceoperation.h"
+
+#include "adddeviceoperation.h"
+#include "getoperation.h"
+
+#include "settings.h"
+
+#include <iostream>
+
+QString RmDeviceOperation::name() const
+{
+    return QLatin1String("rmDev");
+}
+
+QString RmDeviceOperation::helpText() const
+{
+    return QLatin1String("remove a Device from Qt Creator");
+}
+
+QString RmDeviceOperation::argumentsHelpText() const
+{
+    return QLatin1String("    --id <ID>                                  id of the device to remove.\n");
+}
+
+bool RmDeviceOperation::setArguments(const QStringList &args)
+{
+    if (args.count() != 2)
+        return false;
+    if (args.at(0) != QLatin1String("--id"))
+        return false;
+
+    m_id = args.at(1);
+
+    if (m_id.isEmpty())
+        std::cerr << "No id given." << std::endl << std::endl;
+
+    return !m_id.isEmpty();
+}
+
+int RmDeviceOperation::execute() const
+{
+    QVariantMap map = load(QLatin1String("devices"));
+    if (map.isEmpty())
+        map = AddDeviceOperation::initializeDevices();
+
+    QVariantMap result = rmDevice(map, m_id);
+
+    if (result == map)
+        return 2;
+
+    return save(result, QLatin1String("devices")) ? 0 : 3;
+}
+
+#ifdef WITH_TESTS
+bool RmDeviceOperation::test() const
+{
+    return true;
+}
+#endif
+
+QVariantMap RmDeviceOperation::rmDevice(const QVariantMap &map, const QString &id)
+{
+    QVariantMap result = map;
+
+
+    QVariantMap dmMap = map.value(QLatin1String(DEVICEMANAGER_ID)).toMap();
+
+    bool found = false;
+    QVariantList devList = GetOperation::get(dmMap, QLatin1String(DEVICE_LIST_ID)).toList();
+    for (int i = 0; i < devList.count(); ++i) {
+        QVariant value = devList.at(i);
+        if (value.type() != QVariant::Map)
+            continue;
+        QVariantMap deviceData = value.toMap();
+        QString devId = deviceData.value(QLatin1String(DEVICE_ID_ID)).toString();
+        if (devId == id) {
+            found = true;
+            devList.removeAt(i);
+            break;
+        }
+    }
+    dmMap.insert(QLatin1String(DEVICE_LIST_ID), devList);
+    result.insert(QLatin1String(DEVICEMANAGER_ID), dmMap);
+
+    if (!found)
+        std::cerr << "Device " << qPrintable(id) << " not found." << std::endl;
+    return result;
+}
+

src/tools/sdktool/rmdeviceoperation.h

@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef RMDEVICEOPERATION_H
+#define RMDEVICEOPERATION_H
+
+#include "operation.h"
+
+#include <QString>
+
+class RmDeviceOperation : public Operation
+{
+public:
+    QString name() const;
+    QString helpText() const;
+    QString argumentsHelpText() const;
+
+    bool setArguments(const QStringList &args);
+
+    int execute() const;
+
+#ifdef WITH_TESTS
+    bool test() const;
+#endif
+
+    static QVariantMap rmDevice(const QVariantMap &map, const QString &id);
+
+private:
+    QString m_id;
+};
+
+#endif // RMDEVICEOPERATION_H

src/tools/sdktool/sdktool.pro

@@ -14,6 +14,7 @@ isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/../../shared/qtcreator_pc
 SOURCES += \
     main.cpp \
     adddebuggeroperation.cpp \
+    adddeviceoperation.cpp \
     addkeysoperation.cpp \
     addkitoperation.cpp \
     addqtoperation.cpp \
@@ -23,6 +24,7 @@ SOURCES += \
     getoperation.cpp \
     operation.cpp \
     rmdebuggeroperation.cpp \
+    rmdeviceoperation.cpp \
     rmkeysoperation.cpp \
     rmkitoperation.cpp \
     rmqtoperation.cpp \
@@ -31,6 +33,7 @@ SOURCES += \
 
 HEADERS += \
     adddebuggeroperation.h \
+    adddeviceoperation.h \
     addkeysoperation.h \
     addkitoperation.h \
     addqtoperation.h \
@@ -40,6 +43,7 @@ HEADERS += \
     getoperation.h \
     operation.h \
     rmdebuggeroperation.h \
+    rmdeviceoperation.h \
     rmkeysoperation.h \
     rmkitoperation.h \
     rmqtoperation.h \

src/tools/sdktool/sdktool.qbs

@@ -13,6 +13,7 @@ QtcTool {
 
     files: [
         "adddebuggeroperation.cpp", "adddebuggeroperation.h",
+        "adddeviceoperation.cpp", "adddeviceoperation.h",
         "addkeysoperation.cpp",
         "addkeysoperation.h",
         "addkitoperation.cpp",
@@ -31,6 +32,7 @@ QtcTool {
         "operation.cpp",
         "operation.h",
         "rmdebuggeroperation.cpp", "rmdebuggeroperation.h",
+        "rmdeviceoperation.cpp", "rmdeviceoperation.h",
         "rmkeysoperation.cpp",
         "rmkeysoperation.h",
         "rmkitoperation.cpp",