From ebfe7132417e5a312b062f73ad69e9ebc1e5a246 Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Mon, 19 Oct 2015 18:17:20 +0100
Subject: [PATCH] Fix indexing bug in SettingsAddConnection

---
 dbusmock/templates/networkmanager.py | 15 +++++----
 tests/test_networkmanager.py         | 47 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/dbusmock/templates/networkmanager.py b/dbusmock/templates/networkmanager.py
index 61c298fc..8308ba3b 100644
--- a/dbusmock/templates/networkmanager.py
+++ b/dbusmock/templates/networkmanager.py
@@ -674,14 +674,13 @@ def SettingsAddConnection(self, connection_settings):
     main_connections = settings_obj.ListConnections()
 
     # Mimic how NM names connections
-    connection_name = str(len(main_connections))
-
-    connection_path = SETTINGS_OBJ + '/' + connection_name
-
-    if connection_path in main_connections:
-        raise dbus.exceptions.DBusException(
-            'Connection %s already exists' % connection_path,
-            name=MAIN_IFACE + '.AlreadyExists',)
+    count = 0
+    while True:
+        connection_obj_path = dbus.ObjectPath(SETTINGS_OBJ + '/' + str(count))
+        if connection_obj_path not in main_connections:
+            break
+        count += 1
+    connection_path = str(connection_obj_path)
 
     self.AddObject(connection_path,
                    CSETTINGS_IFACE,
diff --git a/tests/test_networkmanager.py b/tests/test_networkmanager.py
index ad632fd4..1122ffa6 100644
--- a/tests/test_networkmanager.py
+++ b/tests/test_networkmanager.py
@@ -342,6 +342,53 @@ def test_remove_connection(self):
         self.assertFalse(re.compile('The_SSID.*\s802-11-wireless').search(self.read_active_connection()))
         self.assertRegex(self.read_device(), 'wlan0.*\sdisconnected')
 
+    def test_add_remove_settings(self):
+        connection = {
+            'connection': {
+                'timestamp': 1441979296,
+                'type': 'vpn',
+                'id': 'a',
+                'uuid': '11111111-1111-1111-1111-111111111111'
+            },
+            'vpn': {
+                'service-type': 'org.freedesktop.NetworkManager.openvpn',
+                'data': {
+                    'connection-type': 'tls'
+                }
+            },
+            'ipv4': {
+                'routes': dbus.Array([], signature='o'),
+                'never-default': True,
+                'addresses': dbus.Array([], signature='o'),
+                'dns': dbus.Array([], signature='o'),
+                'method': 'auto'
+            },
+            'ipv6': {
+                'addresses': dbus.Array([], signature='o'),
+                'ip6-privacy': 0,
+                'dns': dbus.Array([], signature='o'),
+                'never-default': True,
+                'routes': dbus.Array([], signature='o'),
+                'method': 'auto'
+            }
+        }
+
+        connectionA = self.settings.AddConnection(connection)
+        connection['connection']['id'] = 'b'
+        connection['connection']['uuid'] = '11111111-1111-1111-1111-111111111112'
+        connectionB = self.settings.AddConnection(connection)
+        self.assertEqual(self.settings.ListConnections(), [connectionA, connectionB])
+
+        connectionA_i = dbus.Interface(
+            self.dbus_con.get_object(MAIN_IFACE, connectionA), CSETTINGS_IFACE)
+        connectionA_i.Delete()
+        self.assertEqual(self.settings.ListConnections(), [connectionB])
+
+        connection['connection']['id'] = 'c'
+        connection['connection']['uuid'] = '11111111-1111-1111-1111-111111111113'
+        connectionC = self.settings.AddConnection(connection)
+        self.assertEqual(self.settings.ListConnections(), [connectionB, connectionC])
+
 
 if __name__ == '__main__':
     unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))