fix slurm.conf inventory filtering for nodenames with padding

Author: sjpb

filter_plugins/slurm_conf.py

@@ -38,17 +38,17 @@ def hostlist_expression(hosts):
         E.g. with an inventory containing:
 
             [compute]
-            dev-foo-0 ansible_host=localhost
-            dev-foo-3 ansible_host=localhost
+            dev-foo-00 ansible_host=localhost
+            dev-foo-3  ansible_host=localhost
             my-random-host
-            dev-foo-4 ansible_host=localhost
-            dev-foo-5 ansible_host=localhost
-            dev-compute-0 ansible_host=localhost
-            dev-compute-1 ansible_host=localhost
+            dev-foo-04 ansible_host=localhost
+            dev-foo-05 ansible_host=localhost
+            dev-compute-000 ansible_host=localhost
+            dev-compute-001 ansible_host=localhost
 
         Then "{{ groups[compute] | hostlist_expression }}" will return:
             
-            ["dev-foo-[0,3-5]", "dev-compute-[0-1]", "my-random-host"]
+            ['dev-foo-[00,04-05,3]', 'dev-compute-[000-001]', 'my-random-host']
     """
 
     results = {}
@@ -57,21 +57,24 @@ def hostlist_expression(hosts):
         m = pattern.match(v)
         if m:
             prefix, suffix = m.groups()
+            print(prefix,suffix)
             r = results.setdefault(prefix, [])
-            r.append(int(suffix))
+            r.append(suffix)
         else:
             unmatchable.append(v)
     return ['{}[{}]'.format(k, _group_numbers(v)) for k, v in results.items()] + unmatchable
 
 def _group_numbers(numbers):
+    print('numbers:', sorted(numbers))
     units = []
-    prev = min(numbers)
+    prev = min(int(n) for n in numbers)
     for v in sorted(numbers):
-        if v == prev + 1:
+        if int(v) == prev + 1:
             units[-1].append(v)
         else:
             units.append([v])
-        prev = v
+        print('units:', units)
+        prev = int(v)
     return ','.join(['{}-{}'.format(u[0], u[-1]) if len(u) > 1 else str(u[0]) for u in units])
 
 def error(condition, msg):