Merge ~danilogondolfo/network-manager/+git/network-manager:new_autopkgtests into ~slyon/network-manager:netplan-integration

[Danilo Egea Gondolfo]

[Lukas Märdian (slyon)]

Thank you! LGTM. I left one little (non-blocking) inline comment, which you could consider fixing.

This MP depends on some fixes in libnetplan, so we should hold it back until those fixed landed in Mantic. Once that's done (and the new autopkgtests PASS), we should rebase this MP against https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu/+ref/ubuntu/master and get it landed via the offical NetworkManager package.

review: Approve

Unmerged commits

16d5862... by Danilo Egea Gondolfo on 2023-05-11

d/t/nm_netplan.py: add new test cases

    - Test case for LP: #2016473: change an existing tunnel originally
      created with Netplan with nmcli and check if it worked.
    - Test case for LP: #2016625: add a wifi connection using 802.1x and
      check if nmcli finished successfully.

diff --git a/debian/tests/nm_netplan.py b/debian/tests/nm_netplan.py
index cc86bcf..b36b2f2 100644
--- a/debian/tests/nm_netplan.py
+++ b/debian/tests/nm_netplan.py
@@ -124,7 +124,7 @@ class TestNetplan(unittest.TestCase):
 
     def _nmcli(self, parameters):
         cmd = ['nmcli'] + parameters
-        subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        return subprocess.call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     def _bridge_show(self, bridge):
         cmd = ['bridge', '-j', 'link', 'show', bridge]
@@ -536,7 +536,7 @@ class TestNetplan(unittest.TestCase):
         with open('/etc/netplan/10-test.yaml', 'w') as f:
             f.write(netplan_yaml)
 
-        self._netplan_generate();
+        self._netplan_generate()
         self._nmcli_con_reload()
         self.nmclient = NM.Client.new()
 
@@ -565,7 +565,7 @@ class TestNetplan(unittest.TestCase):
         with open('/etc/netplan/10-test.yaml', 'w') as f:
             f.write(netplan_yaml)
 
-        self._netplan_generate();
+        self._netplan_generate()
         self._nmcli_con_reload()
         self.nmclient = NM.Client.new()
 
@@ -607,7 +607,7 @@ class TestNetplan(unittest.TestCase):
         with open('/etc/netplan/10-test.yaml', 'w') as f:
             f.write(netplan_yaml)
 
-        self._netplan_generate();
+        self._netplan_generate()
         self._nmcli_con_reload()
         self._nmcli(['con', 'mod', 'netplan-eth123', 'ipv4.method', 'auto'])
 
@@ -711,6 +711,65 @@ EASYRSA_BATCH=1 /usr/share/easy-rsa/easyrsa build-client-full client nopass
         self.assertEqual(self._get_number_of_yaml_files(), 2,
                          msg='More than expected YAML files were found after stopping the OpenVPN server')
 
+    def test_migrate_existing_tunnel_with_nmcli(self):
+        """
+        Change an existing tunnel defined in Netplan with nmcli so it will be "imported"
+        to NM. See LP: #2016473.
+        """
+
+        netplan_yaml = '''network:
+  renderer: NetworkManager
+  tunnels:
+    wg0:
+      mode: wireguard
+      port: 51821
+      key: YCNQCAes1OTbD2ynY+aBlaA5x4ZFJhsc4co+XHpZ4FU=
+      addresses:
+        - 172.17.0.1/24
+      peers:
+        - allowed-ips: [172.17.0.0/24]
+          endpoint: 4.4.4.4:51821
+          keys:
+            public: cwkb7k0xDgLSnunZpFIjLJw4u+mJDDr+aBR5DqzpmgI='''
+
+        with open('/etc/netplan/10-test.yaml', 'w') as f:
+            f.write(netplan_yaml)
+
+        self._netplan_generate()
+        self._nmcli_con_reload()
+        self._nmcli(['con', 'mod', 'netplan-wg0', 'con-name', 'netplan-wireguard-wg0'])
+
+        # After being processed by NM (and libnetplan) the new file shouldn't
+        # redefine the interface type. If it does, "netplan get" will fail when it tries to load the
+        # YAML hierarchy with the error below.
+        out = subprocess.check_output(['sh', '-c', 'netplan get ; exit 0'],
+                                      universal_newlines=True,
+                                      stderr=subprocess.STDOUT)
+        self.assertNotIn("Updated definition 'wg0' changes device type", out)
+
+    def test_create_wifi_connection_with_8021x(self):
+        """
+        See LP: #2016625.
+        """
+
+        openssl_cmd = [
+                'openssl', 'req', '-new', '-newkey', 'rsa:2048',
+                '-nodes', '-x509', '-subj',
+                '/C=US/ST=A/L=B/O=C/CN=www.a.com', '-keyout',
+                '/etc/netplan/a.key',  '-out', '/etc/netplan/a.crt']
+
+        subprocess.check_output(openssl_cmd, universal_newlines=True)
+
+        ret = self._nmcli(['con', 'add', 'con-name', 'eduroam',
+                           'type', 'wifi', 'ssid', 'eduroam',
+                           'wifi-sec.key-mgmt', 'wpa-eap', '802-1x.eap',
+                           'peap', '802-1x.identity', '[e-mail]',
+                           '802-1x.password', 'testing123',
+                           '802-1x.phase2-auth', 'mschapv2',
+                           '802-1x.ca-cert', '/etc/netplan/a.crt'])
+
+        self.assertEqual(ret, 0, 'nmcli failed to add connection')
+
 
 if __name__ == '__main__':
     runner = unittest.TextTestRunner(stream=sys.stdout, verbosity=2)