From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 30 Aug 2017 16:02:18 +0000 (+0200)
Subject: makes renderer ignore controller-config
X-Git-Tag: v0.2.0~110^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=62355873249ff1e02f9e4792a42a1b54da9445f2

makes renderer ignore controller-config

The ODL controller exposes a northbound netconf connector automatically
loaded at karaf start-up under the node-id 'controller-config'.
This connector advertises supported (openroadm) southbound capabilities
but, strictly spoken, it is not an openroadm device.
The renderer should not interact with it.

Change-Id: I366065360b9ba0d90073a9f8739a749eb78315da
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java
index 6c1388840..86700bc86 100644
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererNotificationsImpl.java
@@ -182,6 +182,11 @@ public class RendererNotificationsImpl implements DataTreeChangeListener<Node> {
                 nodeId = rootNode.getDataAfter().getKey().getNodeId().getValue();
             }
             if (nnode != null) {
+                if (nodeId.equals("controller-config")) {
+                    // We shouldn't process controller-config as an OpenROAM device
+                    LOG.info("{} ignored: org-openroadm-device advertised but not a real ROADM device", nodeId);
+                    return;
+                }
                 if (rootNode.getModificationType() == ModificationType.WRITE) {
                     LOG.info("Node added " + nodeId);
 
@@ -224,4 +229,4 @@ public class RendererNotificationsImpl implements DataTreeChangeListener<Node> {
             }
         }
     }
-}
\ No newline at end of file
+}