Added a check in the cpqd driver to ensure that startup-config exists for
connected router, otherwise the handshake does not complete, and router is disconnected.
Change-Id: Ic01276af6e815c28d1429f3fb177b415beaea71e
diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
index 874232f..a93a730 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
@@ -1270,6 +1270,10 @@
private void assignAdjacencyLabels() {
List<AdjacencySid> autogenAdjSids = new ArrayList<AdjacencySid>();
publishAttributes = new HashMap<String, String>();
+ if (srConfig == null) {
+ log.error("Cannot obtain SegmentRouterConfig in sw {}", getStringId());
+ return; // this will cause handshake to fail
+ }
for (OFPortDesc p : getPorts()) {
int pnum = p.getPortNo().getPortNumber();