MAAS

Merge ~newell-jensen/maas:fix-typo-lxd-power-driver into maas:master

  1. Git
  2. lp:~newell-jensen/maas
  3. fix-typo-lxd-power-driver
  4. Merge into master
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 6f3b8ba89ed8b8f0626b7da29acee221de33944a
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:fix-typo-lxd-power-driver
Merge into: maas:master
Diff against target: 62 lines (+6/-6)
2 files modified
src/provisioningserver/drivers/power/lxd.py (+1/-1)
src/provisioningserver/drivers/power/tests/test_lxd.py (+5/-5)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander unittests Pending
Review via email: mp+380895@code.launchpad.net

Commit message

Fix has_api_extension typo. Update unit tests.

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/power/lxd.py b/src/provisioningserver/drivers/power/lxd.py
2index a4f7924..a42bd34 100644
3--- a/src/provisioningserver/drivers/power/lxd.py
4+++ b/src/provisioningserver/drivers/power/lxd.py
5@@ -89,7 +89,7 @@ class LXDPowerDriver(PowerDriver):
6 cert=(MAAS_CERTIFICATE, MAAS_PRIVATE_KEY),
7 verify=False,
8 )
9- if not client.has_api_extensions("virtual-machines"):
10+ if not client.has_api_extension("virtual-machines"):
11 raise LXDError(
12 "Please upgrade your LXD host to 3.19+ for virtual machine support."
13 )
14diff --git a/src/provisioningserver/drivers/power/tests/test_lxd.py b/src/provisioningserver/drivers/power/tests/test_lxd.py
15index c9e0edc..beb475c 100644
16--- a/src/provisioningserver/drivers/power/tests/test_lxd.py
17+++ b/src/provisioningserver/drivers/power/tests/test_lxd.py
18@@ -77,7 +77,7 @@ class TestLXDPowerDriver(MAASTestCase):
19 context = self.make_parameters_context()
20 Client = self.patch(lxd_module, "Client")
21 client = Client.return_value
22- client.has_api_extensions.return_value = True
23+ client.has_api_extension.return_value = True
24 client.trusted = False
25 driver = lxd_module.LXDPowerDriver()
26 endpoint = driver.get_url(context)
27@@ -102,7 +102,7 @@ class TestLXDPowerDriver(MAASTestCase):
28 system_id = factory.make_name("system_id")
29 Client = self.patch(lxd_module, "Client")
30 client = Client.return_value
31- client.has_api_extensions.return_value = False
32+ client.has_api_extension.return_value = False
33 driver = lxd_module.LXDPowerDriver()
34 error = self.assertRaises(
35 lxd_module.LXDError, driver.get_machine, system_id, context
36@@ -112,7 +112,7 @@ class TestLXDPowerDriver(MAASTestCase):
37 str(error),
38 )
39 self.assertThat(
40- client.has_api_extensions, MockCalledOnceWith("virtual-machines")
41+ client.has_api_extension, MockCalledOnceWith("virtual-machines")
42 )
43
44 def test_get_client_raises_error_when_not_trusted_and_no_password(self):
45@@ -121,7 +121,7 @@ class TestLXDPowerDriver(MAASTestCase):
46 system_id = factory.make_name("system_id")
47 Client = self.patch(lxd_module, "Client")
48 client = Client.return_value
49- client.has_api_extensions.return_value = True
50+ client.has_api_extension.return_value = True
51 client.trusted = False
52 driver = lxd_module.LXDPowerDriver()
53 error = self.assertRaises(
54@@ -132,7 +132,7 @@ class TestLXDPowerDriver(MAASTestCase):
55 str(error),
56 )
57 self.assertThat(
58- client.has_api_extensions, MockCalledOnceWith("virtual-machines")
59+ client.has_api_extension, MockCalledOnceWith("virtual-machines")
60 )
61
62 def test_get_client_raises_error_when_cannot_connect(self):

Subscribers

People subscribed via source and target branches