From ef24a1202f9404822662b4dab17b0cf356f8374f Mon Sep 17 00:00:00 2001 From: Harman Singh Date: Mon, 18 May 2015 11:10:23 -0700 Subject: [PATCH] Bug 3258 : Changed the order of condition for OrderedMap and MapNode, same for OrderedLeafSet and LeafSet Added a test to validate it works for OrderedMap Change-Id: Ifb0375d47668fcc36d824fb33a8b4684e89dccc8 Signed-off-by: Harman Singh --- .../node/utils/serialization/NormalizedNodeType.java | 8 ++++---- .../controller/cluster/datastore/util/TestModel.java | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java index b7460e8acf..01e56e89d4 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java @@ -50,18 +50,18 @@ public enum NormalizedNodeType { return MAP_ENTRY_NODE_TYPE; } else if(node instanceof ContainerNode){ return CONTAINER_NODE_TYPE; - } else if(node instanceof MapNode){ - return MAP_NODE_TYPE; } else if(node instanceof AugmentationNode){ return AUGMENTATION_NODE_TYPE; - } else if(node instanceof LeafSetNode){ - return LEAF_SET_NODE_TYPE; } else if(node instanceof ChoiceNode){ return CHOICE_NODE_TYPE; } else if(node instanceof OrderedLeafSetNode){ return ORDERED_LEAF_SET_NODE_TYPE; } else if(node instanceof OrderedMapNode){ return ORDERED_MAP_NODE_TYPE; + } else if(node instanceof MapNode){ + return MAP_NODE_TYPE; + } else if(node instanceof LeafSetNode){ + return LEAF_SET_NODE_TYPE; } else if(node instanceof UnkeyedListNode){ return UNKEYED_LIST_NODE_TYPE; } else if(node instanceof UnkeyedListEntryNode){ diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java index aa1cfc6cd8..d27d650ea3 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java @@ -13,6 +13,8 @@ package org.opendaylight.controller.cluster.datastore.util; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapEntry; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapEntryBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapNodeBuilder; + +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.io.InputStream; import java.math.BigDecimal; @@ -342,6 +344,9 @@ public class TestModel { .withChild(Builders.choiceBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CHOICE_QNAME)) .withChild(ImmutableNodes.leafNode(DESC_QNAME, LONG_ID)).build()) + .withChild(Builders.orderedMapBuilder(). + withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(DESC_QNAME)). + withValue(ImmutableList.builder().add(augMapEntry).build()).build()) // .withChild(augmentationNode) .withChild(shoes) .withChild(numbers) -- 2.36.6