Merge lp:~blake-rouse/maas/fix-sm15k-v2 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix SM15k v2.0 API enlistment issue.

Fixes some issues on how the python-seamicroclient returned data. This has been test on actual hardware.

Also there was weird unicode spaces in the sm15k.template, that was removed.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Gavin Panella (allenap)]

You'll need to back-port this to lp:maas/1.5 if you want to get this into Trusty; trunk has now moved on already. See existing commits to the 1.5 branch for the commit message style.

[Blake Rouse (blake-rouse)]

Already done!
On Apr 4, 2014 6:02 PM, "Gavin Panella" <email address hidden> wrote:

> You'll need to back-port this to lp:maas/1.5 if you want to get this into
> Trusty; trunk has now moved on already. See existing commits to the 1.5
> branch for the commit message style.
> --
> https://code.launchpad.net/~blake-rouse/maas/fix-sm15k-v2/+merge/214338
> You are the owner of lp:~blake-rouse/maas/fix-sm15k-v2.
>

=== modified file 'etc/maas/templates/power/sm15k.template'
--- etc/maas/templates/power/sm15k.template	2014-03-14 20:41:35 +0000
+++ etc/maas/templates/power/sm15k.template	2014-04-04 21:11:12 +0000
@@ -19,9 +19,9 @@
 # Control power using IPMI
 issue_ipmi_command() {
     ${ipmitool} -I lanplus \
-        -H ${power_address} -U ${power_user}\
-        -P ${power_pass} raw 0x2E 1 0x00 0x7d 0xab \
-        ${power_mode} 0 ${system_id}
+        -H ${power_address} -U ${power_user}\
+        -P ${power_pass} raw 0x2E 1 0x00 0x7d 0xab \
+        ${power_mode} 0 ${system_id}
 }
 
 # Control power using REST v0.9

=== modified file 'src/provisioningserver/custom_hardware/seamicro.py'
--- src/provisioningserver/custom_hardware/seamicro.py	2014-03-27 04:15:45 +0000
+++ src/provisioningserver/custom_hardware/seamicro.py	2014-04-04 21:11:12 +0000
@@ -24,8 +24,10 @@
 import urlparse
 
 import provisioningserver.custom_hardware.utils as utils
+from seamicroclient.v2 import (
+    client as seamicro_client,
+    )
 from seamicroclient import (
-    client as seamicro_client,
     exceptions as seamicro_exceptions,
     )
 
@@ -212,10 +214,10 @@
             return None
         return api
     elif version == 'v2.0':
-        url = 'http://%s' % ip
+        url = 'http://%s/v2.0' % ip
         try:
             api = seamicro_client.Client(
-                '2', auth_url=url, username=username, password=password)
+                auth_url=url, username=username, password=password)
         except seamicro_exceptions.ConnectionRefused:
             # Cannot reach using v2.0, might no be supported
             return None
@@ -240,14 +242,12 @@
                 if server['serverNIC'] == '0'
             )
         elif version == 'v2.0':
-            return (
-                (server.id, server.serverMacAddr)
-                for server in
-                api.servers.list()
-                # There are 8 network cards attached to these boxes, we only
-                # use NIC 0 for PXE booting.
-                if server.serverNIC == '0'
-            )
+            servers = []
+            for server in api.servers.list():
+                id = server.id.split('/')[0]
+                macs = [nic['macAddr'] for nic in server.nic.values()]
+                servers.append((id, macs))
+            return servers
     return None
 
 
@@ -316,6 +316,7 @@
 
 def power_control_seamicro15k_v2(ip, username, password, server_id,
                                  power_change):
+    server_id = '%s/0' % server_id
     api = get_seamicro15k_api('v2.0', ip, username, password)
     if api:
         server = api.servers.get(server_id)

=== modified file 'src/provisioningserver/custom_hardware/tests/test_seamicro.py'
--- src/provisioningserver/custom_hardware/tests/test_seamicro.py	2014-03-17 14:32:20 +0000
+++ src/provisioningserver/custom_hardware/tests/test_seamicro.py	2014-04-04 21:11:12 +0000
@@ -60,10 +60,15 @@
 
 class FakeServer(object):
 
-    def __init__(self, id, serverNIC='0'):
+    def __init__(self, id):
         self.id = id
-        self.serverNIC = serverNIC
-        self.serverMacAddr = factory.getRandomMACAddress()
+        self.nic = {}
+
+    def add_fake_nic(self, id):
+        self.nic[id] = {'macAddr': factory.getRandomMACAddress()}
+
+    def get_fake_macs(self):
+        return [nic['macAddr'] for nic in self.nic.values()]
 
 
 class FakeSeaMicroServerManager(object):
@@ -398,14 +403,16 @@
         username = factory.getRandomString()
         password = factory.getRandomString()
 
-        fake_server_0 = FakeServer('0')
-        fake_server_1 = FakeServer('1')
-        fake_server_invalid_nic = FakeServer('2', serverNIC='1')
+        fake_server_0 = FakeServer('0/0')
+        fake_server_0.add_fake_nic('0')
+        fake_server_0.add_fake_nic('1')
+        fake_server_1 = FakeServer('1/0')
+        fake_server_1.add_fake_nic('0')
+        fake_server_1.add_fake_nic('1')
         fake_client = FakeSeaMicroClient()
         fake_client.servers = FakeSeaMicroServerManager()
         fake_client.servers.servers.append(fake_server_0)
         fake_client.servers.servers.append(fake_server_1)
-        fake_client.servers.servers.append(fake_server_invalid_nic)
         mock_get_api = self.patch(
             provisioningserver.custom_hardware.seamicro,
             'get_seamicro15k_api')
@@ -422,19 +429,19 @@
             mock_create_node,
             MockCallsMatch(
                 call(
-                    fake_server_0.serverMacAddr, 'amd64', 'sm15k',
+                    fake_server_0.get_fake_macs(), 'amd64', 'sm15k',
                     {
                         'power_control': 'restapi2',
-                        'system_id': fake_server_0.id,
+                        'system_id': '0',
                         'power_address': ip,
                         'power_pass': password,
                         'power_user': username
                     }),
                 call(
-                    fake_server_1.serverMacAddr, 'amd64', 'sm15k',
+                    fake_server_1.get_fake_macs(), 'amd64', 'sm15k',
                     {
                         'power_control': 'restapi2',
-                        'system_id': fake_server_1.id,
+                        'system_id': '1',
                         'power_address': ip,
                         'power_pass': password,
                         'power_user': username
@@ -445,7 +452,7 @@
         username = factory.getRandomString()
         password = factory.getRandomString()
 
-        fake_server = FakeServer('0')
+        fake_server = FakeServer('0/0')
         fake_client = FakeSeaMicroClient()
         fake_client.servers = FakeSeaMicroServerManager()
         fake_client.servers.servers.append(fake_server)