CA-161767: Choose the latest xs-tools.iso if there is multiple choices

The earlier version of the sorting mechanism was not able to de-prioritize
release-less xs-tools.iso. This led to exceptions during config drive
creation, when the chosen tools did not include support for CoreOS.

Signed-off-by: Robert Breker <[email protected]>

Author: Robert Breker

src/xscontainer/coreos.py

@@ -3,7 +3,6 @@
 from xscontainer.util import log
 from xscontainer.docker_monitor import api as docker_monitor_api
 
-import distutils.version
 import glob
 import os
 import random
@@ -141,12 +140,23 @@ def get_config_drive_default(session):
 
 def find_latest_tools_iso_path():
     tools_iso_paths = glob.glob(XS_TOOLS_ISO_PATH)
-    if len(tools_iso_paths) < 1:
+    if len(tools_iso_paths) == 0:
         raise util.XSContainerException("Can't locate XS tools in %s."
                                         % (XS_TOOLS_ISO_PATH))
-    tools_iso_paths.sort(key=distutils.version.LooseVersion)
-    tools_iso_path = tools_iso_paths[-1]
-    return tools_iso_path
+    elif len(tools_iso_paths) == 1:
+        return tools_iso_paths[0]
+    else:
+        # Let's first loose the xs-tools.iso without a release
+        tools_iso_path_wo_releaseless = []
+        for path in tools_iso_paths:
+            basename = os.path.basename(path)
+            if basename.count("-") != 2:
+                tools_iso_path_wo_releaseless.append(path)
+        # Then sort the remaining
+        tools_iso_path_wo_releaseless.sort(
+            key=lambda s: map(str, re.split('[.-]', s)))
+        # And return the last number out of the sorted list
+        return tools_iso_path_wo_releaseless[-1]
 
 
 def create_config_drive_iso(session, userdata, vmuuid):

src/xscontainer/tests/coreos_tests.py

@@ -0,0 +1,27 @@
+from mock import MagicMock, patch, call
+import pprint
+import unittest
+
+from xscontainer import coreos
+from xscontainer import util
+
+
+class TestFindLatestToolsIsoPath(unittest.TestCase):
+
+    @patch("glob.glob")
+    def test_cannot_find_tools(self, m_glob):
+        m_glob.return_value = []
+
+        self.assertRaises(util.XSContainerException,
+                          coreos.find_latest_tools_iso_path)
+
+    @patch("glob.glob")
+    def test_can_find_right_tools(self, m_glob):
+        m_glob.return_value = [
+            '/opt/xensource/packages/iso/xs-tools-6.5.0.iso',
+            '/opt/xensource/packages/iso/xs-tools-6.5.0-2001.iso',
+            '/opt/xensource/packages/iso/xs-tools-6.5.0-1001.iso']
+
+        tools_path = coreos.find_latest_tools_iso_path()
+
+        self.assertEquals(tools_path, m_glob.return_value[1])