BUG-4071: Cluster value fix

Change-Id: I99c488fb2416480bfd518f5f59d0abe1eb359d1b
Signed-off-by: Iveta Halanova <iveta.halanova@pantheon.sk>
(cherry-picked from d1ca3ef123903a28d89cce7fc3dcb918b662ded7)

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
index d77401d459892888a014a2c718026e4d3a701948..4afd940689a4ad01d6c2d11639654370a4d125bb 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
@@ -88,6 +88,7 @@ final class AttributeOperations {
     private final NodeIdentifier originatorIdLeaf;
     private final NodeIdentifier clusterListContainer;
     private final NodeIdentifier clusterListLeaf;
+    private final QName clusterQname;
     private final NodeIdentifier asPathContainer;
     private final NodeIdentifier asPathSegments;
     private final NodeIdentifier asPathChoice;
@@ -105,7 +106,8 @@ final class AttributeOperations {
         this.asPathId = new NodeIdentifier(QName.cachedReference(QName.create(namespace, "as")));
 
         this.clusterListContainer = new NodeIdentifier(QName.cachedReference(QName.create(namespace, ClusterId.QNAME.getLocalName())));
-        this.clusterListLeaf = new NodeIdentifier(QName.cachedReference(QName.create(namespace, "cluster")));
+        this.clusterQname = QName.cachedReference(QName.create(namespace, "cluster"));
+        this.clusterListLeaf = new NodeIdentifier(this.clusterQname);
         this.clusterListPath = ImmutableList.<PathArgument>of(this.clusterListContainer, this.clusterListLeaf);
         this.originatorIdContainer = new NodeIdentifier(QName.cachedReference(QName.create(namespace, OriginatorId.QNAME.getLocalName())));
         this.originatorIdLeaf = new NodeIdentifier(QName.cachedReference(QName.create(namespace, "originator")));
@@ -215,7 +217,7 @@ final class AttributeOperations {
         clb.withNodeIdentifier(this.clusterListLeaf);
 
         // prepend local CLUSTER_ID
-        clb.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(ClusterId.QNAME, clusterId)).withValue(clusterId).build());
+        clb.withChild(Builders.leafSetEntryBuilder().withNodeIdentifier(new NodeWithValue(this.clusterQname, clusterId.getValue())).withValue(clusterId.getValue()).build());
 
         // if there was a CLUSTER_LIST attribute, add all other entries
         final Optional<NormalizedNode<?, ?>> maybeClusterList = NormalizedNodes.findNode(attributes, this.clusterListPath);