NullLinkProvider has been rewritten to take a topology file.
Reference: ONOS-1214, ONOS-1033
Change-Id: Ia945e4c8555afd2d74f174e51e22e2fdf3dcb356
diff --git a/tools/package/etc/samples/linkGraph.cfg b/tools/package/etc/samples/linkGraph.cfg
new file mode 100644
index 0000000..41ce5bd
--- /dev/null
+++ b/tools/package/etc/samples/linkGraph.cfg
@@ -0,0 +1,27 @@
+# NullLinkProvider topology description (config file).
+#
+# Dot-style topology graph. Each controller's topology begins with
+#
+# graph <node ID>, followed by a list of links between braces.
+#
+# The links are either bidirectional (--) or directed (->). The directed
+# edges are used to connect together Null devices of different controllers.
+# The endpoint has the format:
+#
+# devID:port:NodeId
+#
+# The NodeId is only added if the destination is another node's device.
+#
+graph 192.168.56.20 {
+ 0:0 -- 1:0
+ 1:1 -> 0:0:192.168.56.30
+ 1:2 -- 2:0
+ 2:1 -> 1:0:192.168.56.30
+}
+graph 192.168.56.30 {
+ 0:0 -> 1:1:192.168.56.20
+ 0:1 -- 1:1
+ 1:0 -> 2:1:192.168.56.20
+ 1:2 -- 2:0
+}
+# Bugs: Comments cannot be appended to a line to be read.
diff --git a/tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
index 1c3a009..194bf03 100644
--- a/tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
+++ b/tools/package/etc/samples/org.onosproject.provider.nil.device.impl.NullDeviceProvider.cfg
@@ -2,7 +2,7 @@
# Instance-specific configurations, in this case, the number of
# devices per node.
#
-devConfigs = 192.168.97.132:5,192.168.97.131:5
+devConfigs = 192.168.56.20:3,192.168.56.30:3
#
# Number of ports per device. This is global to all devices
diff --git a/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg b/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
index dd8d323..ef72b1e 100644
--- a/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
+++ b/tools/package/etc/samples/org.onosproject.provider.nil.link.impl.NullLinkProvider.cfg
@@ -4,13 +4,13 @@
#
# If enabled, sets the time between LinkEvent generation,
-# in milliseconds.
+# in microseconds.
#
-#eventRate = 100000
-
+#eventRate = 1000000
#
-# Set order of islands to chain together, in a line.
+# If enabled, points to the full path to the topology file.
#
-neighbors = 192.168.97.132,192.168.97.131
+
+#cfgFile = /tmp/foo.cfg