Merge ~andreserl/maas:amt_wsmancli_version_check into maas:master

[Andres Rodriguez]

Use wsman to identify the AMT version instead of amttool.

amttool is sometimes not reliable enough to identify the version of AMT. wsman, however, is more reliable. Use this instead.

ae761c5... by Andres Rodriguez on 2018-09-11

Fix lint

[MAAS Lander (maas-lander)]

UNIT TESTS
-b amt_wsmancli_version_check lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c6e8884f993effa2b3c425dd9d252b48b936c4c3

review: Approve

[Mike Pontillo (mpontillo)]

I tested this branch with my NUCs; it seems to be working!

review: Approve

diff --git a/src/provisioningserver/drivers/power/amt.py b/src/provisioningserver/drivers/power/amt.py
index 358d174..338b8cd 100644
--- a/src/provisioningserver/drivers/power/amt.py
+++ b/src/provisioningserver/drivers/power/amt.py
@@ -352,7 +352,9 @@ class AMTPowerDriver(PowerDriver):
         # If so, we need wsman, not amttool
         env = self._get_amt_environment(power_pass)
         process = Popen(
-            ('amttool', ip_address, 'info'), stdout=PIPE, stderr=PIPE, env=env)
+            ('wsman', 'identify', '--port', '16992', '--hostname',
+             ip_address, '--username', 'admin', '--password', power_pass),
+            stdout=PIPE, stderr=PIPE, env=env)
         stdout, stderr = process.communicate()
         stdout = stdout.decode("utf-8")
         stderr = stderr.decode("utf-8")
@@ -364,7 +366,7 @@ class AMTPowerDriver(PowerDriver):
             raise PowerConnError(
                 "Unable to retrieve AMT version: %s" % stderr)
         else:
-            match = re.search("AMT version:\s*([0-9]+)", stdout)
+            match = re.search("ProductVersion>AMT\s*([0-9]+)", stdout)
             if match is None:
                 raise PowerActionError(
                     "Unable to extract AMT version from "
diff --git a/src/provisioningserver/drivers/power/tests/test_amt.py b/src/provisioningserver/drivers/power/tests/test_amt.py
index b1c0104..5e6da0f 100644
--- a/src/provisioningserver/drivers/power/tests/test_amt.py
+++ b/src/provisioningserver/drivers/power/tests/test_amt.py
@@ -52,6 +52,19 @@ Remote Control Capabilities:
 """).encode('utf-8')
 
 
+WSMAN_IDENTIFY_OUTPUT = dedent("""\
+  <a:Header/>
+  <a:Body>
+    <b:IdentifyResponse>
+      <b:ProtocolVersion>http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd</b:ProtocolVersion>
+      <b:ProductVendor>Intel(r)</b:ProductVendor>
+      <b:ProductVersion>AMT %s</b:ProductVersion>
+      <c:DASHVersion>1.0.0</c:DASHVersion>
+      <b:SecurityProfiles>
+        ...
+""").encode('utf-8')
+
+
 WSMAN_OUTPUT = dedent("""\
 ...
   <a:Body>
@@ -599,7 +612,7 @@ class TestAMTPowerDriver(MAASTestCase):
             amt_power_driver, '_get_amt_environment')
         amt_environment_mock.return_value = None
         popen_mock = self.patch_popen(return_value=(
-            AMTTOOL_OUTPUT % (b'8.1.57', b''), b'stderr'))
+            WSMAN_IDENTIFY_OUTPUT % b'8.1.57', b'stderr'))
 
         result = amt_power_driver._get_amt_command(ip_address, power_pass)
 
@@ -616,7 +629,7 @@ class TestAMTPowerDriver(MAASTestCase):
             amt_power_driver, '_get_amt_environment')
         amt_environment_mock.return_value = None
         popen_mock = self.patch_popen(return_value=(
-            AMTTOOL_OUTPUT % (b'10.0.47', b''), b'stderr'))
+            WSMAN_IDENTIFY_OUTPUT % b'10.0.47', b'stderr'))
 
         result = amt_power_driver._get_amt_command(ip_address, power_pass)