Use addresses as identifiers and set type to router

README.md

@@ -12,7 +12,7 @@ The data should be a JSON object with a anonymous top-level object and "route" a
 
 "device" must contain at least one device that is reachable. A router is commonly used as the only object for the network as it is necessary in most setups.
 
-Every device should contain the CRXN IPv6 address, along the optional list of services as "service".
+Every device can contain the type of the device (router, generic, server), along with the list of services as "service". When no type is defined, generic is assumed.
 
 Services must have a type (eg. tcp, udp, http, rsync, git) and at least one endpoint in the endpoints list.
 
@@ -30,13 +30,12 @@ Here's a example that you may modify to your needs.
     "fdaa:bbcc:ddee::/48": {
       "description": "My home network",
       "device": [
-        "router": {
+        "fdaa:bbcc:ddee::1": {
+          "type": "router",
           "description": "My custom router running BIRD",
-          "address": "fdaa:bbcc:ddee::1"
         },
-        "mail": {
+        "fdaa:bbcc:ddee::5": {
           "description": "Electronic mail endpoint",
-          "address": "fdaa:bbcc:ddee::5",
           "service": [
             {
               "type": "smtp",
@@ -63,7 +62,9 @@ Here's a example that you may modify to your needs.
     },
     "fdcc:ba11:b00b::/48": {
       "device": [
-        "router": "fdcc:ba11:b00b::1"
+        "fdcc:ba11:b00b::1": {
+          "type": "router",
+        }
       ]
     }
   ]

deavmi.json

@@ -3,11 +3,11 @@
 		"fdd2:cbf2:61bd::/48": {
 			"description": "deavmi.home.network1",
 			"device": [
-				"router": {
-					"address": "fdd2:cbf2:61bd::1"
+				"fdd2:cbf2:61bd::1": {
+					"type": "router"
 				},
-				"webserver": {
-					"address": "fdd2:cbf2:61bd::2",
+				"fdd2:cbf2:61bd::2": {
+					"type": "server",
 					"service": [
 						{
 							"description": "Personal webserver",
@@ -30,19 +30,25 @@
 		"fda2:a9b0:a02b::/48": {
 			"description": "deavmi.home.network2",
 			"device": [
-				"router": "fda2:a9b0:a02b::1"
+				"fda2:a9b0:a02b::1": {
+					"type": "router"
+				}
 			]
 		},
 		"fd08:8441:e254::/48": {
 			"description": "deavmi.community.network1",
 			"device": [
-				"router": "fd08:8441:e254::1"
+				"fd08:8441:e254::1": {
+					"type": "router"
+				}
 			]
 		},
 		"fd1d:370c:38ee::/48": {
 			"description": "deavmi.community.network2",
 			"device": [
-				"router": "fd1d:370c:38ee::1"
+				"fd1d:370c:38ee::1": {
+					"type": "router"
+				}
 			]
 		}
 	]

minus.json

@@ -3,8 +3,8 @@
 		"fdcf:25b5:8c10::/48": {
 			"description": "minus.home.network",
 			"device": [
-				"router": {
-					"address": "fdcf:25b5:8c10::1"
+				"fdcf:25b5:8c10::1": {
+					"type": "router"
 				}
 			]
 		}

rany.json

@@ -3,16 +3,16 @@
 		"fdfb:1a20:a9bf::/48": {
 			"description": "rany.server.network1",
 			"device": [
-				"router": {
-					"address": "fdfb:1a20:a9bf::1"
+				"fdfb:1a20:a9bf::1": {
+					"type": "router"
 				}
 			]
 		},
 		"2a04:5b81:2055::/48": {
 			"description": "rany.server.network2",
 			"device": [
-				"router": {
-					"address": "2a04:5b81:2055::1"
+				"2a04:5b81:2055::1": {
+					"type": "router"
 				}
 			]
 		}

rnb.json

@@ -3,11 +3,10 @@
 		"fd66:7afc:576::/48": {
 			"description": "rnb.home.network",
 			"device": [
-				"router": {
-					"address": "fd66:7afc:576::1"
+				"fd66:7afc:576::1": {
+					"type": "router"
 				},
-				"irc-server": {
-					"address": "fd66:7afc:576::2",
+				"fd66:7afc:576::2": {
 					"service": [
 						{
 							"description": "BNET IRC server",

starland.json

@@ -3,13 +3,17 @@
 		"fd9a:1111:98cc::/48": {
 			"description": "starland.galactic.network",
 			"device": [
-				"router": "fd9a:1111:98cc::1"
+				"fd9a:1111:98cc::1": {
+					"type": "router"
+				}
 			]
 		},
 		"fd7e:33d3:de22::/48": {
 			"description": "starland.solar.network",
 			"device": [
-				"router": "fd7e:33d3:de22::1"
+				"fd7e:33d3:de22::1": {
+					"type": "router"
+				}
 			]
 		}
 	]

thooms.json

@@ -3,7 +3,9 @@
 		"fdd3:5d24:69d3::/48": {
 			"description": "thooms@v17",
 			"device": [
-				"router": "fdd3:5d24:69d3::1"
+				"fdd3:5d24:69d3::1": {
+					"type": "router"
+				}
 			]
 		}
 	]