Merge lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular/security] consolidate connectivity APIs, making it a shared USS library

Both Security and Cellular use the private Connectivity API to unlock one or more SIMs. They both have a C++ binding that does this, since they the two panels landed independently.

This branch moves the Connectivity C++ binding out of the respective plugins and makes it a shared one—usable by all plugins.

Needs manual testing of SIM unlocking in Security panel, as well as unlocking after a tech switch (changing has3g on a modem).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1989/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1452/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1989/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1991/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18216

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1991/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Please add the test back for this

review: Needs Fixing

[lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity]

1321. By Jonas G. Drange on 2015-02-19

merge trunk

1322. By Jonas G. Drange on 2015-02-19

re-add previously broken test

1323. By Jonas G. Drange on 2015-02-20

testing theory that we can't have two setupclass calls

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1323
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1993/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/263
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1298/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1462
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18228

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1993/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity]

1324. By Jonas G. Drange on 2015-02-23

re-add mixin, move test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1324
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1996/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/266
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18284

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1996/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity]

1325. By Jonas G. Drange on 2015-02-24

rewriting test to not include session bus mocking, which in this case seems broken

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1325
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1997/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1501
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1501/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18308

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1997/rebuild

review: Approve (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity]

1326. By Jonas G. Drange on 2015-02-24

OLD FASHIONED MOCK

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1326
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2000/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1508
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1508/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18315

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2000/rebuild

review: Approve (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/consolidate-connectivity]

1327. By Jonas G. Drange on 2015-02-25

mocking the proper way

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1327
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2001/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/271
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18316

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2001/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1327. By Jonas G. Drange on 2015-02-25

mocking the proper way

1326. By Jonas G. Drange on 2015-02-24

OLD FASHIONED MOCK

1325. By Jonas G. Drange on 2015-02-24

rewriting test to not include session bus mocking, which in this case seems broken

1324. By Jonas G. Drange on 2015-02-23

re-add mixin, move test

1323. By Jonas G. Drange on 2015-02-20

testing theory that we can't have two setupclass calls

1322. By Jonas G. Drange on 2015-02-19

re-add previously broken test

1321. By Jonas G. Drange on 2015-02-19

merge trunk

1320. By Jonas G. Drange on 2015-02-19

make connectivity a shared uss library

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2015-01-14 15:57:10 +0000
+++ plugins/cellular/CMakeLists.txt	2015-02-25 00:19:36 +0000
@@ -24,8 +24,6 @@
   hotspotmanager.h
   ofonoactivator.cpp
   ofonoactivator.h
-  connectivity.cpp
-  connectivity.h
   nm_manager_proxy.h
   nm_settings_proxy.h
   nm_settings_connection_proxy.h
@@ -33,6 +31,8 @@
 )
 qt5_use_modules(UbuntuCellularPanel Qml Quick DBus)
 
+target_link_libraries (UbuntuCellularPanel uss-connectivity)
+
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Cellular)
 install(TARGETS UbuntuCellularPanel DESTINATION ${PLUG_DIR})
 install(FILES qmldir DESTINATION ${PLUG_DIR})

=== modified file 'plugins/security-privacy/CMakeLists.txt'
--- plugins/security-privacy/CMakeLists.txt	2015-01-26 13:35:57 +0000
+++ plugins/security-privacy/CMakeLists.txt	2015-02-25 00:19:36 +0000
@@ -33,8 +33,6 @@
 )
 
 set(PANEL_SOURCES
-    connectivity.cpp
-    connectivity.h
     plugin.cpp
     plugin.h
     securityprivacy.cpp
@@ -58,6 +56,7 @@
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)
 target_link_libraries (UbuntuSecurityPrivacyPanel
     uss-accountsservice
+    uss-connectivity
     ${ACCOUNTSSERVICE_LDFLAGS}
     ${GOBJECT_LDFLAGS}
     ${TRUST_STORE_LDFLAGS}

=== removed file 'plugins/security-privacy/connectivity.cpp'
--- plugins/security-privacy/connectivity.cpp	2015-01-26 13:35:57 +0000
+++ plugins/security-privacy/connectivity.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * Authors:
- *    Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QDBusReply>
-#include <QtDebug>
-#include <QDBusInterface>
-#include "connectivity.h"
-
-namespace {
-    const QString conn_service("com.ubuntu.connectivity1");
-    const QString conn_object("/com/ubuntu/connectivity1/Private");
-    const QString conn_interface("com.ubuntu.connectivity1.Private");
-    const QString conn_unlockmodem_method("UnlockModem");
-}
-
-Connectivity::Connectivity(QObject *parent) : QObject(parent)
-{
-}
-
-void Connectivity::unlockModem(QString path)
-{
-    QDBusInterface connectivityIface (
-        conn_service,
-        conn_object,
-        conn_interface,
-        QDBusConnection::sessionBus(),
-        this);
-
-    auto reply = connectivityIface.call(conn_unlockmodem_method, path);
-    if (reply.type() == QDBusMessage::ErrorMessage) {
-        qWarning() << "Failed to unlock modem" << path << reply.errorMessage();
-    }
-}

=== removed file 'plugins/security-privacy/connectivity.h'
--- plugins/security-privacy/connectivity.h	2015-01-26 13:35:57 +0000
+++ plugins/security-privacy/connectivity.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * Authors:
- *    Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CELLULAR_CONNECTIVITY_HELPER
-#define CELLULAR_CONNECTIVITY_HELPER
-
-#include <QObject>
-
-class Connectivity : public QObject {
-    Q_OBJECT
-
-public:
-    explicit Connectivity(QObject *parent = nullptr);
-    ~Connectivity() {};
-
-    Q_INVOKABLE void unlockModem(QString path);
-};
-
-#endif

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-31 14:53:32 +0000
+++ src/CMakeLists.txt	2015-02-25 00:19:36 +0000
@@ -37,9 +37,13 @@
 
 add_library(uss-accountsservice SHARED accountsservice.h accountsservice.cpp)
 add_library(uss-sessionservice SHARED sessionservice.h sessionservice.cpp)
+add_library(uss-connectivity SHARED connectivity.h connectivity.cpp)
 qt5_use_modules(uss-accountsservice Core Qml DBus)
 qt5_use_modules(uss-sessionservice Core Qml DBus)
+qt5_use_modules(uss-connectivity Core Qml DBus)
 set_target_properties(uss-accountsservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
 set_target_properties(uss-sessionservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
+set_target_properties(uss-connectivity PROPERTIES VERSION 0.0 SOVERSION 0.0)
 install(TARGETS uss-accountsservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
 install(TARGETS uss-sessionservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
+install(TARGETS uss-connectivity LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)

=== renamed file 'plugins/cellular/connectivity.cpp' => 'src/connectivity.cpp'
--- plugins/cellular/connectivity.cpp	2015-01-21 20:44:20 +0000
+++ src/connectivity.cpp	2015-02-25 00:19:36 +0000
@@ -27,6 +27,7 @@
     const QString conn_object("/com/ubuntu/connectivity1/Private");
     const QString conn_interface("com.ubuntu.connectivity1.Private");
     const QString conn_unlockall_method("UnlockAllModems");
+    const QString conn_unlockmodem_method("UnlockModem");
 }
 
 Connectivity::Connectivity(QObject *parent) : QObject(parent)
@@ -47,3 +48,18 @@
         qWarning() << "Failed to unlock modems" << reply.errorMessage();
     }
 }
+
+void Connectivity::unlockModem(QString path)
+{
+    QDBusInterface connectivityIface (
+        conn_service,
+        conn_object,
+        conn_interface,
+        QDBusConnection::sessionBus(),
+        this);
+
+    auto reply = connectivityIface.call(conn_unlockmodem_method, path);
+    if (reply.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << "Failed to unlock modem" << path << reply.errorMessage();
+    }
+}

=== renamed file 'plugins/cellular/connectivity.h' => 'src/connectivity.h'
--- plugins/cellular/connectivity.h	2015-01-14 15:57:10 +0000
+++ src/connectivity.h	2015-02-25 00:19:36 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CELLULAR_CONNECTIVITY_HELPER
-#define CELLULAR_CONNECTIVITY_HELPER
+#ifndef CONNECTIVITY_HELPER
+#define CONNECTIVITY_HELPER
 
 #include <QObject>
 
@@ -30,6 +30,7 @@
     ~Connectivity() {};
 
     Q_INVOKABLE void unlockAllModems();
+    Q_INVOKABLE void unlockModem(QString path);
 };
 
 #endif

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-02-19 07:22:16 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-02-25 00:19:36 +0000
@@ -781,14 +781,12 @@
 class ConnectivityMixin(dbusmock.DBusTestCase):
     @classmethod
     def setUpClass(cls):
-        cls.start_session_bus()
-        cls.connectivity_dbus = cls.get_dbus()
         cls.connectivity_server = cls.spawn_server(CON_SERVICE,
                                                    CON_PATH,
                                                    CON_IFACE,
                                                    system_bus=False,
                                                    stdout=subprocess.PIPE)
-
+        cls.connectivity_dbus = cls.get_dbus()
         cls.connectivity_mock = dbus.Interface(
             cls.connectivity_dbus.get_object(CON_SERVICE,
                                              CON_PATH),

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-02-19 15:18:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-02-25 00:19:36 +0000
@@ -13,6 +13,7 @@
 
 from ubuntu_system_settings.tests import (
     SecurityBaseTestCase,
+    ConnectivityMixin,
     SIM_IFACE)
 
 from ubuntu_system_settings.utils.i18n import ugettext as _
@@ -409,3 +410,31 @@
         self.assertFalse(
             len(self.modem_0.Get(SIM_IFACE, 'LockedPins')) > 0
         )
+
+
+class SecurityConnectivityTestCase(SecurityBaseTestCase, ConnectivityMixin):
+
+    def _go_to_sim_lock(self):
+        selector = self.security_page.select_single(
+            objectName='simControl'
+        )
+        self.main_view.scroll_to_and_click(selector)
+
+    def test_sim_unlock(self):
+        # lock sim
+        self.modem_0.Set(SIM_IFACE, 'PinRequired', 'pin')
+        self.modem_0.EmitSignal(
+            SIM_IFACE, 'PropertyChanged', 'sv', ['PinRequired', 'pin'])
+
+        self._go_to_sim_lock()
+        unlock = self.system_settings.main_view.select_single(
+            objectName='unlock')
+        self.system_settings.main_view.pointing_device.click_object(unlock)
+
+        self.assertThat(
+            lambda: len(self.connectivity_mock.GetMethodCalls('UnlockModem')),
+            Eventually(Equals(1)))
+
+        # make sure the argument for the one call is the modem path
+        for d, args in self.connectivity_mock.GetMethodCalls('UnlockModem'):
+            self.assertEqual(str(args[0]), '/ril_0')