sts-sponsors team mailing list archive

[Anton Troyanov <mp+433439@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:vmhost-power-params into maas:master.

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/433439
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/src/maasserver/views/vmhost.py b/src/maasserver/views/vmhost.py
index 63ffb8e..a0c9b8c 100644
--- a/src/maasserver/views/vmhost.py
+++ b/src/maasserver/views/vmhost.py
@@ -13,7 +13,7 @@ from maasserver.models import Pod
 def vmhost_certificate_handler(request, name):
     """Return the PEM content of a VM host certificate, if present."""
     vmhost = get_object_or_404(Pod, name=name)
-    cert_pem = vmhost.power_parameters.get("certificate")
+    cert_pem = vmhost.get_power_parameters().get("certificate")
     if not cert_pem:
         return HttpResponseNotFound()
     return HttpResponse(cert_pem, content_type="text/plain")
diff --git a/src/maasserver/vmhost.py b/src/maasserver/vmhost.py
index 4df16f1..adcedd0 100644
--- a/src/maasserver/vmhost.py
+++ b/src/maasserver/vmhost.py
@@ -79,7 +79,7 @@ def discover_and_sync_vmhost(vmhost, user):
     try:
         discovered = discover_pod(
             vmhost.power_type,
-            vmhost.power_parameters,
+            vmhost.get_power_parameters(),
             pod_id=vmhost.id,
             name=vmhost.name,
         )
@@ -115,7 +115,7 @@ async def discover_and_sync_vmhost_async(vmhost, user):
     try:
         discovered = await discover_pod(
             vmhost.power_type,
-            vmhost.power_parameters,
+            vmhost.get_power_parameters(),
             pod_id=vmhost.id,
             name=vmhost.name,
         )
@@ -180,7 +180,7 @@ def _clean_power_address(vmhost_address):
 
 
 def _generate_cluster_power_params(vmhost, vmhost_address, first_host):
-    new_params = first_host.power_parameters.copy()
+    new_params = first_host.get_power_parameters().copy()
     new_params["power_address"] = _clean_power_address(vmhost_address)
     if isinstance(vmhost, DiscoveredPod):
         new_params["instance_name"] = vmhost.name
@@ -222,7 +222,7 @@ def sync_vmcluster(discovered_cluster, discovered, vmhost, user):
         zone=vmhost.zone,
     )
     vmhost_pwr_addr = _clean_power_address(
-        vmhost.power_parameters["power_address"]
+        vmhost.get_power_parameters()["power_address"]
     )
 
     for i, discovered_vmhost in enumerate(discovered_cluster.pods):
@@ -265,7 +265,7 @@ async def sync_vmcluster_async(discovered_cluster, discovered, vmhost, user):
         )
         new_hosts = []
         vmhost_pwr_addr = _clean_power_address(
-            vmhost.power_parameters["power_address"]
+            vmhost.get_power_parameters()["power_address"]
         )
         for i, discovered_vmhost in enumerate(discovered_cluster.pods):
             power_parameters = _generate_cluster_power_params(