Adding support for adjacency label configuration, auto-generation
and publication
Change-Id: I9e5195c99299c7457230d71dad7002d15bf62bf9
diff --git a/conf/onos.properties b/conf/onos.properties
index 60283c8..a3e1d19 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -23,5 +23,4 @@
# Uncomment and list all the ZooKeeper instances after localhost on multi-instance deployment.
#net.onrc.onos.core.registry.ZookeeperRegistry.connectionString = localhost:2181,otherhost:2181
# Specify a network configuration file to be used by the NetworkConfigManager
-net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr-ecmp10.conf
-
+net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr-ecmp.conf
diff --git a/conf/sr-3node.conf b/conf/sr-3node.conf
index 19eeff5..8d0a25b 100644
--- a/conf/sr-3node.conf
+++ b/conf/sr-3node.conf
@@ -11,10 +11,6 @@
"routerMac": "00:00:01:01:01:80",
"nodeSid": 101,
"isEdgeRouter" : true,
- "adjacencySids": [
- { "portNo": 6, "adjSid": 10234 },
- { "portNo": 7, "adjSid": 29019 }
- ],
"subnets": [
{ "portNo": 1, "subnetIp": "10.0.1.128/24" },
{ "portNo": 2, "subnetIp": "10.0.1.128/24" },
@@ -30,12 +26,7 @@
"params": { "routerIp": "192.168.0.2/32",
"routerMac": "00:00:02:02:02:80",
"nodeSid": 102,
- "isEdgeRouter" : false,
- "adjacencySids": [
- { "portNo": 1, "adjSid": 12453 },
- { "portNo": 2, "adjSid": 23333 },
- { "portNo": 3, "adjSid": 22233 }
- ]
+ "isEdgeRouter" : false
}
},
@@ -45,9 +36,6 @@
"routerMac": "00:00:07:07:07:80",
"nodeSid": 103,
"isEdgeRouter" : true,
- "adjacencySids": [
- { "portNo": 2, "adjSid": 92033 }
- ],
"subnets": [
{ "portNo": 1, "subnetIp": "7.7.7.128/24" }
]
diff --git a/conf/sr-ecmp.conf b/conf/sr-ecmp.conf
index a6c2d79..7c2c812 100644
--- a/conf/sr-ecmp.conf
+++ b/conf/sr-ecmp.conf
@@ -1,5 +1,5 @@
{
- "comment": " Multilayer topology description and configuration",
+ "comment": " Fist topology 1 - [2,3] - [5,4] - 6",
"restrictSwitches": true,
"restrictLinks": true,
@@ -11,10 +11,6 @@
"routerMac": "00:00:01:01:01:80",
"nodeSid": 101,
"isEdgeRouter" : true,
- "adjacencySids": [
- { "portNo": 6, "adjSid": 10234 },
- { "portNo": 7, "adjSid": 29019 }
- ],
"subnets": [
{ "portNo": 1, "subnetIp": "10.0.1.128/24" }
]
@@ -28,9 +24,7 @@
"nodeSid": 102,
"isEdgeRouter" : false,
"adjacencySids": [
- { "portNo": 1, "adjSid": 12453 },
- { "portNo": 2, "adjSid": 23333 },
- { "portNo": 3, "adjSid": 22233 }
+ { "adjSid": 12453 , "ports": [ 2 ,3 ] }
]
}
},
@@ -40,10 +34,7 @@
"params": { "routerIp": "192.168.0.3/32",
"routerMac": "00:00:03:03:03:80",
"nodeSid": 103,
- "isEdgeRouter" : false,
- "adjacencySids": [
- { "portNo": 2, "adjSid": 92033 }
- ]
+ "isEdgeRouter" : false
}
},
@@ -52,10 +43,7 @@
"params": { "routerIp": "192.168.0.4/32",
"routerMac": "00:00:04:04:04:80",
"nodeSid": 104,
- "isEdgeRouter" : false,
- "adjacencySids": [
- { "portNo": 2, "adjSid": 92033 }
- ]
+ "isEdgeRouter" : false
}
},
@@ -64,10 +52,7 @@
"params": { "routerIp": "192.168.0.5/32",
"routerMac": "00:00:05:05:05:80",
"nodeSid": 105,
- "isEdgeRouter" : false,
- "adjacencySids": [
- { "portNo": 2, "adjSid": 92033 }
- ]
+ "isEdgeRouter" : false
}
},
@@ -77,9 +62,6 @@
"routerMac": "00:00:07:07:07:80",
"nodeSid": 106,
"isEdgeRouter" : true,
- "adjacencySids": [
- { "portNo": 2, "adjSid": 92033 }
- ],
"subnets": [
{ "portNo": 1, "subnetIp": "7.7.7.128/24" }
]