sts-sponsors team mailing list archive

[Anton Troyanov <mp+433440@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:fix-pod-ws-handler into maas:master.

Commit message:
fix(vault): pod should use get_power_parameters

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/433440
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~troyanov/maas:fix-pod-ws-handler into maas:master.

diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index 27c2970..40c449f 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -225,7 +225,7 @@ class PodForm(MAASModelForm):
             ].field_dict
             self.fields.update(self.param_fields)
             if not self.is_new:
-                for key, value in self.instance.power_parameters.items():
+                for key, value in self.instance.get_power_parameters().items():
                     if key not in self.data:
                         self.data[key] = value
             super()._clean_fields()
@@ -296,7 +296,7 @@ class PodForm(MAASModelForm):
         # update the object
         self.instance = super().save(commit=False)
         self.instance.power_type = power_type
-        self.instance.power_parameters = power_parameters
+        self.instance.set_power_parameters(power_parameters)
 
         # update all members in a cluster if certificates are updated
         if not self.is_new and self.instance.cluster is not None:
@@ -682,7 +682,7 @@ class ComposeMachineForm(forms.Form):
             )
             return requested_machine, result
 
-        power_parameters = self.pod.power_parameters.copy()
+        power_parameters = self.pod.get_power_parameters().copy()
 
         if isInIOThread():
             # Running under the twisted reactor, before the work from inside.
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index 66ccc4e..b32a080 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -119,7 +119,7 @@ class PodHandler(TimestampedModelHandler):
             }
         )
         if self.user.is_superuser:
-            data["power_parameters"] = obj.power_parameters
+            data["power_parameters"] = obj.get_power_parameters()
         if not for_list:
             if obj.host:
                 data["attached_vlans"] = list(
@@ -140,8 +140,8 @@ class PodHandler(TimestampedModelHandler):
                 data["boot_vlans"] = []
 
             # include certificate info if present
-            certificate = obj.power_parameters.get("certificate")
-            key = obj.power_parameters.get("key")
+            certificate = obj.get_power_parameters().get("certificate")
+            key = obj.get_power_parameters().get("key")
             if certificate and key:
                 cert = Certificate.from_pem(certificate, key)
                 data["certificate"] = dehydrate_certificate(cert)