Merge lp:~andreserl/maas/fix_lp1469846_1.8 into lp:maas/1.8

[Andres Rodriguez]

Backport r4063: When probe-and-enlist a UCSM chassis, only probe for servers/blades that have a service profile / MAC address created for them.

[Andres Rodriguez (andreserl)]

https://code.launchpad.net/~andreserl/maas/fix_lp1469846/+merge/263283

review: Approve

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_ucsm.py'
--- src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2015-07-02 12:38:34 +0000
@@ -38,6 +38,7 @@
     ANY,
     call,
     Mock,
+    sentinel,
 )
 from provisioningserver.drivers.hardware import ucsm
 from provisioningserver.drivers.hardware.ucsm import (
@@ -55,6 +56,7 @@
     power_control_ucsm,
     power_state_ucsm,
     probe_and_enlist_ucsm,
+    probe_lan_boot_options,
     probe_servers,
     RO_KEYS,
     set_lan_boot_default,
@@ -334,6 +336,30 @@
         self.assertThat(mock, MockCalledOnceWith('computeItem', ANY))
 
 
+class TestProbeLanBootOptions(MAASTestCase):
+    """Tests for ``probe_lan_boot_options``."""
+
+    def test_returns_result(self):
+        api = make_api()
+        server = sentinel.server
+        mock_service_profile = Mock()
+        mock_get_service_profile = self.patch(ucsm, 'get_service_profile')
+        mock_get_service_profile.return_value = mock_service_profile
+        mock_service_profile.get.return_value = sentinel.profile_get
+        fake_result = make_fake_result('tag', 'lsbootLan')
+        mock_config_resolve_children = self.patch(
+            api, 'config_resolve_children')
+        mock_config_resolve_children.return_value = fake_result
+        self.assertEqual(1, len(probe_lan_boot_options(api, server)))
+        self.assertThat(
+            mock_config_resolve_children,
+            MockCalledOnceWith(sentinel.profile_get))
+        self.assertThat(
+            mock_service_profile.get, MockCalledOnceWith('operBootPolicyName'))
+        self.assertThat(
+            mock_get_service_profile, MockCalledOnceWith(api, server))
+
+
 class TestGetChildren(MAASTestCase):
     """Tests for ``get_children``."""
 
@@ -397,9 +423,29 @@
         api = make_api()
         self.patch(ucsm, 'get_servers').return_value = servers
         self.patch(ucsm, 'get_macs').return_value = [mac]
+        self.patch(ucsm, 'probe_lan_boot_options').return_value = ['option']
         server_list = probe_servers(api)
         self.assertEqual([(servers[0], [mac])], server_list)
 
+    def test_no_results_with_no_server_macs(self):
+        servers = [{'uuid': factory.make_UUID()}]
+        api = make_api()
+        self.patch(ucsm, 'get_servers').return_value = servers
+        self.patch(ucsm, 'get_macs').return_value = []
+        self.patch(ucsm, 'probe_lan_boot_options').return_value = ['option']
+        server_list = probe_servers(api)
+        self.assertEqual([], server_list)
+
+    def test_no_results_with_no_boot_options(self):
+        servers = [{'uuid': factory.make_UUID()}]
+        mac = 'mac'
+        api = make_api()
+        self.patch(ucsm, 'get_servers').return_value = servers
+        self.patch(ucsm, 'get_macs').return_value = mac
+        self.patch(ucsm, 'probe_lan_boot_options').return_value = []
+        server_list = probe_servers(api)
+        self.assertEqual([], server_list)
+
 
 class TestGetServerPowerControl(MAASTestCase):
     """Tests for ``get_server_power_control``."""

=== modified file 'src/provisioningserver/drivers/hardware/ucsm.py'
--- src/provisioningserver/drivers/hardware/ucsm.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/drivers/hardware/ucsm.py	2015-07-02 12:38:34 +0000
@@ -260,10 +260,29 @@
     return macs
 
 
+def probe_lan_boot_options(api, server):
+    """Probe for LAN boot options available on a server."""
+    service_profile = get_service_profile(api, server)
+    boot_profile_dn = service_profile.get('operBootPolicyName')
+    response = api.config_resolve_children(boot_profile_dn)
+    return response.xpath('//outConfigs/lsbootLan')
+
+
 def probe_servers(api):
     """Retrieve the UUID and MAC addresses for servers from the UCS Manager."""
     servers = get_servers(api)
-    server_list = [(s, get_macs(api, s)) for s in servers]
+
+    server_list = []
+    for s in servers:
+        # If the server does not have any MAC, then we don't add it.
+        if not get_macs(api, s):
+            continue
+        # If the server does not have LAN boot option (can't boot from LAN),
+        # then we don't add it.
+        if not probe_lan_boot_options(api, s):
+            continue
+        server_list.append((s, get_macs(api, s)))
+
     return server_list