Merge ~cgrabowski/maas:vmcluster_create_events into maas:master

[Christian Grabowski]

add VMCluster DB triggers

e6cfcfd... by Christian Grabowski on 2021-10-26

add cluster id to pods on the websocket handler

[MAAS Lander (maas-lander)]

UNIT TESTS
-b vmcluster_create_events lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11371/console
COMMIT: aa7ec790c87a75853c938b130c2add2cd64b8b0b

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b vmcluster_create_events lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11372/console
COMMIT: 1c1dc181652dd736b1ea32ccccfcbe807887e61f

review: Needs Fixing

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b vmcluster_create_events lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11373/console
COMMIT: e6cfcfd38fff75eef6c29fcfccdb839a37c6a3b6

review: Needs Fixing

7d304b8... by Christian Grabowski on 2021-10-26

update list of triggers for tests

[MAAS Lander (maas-lander)]

UNIT TESTS
-b vmcluster_create_events lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7d304b855404df84cadf61f0e5813eece8099c9b

review: Approve

diff --git a/src/maasserver/triggers/tests/test_init.py b/src/maasserver/triggers/tests/test_init.py
index 65b2199..9430110 100644
--- a/src/maasserver/triggers/tests/test_init.py
+++ b/src/maasserver/triggers/tests/test_init.py
@@ -288,6 +288,9 @@ class TestTriggersUsed(MAASServerTestCase):
         "zone_zone_create_notify",
         "zone_zone_delete_notify",
         "zone_zone_update_notify",
+        "vmcluster_vmcluster_insert_notify",
+        "vmcluster_vmcluster_update_notify",
+        "vmcluster_vmcluster_delete_notify",
     }
 
     triggers_all = triggers_system | triggers_websocket
diff --git a/src/maasserver/triggers/tests/test_websocket_listener.py b/src/maasserver/triggers/tests/test_websocket_listener.py
index 03739ee..4670063 100644
--- a/src/maasserver/triggers/tests/test_websocket_listener.py
+++ b/src/maasserver/triggers/tests/test_websocket_listener.py
@@ -29,7 +29,13 @@ from maasserver.enum import (
     NODE_TYPE_CHOICES,
 )
 from maasserver.listener import PostgresListenerService
-from maasserver.models import Config, ControllerInfo, Node, OwnerData
+from maasserver.models import (
+    Config,
+    ControllerInfo,
+    Node,
+    OwnerData,
+    VMCluster,
+)
 from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 from maasserver.models.partition import MIN_PARTITION_SIZE
 from maasserver.storage_layouts import MIN_BOOT_PARTITION_SIZE
@@ -4482,6 +4488,84 @@ class TestBMCListener(
             yield listener.stopService()
 
 
+class TestVMClusterListener(
+    MAASTransactionServerTestCase, TransactionalHelpersMixin
+):
+    def create_vmcluster(self, values):
+        return VMCluster.objects.create(**values)
+
+    def update_vmcluster(self, filter, values):
+        return VMCluster.objects.filter(**filter).update(**values)
+
+    def delete_vmcluster(self, filter):
+        VMCluster.objects.filter(**filter).delete()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_calls_handler_on_create_notification(self):
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        listener.register("vmcluster", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            cluster = yield deferToDatabase(
+                self.create_vmcluster,
+                {
+                    "name": factory.make_name("cluster"),
+                    "project": factory.make_name("project"),
+                },
+            )
+            yield dv.get(timeout=2)
+            self.assertEqual(("create", str(cluster.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_calls_handler_on_update_notification(self):
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        cluster = yield deferToDatabase(
+            self.create_vmcluster,
+            {
+                "name": factory.make_name("cluster"),
+                "project": factory.make_name("project"),
+            },
+        )
+        listener.register("vmcluster", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            pool = yield deferToDatabase(factory.make_ResourcePool)
+            yield deferToDatabase(
+                self.update_vmcluster, {"id": cluster.id}, {"pool": pool}
+            )
+            yield dv.get(timeout=2)
+            self.assertEqual(("update", str(cluster.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_calls_handler_on_delete_notification(self):
+        listener = self.make_listener_without_delay()
+        dv = DeferredValue()
+        cluster = yield deferToDatabase(
+            self.create_vmcluster,
+            {
+                "name": factory.make_name("cluster"),
+                "project": factory.make_name("project"),
+            },
+        )
+        listener.register("vmcluster", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_vmcluster, {"id": cluster.id})
+            yield dv.get(timeout=2)
+            self.assertEqual(("delete", str(cluster.id)), dv.value)
+        finally:
+            yield listener.stopService()
+
+
 class TestPodListener(
     MAASTransactionServerTestCase, TransactionalHelpersMixin
 ):
diff --git a/src/maasserver/triggers/websocket.py b/src/maasserver/triggers/websocket.py
index 429f814..c6666e2 100644
--- a/src/maasserver/triggers/websocket.py
+++ b/src/maasserver/triggers/websocket.py
@@ -105,6 +105,45 @@ TAG_NODES_NOTIFY = dedent(
 )
 
 
+# Procedure that is called when a VM cluster is created.
+VMCLUSTER_INSERT_NOTIFY = dedent(
+    """\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    BEGIN
+        PERFORM pg_notify('vmcluster_create',CAST(NEW.id AS text));
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """
+)
+
+
+# Procedure that is called when a VM cluster is updated
+VMCLUSTER_UPDATE_NOTIFY = dedent(
+    """\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    BEGIN
+        PERFORM pg_notify('vmcluster_update',CAST(NEW.id AS text));
+        RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """
+)
+
+
+# Procedure that is called when a VM cluster is deleted
+VMCLUSTER_DELETE_NOTIFY = dedent(
+    """\
+    CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+    BEGIN
+        PERFORM pg_notify('vmcluster_delete',CAST(OLD.id as text));
+        RETURN OLD;
+    END;
+    $$ LANGUAGE plpgsql;
+    """
+)
+
+
 # Procedure that is called when a pod is created.
 POD_INSERT_NOTIFY = dedent(
     """\
@@ -1863,6 +1902,12 @@ def register_websocket_triggers():
         "maasserver_iprange", "iprange_subnet", events=EVENTS_IUD
     )
 
+    # VMCluster notifications
+    register_procedure(VMCLUSTER_INSERT_NOTIFY % ("vmcluster_insert_notify"))
+    register_procedure(VMCLUSTER_UPDATE_NOTIFY % ("vmcluster_update_notify"))
+    register_procedure(VMCLUSTER_DELETE_NOTIFY % ("vmcluster_delete_notify"))
+    register_triggers("maasserver_vmcluster", "vmcluster", events=EVENTS_IUD)
+
     # Pod notifications
     register_procedure(POD_INSERT_NOTIFY % ("pod_insert_notify", BMC_TYPE.POD))
     register_procedure(
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index c1070b6..1f0f11f 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -149,6 +149,9 @@ class PodHandler(TimestampedModelHandler):
         if self.user.has_perm(PodPermission.compose, obj):
             data["permissions"].append("compose")
 
+        if obj.hints.cluster:
+            data["cluster"] = obj.hints.cluster_id
+
         return data
 
     def dehydrate_storage_pool(self, pool):
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index f4abb10..67c9ae6 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -328,6 +328,15 @@ class TestPodHandler(MAASTransactionServerTestCase):
         result = handler.get({"id": pod.id})
         self.assertEqual(result["attached_vlans"], [])
 
+    def test_get_with_cluster(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        node = factory.make_Node()
+        cluster = factory.make_VMCluster(pods=0)
+        pod = factory.make_Pod(cluster=cluster, host=node)
+        result = handler.get({"id": pod.id})
+        self.assertEqual(result["cluster"], cluster.id)
+
     def test_get_host_interfaces_no_sriov(self):
         admin = factory.make_admin()
         handler = PodHandler(admin, {}, None)