generalize router name parsing

inventory_provider/juniper.py

@@ -301,7 +301,7 @@ def load_routers_from_junosspace(config):
     for d in devices.xpath('//devices/device'):
         name = d.xpath('./name/text()')[0]
         # TODO: ask ops if this name->hostname operation is valid
-        m = re.match(r'^(.*)\.re\d+$', name)
+        m = re.match(r'^(.*?)(\.re\d+)?$', name)
         if m:
             hostname = m.group(1) + '.geant.net'
         else:

test/test_junosspace_io.py

@@ -23,4 +23,10 @@ def test_junosspace_devices_parsing(data_config):
             body=f.read())
 
     routers = juniper.load_routers_from_junosspace(data_config['junosspace'])
-    print(list(routers))
+
+    hostnames = [r['hostname'] for r in routers]
+
+    # test for .re\d+ greediness
+    assert 'mx1.ams.nl.geant.net' in hostnames
+    # test that 'qfx1.fra.de' is parsed
+    assert 'qfx1.fra.de.geant.net' in hostnames
\ No newline at end of file