Drive members with JSON instead of text. #1410

testbed/members/Makefile

@@ -7,7 +7,7 @@ PRODUCT := output.json
 
 default: build
 
-MEMBERS := members
+MEMBERS := members.json
 
 BUILDER := ./build-addresses
 $(PRODUCT): Makefile $(BUILDER) $(MEMBERS)

testbed/members/build-addresses

@@ -9,18 +9,16 @@ import sys
 
 addresses = {}
 
-for line in sys.stdin:
-    # TODO: Remove excess whitespace and blanks
-    member = re.sub(r'\s*[#].*$', '', line[:-1])
-    if not member:
-        continue
+input_data = json.load(sys.stdin)
 
-    address, label = re.split(r'\s+', member,  maxsplit=1)
+for address, data in input_data.items():
+    if address[0] == '#':
+        continue
 
     addresses[address] = {
         'address': address,
         '_meta': {
-            'display-name': label
+            'display-name': data.get('label', address)
         }
     }
 

testbed/members/members.json

@@ -0,0 +1,16 @@
+{
+    "#":  "perfSONAR Development Testbed Hosts",
+
+    "host1.perfsonar.net": {
+	"label": "First Host"
+    },
+    "host2.perfsonar.net": {
+	"label": "Second Host"
+    },
+    "host3.perfsonar.net": {
+	"label": "Third Host"
+    },
+    "host4.perfsonar.net": {
+	"#": "No label on this one."
+    }
+}