Merge lp:~gmb/maas/enlist-uscm-to-RPC into lp:~maas-committers/maas/trunk

[Graham Binns]

Convert the enlist_nodes_from_ucsm() celery task to use RPC.

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2014-09-10 16:01:38 +0000
+++ src/maasserver/models/nodegroup.py	2014-09-11 10:17:45 +0000
@@ -41,13 +41,11 @@
 from provisioningserver.rpc.cluster import (
     AddSeaMicro15k,
     AddVirsh,
+    EnlistNodesFromMSCM,
+    EnlistNodesFromUCSM,
     ImportBootImages,
     )
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
-from provisioningserver.tasks import (
-    enlist_nodes_from_mscm,
-    enlist_nodes_from_ucsm,
-    )
 
 
 class NodeGroupManager(Manager):
@@ -304,9 +302,21 @@
         :param URL: URL of the Cisco UCS Manager HTTP-XML API.
         :param username: username for UCS Manager.
         :param password: password for UCS Manager.
+
+        :raises NoConnectionsAvailable: If no connections to the cluster
+            are available.
         """
-        args = (url, username, password)
-        enlist_nodes_from_ucsm.apply_async(queue=self.uuid, args=args)
+        try:
+            client = getClientFor(self.uuid, timeout=1)
+        except NoConnectionsAvailable:
+            # No connection to the cluster so we can't do anything. We
+            # let the caller handle the error, since we don't want to
+            # just drop it.
+            raise
+        else:
+            return client(
+                EnlistNodesFromUCSM, url=url, username=username,
+                password=password)
 
     def enlist_nodes_from_mscm(self, host, username, password):
         """ Add the servers from a Moonshot HP iLO Chassis Manager.
@@ -314,6 +324,18 @@
         :param host: IP address for the MSCM.
         :param username: username for MSCM.
         :param password: password for MSCM.
+
+        :raises NoConnectionsAvailable: If no connections to the cluster
+            are available.
         """
-        args = (host, username, password)
-        enlist_nodes_from_mscm.apply_async(queue=self.uuid, args=args)
+        try:
+            client = getClientFor(self.uuid, timeout=1)
+        except NoConnectionsAvailable:
+            # No connection to the cluster so we can't do anything. We
+            # let the caller handle the error, since we don't want to
+            # just drop it.
+            raise
+        else:
+            return client(
+                EnlistNodesFromMSCM, host=host, username=username,
+                password=password)

=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
--- src/maasserver/models/tests/test_nodegroup.py	2014-09-10 16:01:38 +0000
+++ src/maasserver/models/tests/test_nodegroup.py	2014-09-11 10:17:45 +0000
@@ -49,6 +49,8 @@
 from provisioningserver.rpc.cluster import (
     AddSeaMicro15k,
     AddVirsh,
+    EnlistNodesFromMSCM,
+    EnlistNodesFromUCSM,
     ImportBootImages,
     )
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
@@ -513,3 +515,101 @@
         self.assertRaises(
             NoConnectionsAvailable, nodegroup.add_seamicro15k,
             mac, username, password, power_control)
+
+    def test_enlist_nodes_from_mscm_end_to_end(self):
+        nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
+
+        self.useFixture(RegionEventLoopFixture("rpc"))
+        self.useFixture(RunningEventLoopFixture())
+        fixture = self.useFixture(MockLiveRegionToClusterRPCFixture())
+        protocol = fixture.makeCluster(nodegroup, EnlistNodesFromMSCM)
+        protocol.EnlistNodesFromMSCM.return_value = defer.succeed({})
+
+        host = factory.make_name('host')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        nodegroup.enlist_nodes_from_mscm(
+            host, username, password).wait(10)
+
+        self.expectThat(
+            protocol.EnlistNodesFromMSCM,
+            MockCalledOnceWith(
+                ANY, host=host, username=username, password=password))
+
+    def test_enlist_nodes_from_mscm_calls_client_with_resource_endpoint(self):
+        getClientFor = self.patch(nodegroup_module, 'getClientFor')
+        client = getClientFor.return_value
+        nodegroup = factory.make_NodeGroup()
+
+        host = factory.make_name('host')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        nodegroup.enlist_nodes_from_mscm(
+            host, username, password).wait(10)
+
+        self.expectThat(
+            client,
+            MockCalledOnceWith(
+                EnlistNodesFromMSCM, host=host, username=username,
+                password=password))
+
+    def test_enlist_nodes_from_mscm_raises_if_no_connection_to_cluster(self):
+        getClientFor = self.patch(nodegroup_module, 'getClientFor')
+        getClientFor.side_effect = NoConnectionsAvailable()
+        nodegroup = factory.make_NodeGroup()
+
+        host = factory.make_name('host')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        self.assertRaises(
+            NoConnectionsAvailable, nodegroup.enlist_nodes_from_mscm,
+            host, username, password)
+
+    def test_enlist_nodes_from_ucsm_end_to_end(self):
+        nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
+
+        self.useFixture(RegionEventLoopFixture("rpc"))
+        self.useFixture(RunningEventLoopFixture())
+        fixture = self.useFixture(MockLiveRegionToClusterRPCFixture())
+        protocol = fixture.makeCluster(nodegroup, EnlistNodesFromUCSM)
+        protocol.EnlistNodesFromUCSM.return_value = defer.succeed({})
+
+        url = factory.make_url()
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        nodegroup.enlist_nodes_from_ucsm(
+            url, username, password).wait(10)
+
+        self.expectThat(
+            protocol.EnlistNodesFromUCSM,
+            MockCalledOnceWith(
+                ANY, url=url, username=username, password=password))
+
+    def test_enlist_nodes_from_ucsm_calls_client_with_resource_endpoint(self):
+        getClientFor = self.patch(nodegroup_module, 'getClientFor')
+        client = getClientFor.return_value
+        nodegroup = factory.make_NodeGroup()
+
+        url = factory.make_url()
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        nodegroup.enlist_nodes_from_ucsm(
+            url, username, password).wait(10)
+
+        self.expectThat(
+            client,
+            MockCalledOnceWith(
+                EnlistNodesFromUCSM, url=url, username=username,
+                password=password))
+
+    def test_enlist_nodes_from_ucsm_raises_if_no_connection_to_cluster(self):
+        getClientFor = self.patch(nodegroup_module, 'getClientFor')
+        getClientFor.side_effect = NoConnectionsAvailable()
+        nodegroup = factory.make_NodeGroup()
+
+        url = factory.make_url()
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        self.assertRaises(
+            NoConnectionsAvailable, nodegroup.enlist_nodes_from_ucsm,
+            url, username, password)

=== modified file 'src/provisioningserver/rpc/cluster.py'
--- src/provisioningserver/rpc/cluster.py	2014-09-10 16:44:28 +0000
+++ src/provisioningserver/rpc/cluster.py	2014-09-11 10:17:45 +0000
@@ -377,3 +377,31 @@
     errors = {
         exceptions.NoIPFoundForMACAddress: b"NoIPFoundForMACAddress",
     }
+
+
+class EnlistNodesFromMSCM(amp.Command):
+    """Probe for and enlist mscm machines attached to the cluster.
+
+    :since 1.7:
+    """
+    arguments = [
+        (b"host", amp.Unicode()),
+        (b"username", amp.Unicode()),
+        (b"password", amp.Unicode()),
+    ]
+    response = []
+    errors = {}
+
+
+class EnlistNodesFromUCSM(amp.Command):
+    """Probe for and enlist ucsm machines attached to the cluster.
+
+    :since 1.7:
+    """
+    arguments = [
+        (b"url", amp.Unicode()),
+        (b"username", amp.Unicode()),
+        (b"password", amp.Unicode()),
+    ]
+    response = []
+    errors = {}

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2014-09-10 23:00:52 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2014-09-11 10:17:45 +0000
@@ -29,6 +29,8 @@
     ArchitectureRegistry,
     PowerTypeRegistry,
     )
+from provisioningserver.drivers.hardware.mscm import probe_and_enlist_mscm
+from provisioningserver.drivers.hardware.ucsm import probe_and_enlist_ucsm
 from provisioningserver.drivers.hardware.seamicro import (
     probe_seamicro15k_and_enlist,
     )
@@ -266,6 +268,26 @@
             raise exceptions.NoIPFoundForMACAddress(message)
         return {}
 
+    @cluster.EnlistNodesFromMSCM.responder
+    def enlist_nodes_from_mscm(self, host, username, password):
+        """enlist_nodes_from_mscm()
+
+        Implemention of
+        :py:class:`~provisioningserver.rpc.cluster.EnlistNodesFromMSCM`.
+        """
+        probe_and_enlist_mscm(host, username, password)
+        return {}
+
+    @cluster.EnlistNodesFromUCSM.responder
+    def enlist_nodes_from_ucsm(self, url, username, password):
+        """enlist_nodes_from_ucsm()
+
+        Implemention of
+        :py:class:`~provisioningserver.rpc.cluster.EnlistNodesFromUCSM`.
+        """
+        probe_and_enlist_ucsm(url, username, password)
+        return {}
+
 
 @implementer(IConnection)
 class ClusterClient(Cluster):

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-10 23:00:52 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-11 10:17:45 +0000
@@ -1256,3 +1256,57 @@
             probe_seamicro15k_and_enlist, MockCalledOnceWith(
                 find_ip_via_arp.return_value, username, password,
                 power_control=power_control))
+
+
+class TestClusterProtocol_EnlistNodesFromMSCM(MAASTestCase):
+
+    def test__is_registered(self):
+        protocol = Cluster()
+        responder = protocol.locateResponder(
+            cluster.EnlistNodesFromMSCM.commandName)
+        self.assertIsNot(responder, None)
+
+    def test__calls_probe_and_enlist_mscm(self):
+        probe_and_enlist_mscm = self.patch_autospec(
+            clusterservice, 'probe_and_enlist_mscm')
+
+        host = factory.make_name('host')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+
+        call_responder(Cluster(), cluster.EnlistNodesFromMSCM, {
+            'host': host,
+            'username': username,
+            'password': password,
+        })
+
+        self.assertThat(
+            probe_and_enlist_mscm, MockCalledOnceWith(
+                host, username, password))
+
+
+class TestClusterProtocol_EnlistNodesFromUCSM(MAASTestCase):
+
+    def test__is_registered(self):
+        protocol = Cluster()
+        responder = protocol.locateResponder(
+            cluster.EnlistNodesFromUCSM.commandName)
+        self.assertIsNot(responder, None)
+
+    def test__calls_probe_and_enlist_ucsm(self):
+        probe_and_enlist_ucsm = self.patch_autospec(
+            clusterservice, 'probe_and_enlist_ucsm')
+
+        url = factory.make_url()
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+
+        call_responder(Cluster(), cluster.EnlistNodesFromUCSM, {
+            'url': url,
+            'username': username,
+            'password': password,
+        })
+
+        self.assertThat(
+            probe_and_enlist_ucsm, MockCalledOnceWith(
+                url, username, password))

=== modified file 'src/provisioningserver/tasks.py'
--- src/provisioningserver/tasks.py	2014-09-10 17:00:43 +0000
+++ src/provisioningserver/tasks.py	2014-09-11 10:17:45 +0000
@@ -42,8 +42,6 @@
     set_up_options_conf,
     setup_rndc,
     )
-from provisioningserver.drivers.hardware.mscm import probe_and_enlist_mscm
-from provisioningserver.drivers.hardware.ucsm import probe_and_enlist_ucsm
 from provisioningserver.logger import get_maas_logger
 
 # For each item passed to refresh_secrets, a refresh function to give it to.
@@ -297,23 +295,3 @@
                 exc=exc, countdown=UPDATE_NODE_TAGS_RETRY_DELAY)
         else:
             raise
-
-
-# =====================================================================
-# Custom hardware tasks
-# =====================================================================
-
-@task
-@log_task_events()
-@log_exception_text
-def enlist_nodes_from_ucsm(url, username, password):
-    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_ucsm`. """
-    probe_and_enlist_ucsm(url, username, password)
-
-
-@task
-@log_task_events()
-@log_exception_text
-def enlist_nodes_from_mscm(host, username, password):
-    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_mscm`. """
-    probe_and_enlist_mscm(host, username, password)