tests: adopt to refactored netplan_cli module

canonical · Aug 1, 2023 · 42a1cdc · 42a1cdc
1 parent e65fbfb
commit 42a1cdc
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 140 deletions.
diff --git a/tests/cli/test_get_set.py b/tests/cli/test_get_set.py
@@ -25,8 +25,8 @@
 
 import yaml
 
-from netplan.cli.commands.set import FALLBACK_FILENAME
-from netplan.libnetplan import NetplanException
+from netplan_cli.cli.commands.set import FALLBACK_FILENAME
+from netplan_cli.libnetplan import NetplanException
 from tests.test_utils import call_cli
 
 

diff --git a/tests/cli/test_state.py b/tests/cli/test_state.py
@@ -27,7 +27,7 @@
 import yaml
 
 from unittest.mock import patch, call, mock_open
-from netplan.cli.state import Interface, NetplanConfigState, SystemConfigState
+from netplan_cli.cli.state import Interface, NetplanConfigState, SystemConfigState
 from .test_status import (DNS_ADDRESSES, DNS_IP4, DNS_SEARCH, FAKE_DEV,
                           IPROUTE2, NETWORKD, NMCLI, ROUTE4, ROUTE6)
 
@@ -214,14 +214,14 @@ def test_query_online_state_offline(self):
         res = SystemConfigState.query_online_state([Interface(FAKE_DEV, [])])
         self.assertFalse(res)
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_system_state_config_data_interfaces(self, online_mock, resolvconf_mock, rd_mock,
                                                  routes_mock, nm_mock, networkd_mock, iproute2_mock,
                                                  systemctl_mock):
@@ -317,8 +317,8 @@ def test_query_networkctl_fail(self, mock):
             self.assertIsNone(res)
             self.assertIn('WARNING:root:Cannot query networkctl for {}:'.format(dev), cm.output[0])
 
-    @patch('netplan.cli.state.Interface.query_nm_ssid')
-    @patch('netplan.cli.state.Interface.query_networkctl')
+    @patch('netplan_cli.cli.state.Interface.query_nm_ssid')
+    @patch('netplan_cli.cli.state.Interface.query_networkctl')
     def test_json_nm_wlan0(self, networkctl_mock, nm_ssid_mock):
         SSID = 'MYCON'
         nm_ssid_mock.return_value = SSID
@@ -351,7 +351,7 @@ def test_json_nm_wlan0(self, networkctl_mock, nm_ssid_mock):
         self.assertEqual(len(json.get('dns_search')), 1)
         self.assertEqual(len(json.get('routes')), 6)
 
-    @patch('netplan.cli.state.Interface.query_networkctl')
+    @patch('netplan_cli.cli.state.Interface.query_networkctl')
     def test_json_nd_enp0s31f6(self, networkctl_mock):
         # networkctl mock output reduced to relevant lines
         networkctl_mock.return_value = 'Activation Policy: manual'

diff --git a/tests/cli/test_status.py b/tests/cli/test_status.py
@@ -23,8 +23,8 @@
 
 from contextlib import redirect_stdout
 from unittest.mock import patch
-from netplan.cli.commands.status import NetplanStatus
-from netplan.cli.state import Interface, SystemConfigState
+from netplan_cli.cli.commands.status import NetplanStatus
+from netplan_cli.cli.state import Interface, SystemConfigState
 from tests.test_utils import call_cli
 
 
@@ -53,8 +53,8 @@ def _call(self, args):
     def _get_itf(self, ifname):
         return next((itf for itf in yaml.safe_load(IPROUTE2) if itf['ifname'] == ifname), None)
 
-    @patch('netplan.cli.state.Interface.query_nm_ssid')
-    @patch('netplan.cli.state.Interface.query_networkctl')
+    @patch('netplan_cli.cli.state.Interface.query_nm_ssid')
+    @patch('netplan_cli.cli.state.Interface.query_networkctl')
     def test_pretty_print(self, networkctl_mock, nm_ssid_mock):
         SSID = 'MYCON'
         nm_ssid_mock.return_value = SSID
@@ -145,14 +145,14 @@ def test_pretty_print(self, networkctl_mock, nm_ssid_mock):
 1 inactive interfaces hidden. Use "--all" to show all.
 ''')
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_call_cli(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_mock, networkd_mock, iproute2_mock,
                       systemctl_mock):
         systemctl_mock.return_value = None
@@ -170,24 +170,24 @@ def test_call_cli(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_m
 
 ● 42: fakedev0 other DOWN (unmanaged)''')
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
     def test_fail_cli(self, networkd_mock, iproute2_mock, systemctl_mock):
         systemctl_mock.return_value = None
         iproute2_mock.return_value = [FAKE_DEV]
         networkd_mock.return_value = []
         with self.assertRaises(SystemExit):
             self._call([])
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_call_cli_ifname(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_mock, networkd_mock, iproute2_mock,
                              systemctl_mock):
         systemctl_mock.return_value = None
@@ -207,14 +207,14 @@ def test_call_cli_ifname(self, online_mock, resolvconf_mock, rd_mock, routes_moc
 
 1 inactive interfaces hidden. Use "--all" to show all.''')
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_fail_cli_ifname(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_mock, networkd_mock, iproute2_mock,
                              systemctl_mock):
         systemctl_mock.return_value = None
@@ -229,14 +229,14 @@ def test_fail_cli_ifname(self, online_mock, resolvconf_mock, rd_mock, routes_moc
         with self.assertRaises(SystemExit):
             self._call(['notaninteface0'])
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_call_cli_json(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_mock, networkd_mock, iproute2_mock,
                            systemctl_mock):
         systemctl_mock.return_value = None
@@ -253,14 +253,14 @@ def test_call_cli_json(self, online_mock, resolvconf_mock, rd_mock, routes_mock,
 "netplan-global-state": {"online": false, "nameservers": {"addresses": [], "search": [], "mode": null}}, \
 "fakedev0": {"index": 42, "adminstate": "DOWN", "operstate": "DOWN"}}\n''')
 
-    @patch('netplan.cli.utils.systemctl')
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
     def test_call_cli_yaml(self, online_mock, resolvconf_mock, rd_mock, routes_mock, nm_mock, networkd_mock, iproute2_mock,
                            systemctl_mock):
         systemctl_mock.return_value = None
@@ -285,15 +285,15 @@ def test_call_cli_yaml(self, online_mock, resolvconf_mock, rd_mock, routes_mock,
     search: []
   online: false'''.strip())
 
-    @patch('netplan.cli.state.SystemConfigState.query_iproute2')
-    @patch('netplan.cli.state.SystemConfigState.query_networkd')
-    @patch('netplan.cli.state.SystemConfigState.query_nm')
-    @patch('netplan.cli.state.SystemConfigState.query_routes')
-    @patch('netplan.cli.state.SystemConfigState.query_resolved')
-    @patch('netplan.cli.state.SystemConfigState.resolvconf_json')
-    @patch('netplan.cli.state.SystemConfigState.query_online_state')
-    @patch('netplan.cli.utils.systemctl_is_active')
-    @patch('netplan.cli.utils.systemctl')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_iproute2')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_networkd')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_nm')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_routes')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_resolved')
+    @patch('netplan_cli.cli.state.SystemConfigState.resolvconf_json')
+    @patch('netplan_cli.cli.state.SystemConfigState.query_online_state')
+    @patch('netplan_cli.cli.utils.systemctl_is_active')
+    @patch('netplan_cli.cli.utils.systemctl')
     def test_call_cli_no_networkd(self, systemctl_mock, is_active_mock,
                                   online_mock, resolvconf_mock, rd_mock,
                                   routes_mock, nm_mock, networkd_mock,
@@ -313,8 +313,8 @@ def test_call_cli_no_networkd(self, systemctl_mock, is_active_mock,
                           cm.output[0])
         systemctl_mock.assert_called_with('start', ['systemd-networkd.service'], True)
 
-    @patch('netplan.cli.utils.systemctl_is_active')
-    @patch('netplan.cli.utils.systemctl_is_masked')
+    @patch('netplan_cli.cli.utils.systemctl_is_active')
+    @patch('netplan_cli.cli.utils.systemctl_is_masked')
     def test_call_cli_networkd_masked(self, is_masked_mock, is_active_mock):
         is_active_mock.return_value = False
         is_masked_mock.return_value = True

diff --git a/tests/cli/test_units.py b/tests/cli/test_units.py
@@ -25,9 +25,9 @@
 import tempfile
 
 from unittest.mock import patch
-from netplan.cli.commands.apply import NetplanApply
-from netplan.cli.commands.try_command import NetplanTry
-from netplan.cli.core import Netplan
+from netplan_cli.cli.commands.apply import NetplanApply
+from netplan_cli.cli.commands.try_command import NetplanTry
+from netplan_cli.cli.core import Netplan
 
 
 class TestCLI(unittest.TestCase):

diff --git a/tests/parser/base.py b/tests/parser/base.py
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from configparser import ConfigParser
-from netplan.libnetplan import _NetplanError
+from netplan_cli.libnetplan import _NetplanError
 import os
 import re
 import sys

diff --git a/tests/test_configmanager.py b/tests/test_configmanager.py
@@ -21,7 +21,7 @@
 import tempfile
 import unittest
 
-from netplan.configmanager import ConfigManager, ConfigurationError
+from netplan_cli.configmanager import ConfigManager, ConfigurationError
 
 
 class TestConfigManager(unittest.TestCase):

diff --git a/tests/test_libnetplan.py b/tests/test_libnetplan.py
@@ -28,9 +28,9 @@
 from tests.test_utils import MockCmd
 
 from utils import state_from_yaml
-from netplan.cli.commands.set import FALLBACK_FILENAME
+from netplan_cli.cli.commands.set import FALLBACK_FILENAME
 
-import netplan.libnetplan as libnetplan
+import netplan_cli.libnetplan as libnetplan
 
 lib = libnetplan.lib
 rootdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

diff --git a/tests/test_ovs.py b/tests/test_ovs.py
@@ -18,9 +18,9 @@
 import unittest
 
 from unittest.mock import patch, call
-from netplan.cli.ovs import OPENVSWITCH_OVS_VSCTL as OVS
+from netplan_cli.cli.ovs import OPENVSWITCH_OVS_VSCTL as OVS
 
-import netplan.cli.ovs as ovs
+import netplan_cli.cli.ovs as ovs
 
 from utils import state_from_yaml
 import tempfile