Merge ~troyanov/maas:backport-a2d011b-3.3 into maas:3.3

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: f8cdb7f806036a9ec17040bd74937c9c27d87883
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-a2d011b-3.3
Merge into: maas:3.3
Diff against target: 39 lines (+10/-2)
2 files modified
src/maasserver/forms/parameters.py (+1/-1)
src/maasserver/forms/tests/test_parameters.py (+9/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
MAAS Maintainers Pending
Review via email: mp+455175@code.launchpad.net

Commit message

fix: added an e to the suit

(cherry picked from commit a2d011b8710894a40b5f02fbb12e641388f6be5a)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-a2d011b-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/3963/console
COMMIT: f8cdb7f806036a9ec17040bd74937c9c27d87883

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-a2d011b-3.3 lp:~troyanov/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f8cdb7f806036a9ec17040bd74937c9c27d87883

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/forms/parameters.py b/src/maasserver/forms/parameters.py
2index 6d6715e..25425c7 100644
3--- a/src/maasserver/forms/parameters.py
4+++ b/src/maasserver/forms/parameters.py
5@@ -26,7 +26,7 @@ DEFAULTS_FROM_MAAS_CONFIG = {
6 "maas_auto_ipmi_user",
7 "maas_auto_ipmi_user_privilege_level",
8 "maas_auto_ipmi_k_g_bmc_key",
9- "maas_auto_ipmi_cipher_suit_id",
10+ "maas_auto_ipmi_cipher_suite_id",
11 }
12
13
14diff --git a/src/maasserver/forms/tests/test_parameters.py b/src/maasserver/forms/tests/test_parameters.py
15index 47d6df7..217f3d8 100644
16--- a/src/maasserver/forms/tests/test_parameters.py
17+++ b/src/maasserver/forms/tests/test_parameters.py
18@@ -4,8 +4,12 @@
19 import random
20
21 from maasserver.enum import INTERFACE_TYPE, IPADDRESS_TYPE, NODE_STATUS
22-from maasserver.forms.parameters import ParametersForm
23+from maasserver.forms.parameters import (
24+ DEFAULTS_FROM_MAAS_CONFIG,
25+ ParametersForm,
26+)
27 from maasserver.models import Config
28+from maasserver.models.config import get_default_config
29 from maasserver.testing.factory import factory
30 from maasserver.testing.testcase import MAASServerTestCase
31 from provisioningserver.drivers.power.ipmi import IPMI_PRIVILEGE_LEVEL_CHOICES
32@@ -1329,3 +1333,7 @@ class TestParametersForm(MAASServerTestCase):
33 },
34 form.errors,
35 )
36+
37+ def test_default_config_keys_exist(self):
38+ defaults_all = get_default_config().keys()
39+ self.assertGreaterEqual(defaults_all, DEFAULTS_FROM_MAAS_CONFIG)

Subscribers

People subscribed via source and target branches