diff --git a/inventory_provider/juniper.py b/inventory_provider/juniper.py
index 67f10a027da2c4bb8aa7aba2abad6012f6a66e49..d5d5a3c9e71eb3362918afc410d1dab9fa7b98a8 100644
--- a/inventory_provider/juniper.py
+++ b/inventory_provider/juniper.py
@@ -1,4 +1,5 @@
 import logging
+import re
 
 from jnpr.junos import Device
 from lxml import etree
@@ -294,4 +295,18 @@ def load_routers_from_junosspace(config):
             juniper_logger.error("%d.%d: %s" % (e.line, e.column, e.message))
         assert False
 
-    return True
+    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)
+        if m:
+            hostname = m.group(1) + '.geant.net'
+        else:
+            hostname = None
+        yield {
+            "OSVersion": d.xpath('./OSVersion/text()')[0],
+            "platform": d.xpath('./platform/text()')[0],
+            "address": d.xpath('./ipAddr/text()')[0],
+            "name": name,
+            "hostname": hostname
+        }
diff --git a/test/test_junosspace_io.py b/test/test_junosspace_io.py
index 39d8288987198effde8a5d4fba2c39a2b03f3e5d..7f7ad8eeaaa4793ce4078c9d4144cf3c4b4e9461 100644
--- a/test/test_junosspace_io.py
+++ b/test/test_junosspace_io.py
@@ -22,5 +22,5 @@ def test_junosspace_devices_parsing(data_config):
             url = data_config['junosspace']['api'] + '/device-management/devices',
             body=f.read())
 
-    doc = juniper.load_routers_from_junosspace(data_config['junosspace'])
-    assert doc
+    routers = juniper.load_routers_from_junosspace(data_config['junosspace'])
+    print(list(routers))