Centralize LibVirtWorker specification into a dataclass

Author: cvicentiu

master-libvirt/master.cfg

@@ -2,13 +2,15 @@
 # ex: set filetype=python:
 
 import os
+from dataclasses import dataclass
 
 from buildbot.plugins import steps, util, worker
 from buildbot.steps.shell import Test
 from constants import BUILDERS_INSTALL, OS_INFO
 from master_common import base_master_config
 from utils import canStartBuild, envFromProperties, getScript, nextBuild, printEnv
 
+
 cfg_dir = os.path.abspath(os.path.dirname(__file__))
 
 # Non autogen master. For now the directory structure is:
@@ -184,6 +186,23 @@ f_rpm_upgrade.addStep(getRpmUpgradeStep())
 c["workers"] = []
 c["builders"] = []
 
+
+@dataclass
+class LibVirtWorkerSpecs:
+    name: str
+    connection_url: str
+    image_path: str
+    password: str
+
+    def __init__(self, platform: str, os_name: str, os_version: str):
+        host, url = config["private"]["libvirt_workers"][platform]
+        name = f"{host}-{os_name}-{os_version}-{platform}", url
+        super().__init__(name=name,
+                         connection_url=url,
+                         image_path=f"/var/libvirt/images/{name}",
+                         password=config["private"]["worker_pass"]["libvirt"])
+
+
 # Add the workers and builds based on the configured install builders (see constants.py)
 for builder_name in BUILDERS_INSTALL:
     # Parse builder name
@@ -193,24 +212,16 @@ for builder_name in BUILDERS_INSTALL:
 
     os_info_name = os_name + "-" + os_version
 
-    libvirt_worker_name = (
-        config["private"]["libvirt_workers"][platform][0]
-        + "-"
-        + os_name
-        + "-"
-        + os_version
-        + "-"
-        + platform
-    )
-    connection_url = config["private"]["libvirt_workers"][platform][1]
-    image_path = "/var/libvirt/images/" + libvirt_worker_name
+    worker_specs = LibVirtWorkerSpecs(platform=platform,
+                                      os_name=os_name,
+                                      os_version=os_version)
 
     c["workers"].append(
         worker.LibVirtWorker(
-            libvirt_worker_name,
-            config["private"]["worker_pass"]["libvirt"],
-            util.Connection(connection_url),
-            image_path,
+            worker_specs.name,
+            worker_specs.password,
+            util.Connection(worker_specs.connection_url),
+            worker_specs.image_path,
             build_wait_timeout=0,
             max_builds=1,
         )
@@ -236,7 +247,7 @@ for builder_name in BUILDERS_INSTALL:
     c["builders"].append(
         util.BuilderConfig(
             name=builder_name,
-            workernames=libvirt_worker_name,
+            workernames=worker_specs.name,
             tags=[os_name, builder_type, "install", "kvm"],
             collapseRequests=True,
             nextBuild=nextBuild,
@@ -260,7 +271,7 @@ for builder_name in BUILDERS_INSTALL:
     c["builders"].append(
         util.BuilderConfig(
             name=major_upgrade_name,
-            workernames=libvirt_worker_name,
+            workernames=worker_specs.name,
             tags=[os_name, builder_type, "upgrade", "kvm", "major", "server"],
             collapseRequests=True,
             nextBuild=nextBuild,
@@ -286,7 +297,7 @@ for builder_name in BUILDERS_INSTALL:
     c["builders"].append(
         util.BuilderConfig(
             name=minor_upgrade_name + "-all",
-            workernames=libvirt_worker_name,
+            workernames=worker_specs.name,
             tags=[os_name, builder_type, "upgrade", "kvm", "minor", "all"],
             collapseRequests=True,
             nextBuild=nextBuild,
@@ -310,7 +321,7 @@ for builder_name in BUILDERS_INSTALL:
     c["builders"].append(
         util.BuilderConfig(
             name=minor_upgrade_name + "-columnstore",
-            workernames=libvirt_worker_name,
+            workernames=worker_specs.name,
             tags=[os_name, builder_type, "upgrade", "kvm", "minor", "columnstore"],
             collapseRequests=True,
             nextBuild=nextBuild,