X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-protocolbuffer-encoding%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2FNormalizedNodeToProtocolBufferNodeTest.java;h=df3e55f35616326badef894a83c20f2a63896648;hb=de3e413b633b7555ae8f3fe2ec163dbb7dda5da8;hp=69d0ac7fcc7c7af5e548b83d784424c03c96987b;hpb=b35aa25e0c3a91fc71e778d9c9393e91036246e3;p=controller.git diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNodeTest.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNodeTest.java index 69d0ac7fcc..df3e55f356 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNodeTest.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/node/NormalizedNodeToProtocolBufferNodeTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages; import org.opendaylight.controller.cluster.datastore.util.NormalizedNodeXmlConverterTest; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import java.util.Iterator; @@ -18,8 +18,8 @@ import java.util.Iterator; */ public class NormalizedNodeToProtocolBufferNodeTest { - private String instanceIdentifierToString(InstanceIdentifier id){ - Iterable iterable = id.getPathArguments(); + private String instanceIdentifierToString(YangInstanceIdentifier id){ + Iterable iterable = id.getPathArguments(); Iterator iterator = iterable.iterator(); String path=""; while (iterator.hasNext()) { @@ -31,7 +31,7 @@ public class NormalizedNodeToProtocolBufferNodeTest { @Test public void testNormalizedNodeToNodeSerialization (){ NormalizedNode nn = NormalizedNodeXmlConverterTest.augmentChoiceExpectedNode(); - InstanceIdentifier id = InstanceIdentifier.create( + YangInstanceIdentifier id = YangInstanceIdentifier.create( Lists.newArrayList(NormalizedNodeXmlConverterTest.getNodeIdentifier("container"))); NormalizedNodeToProtocolBufferNode nnn = new NormalizedNodeToProtocolBufferNode(); @@ -45,10 +45,10 @@ public class NormalizedNodeToProtocolBufferNodeTest { QName CH2_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:test", "2014-03-13", "ch2"); NormalizedNode choice = NormalizedNodeXmlConverterTest.augmentChoiceExpectedNode() - .getChild(new InstanceIdentifier.NodeIdentifier(CH2_QNAME)) + .getChild(new YangInstanceIdentifier.NodeIdentifier(CH2_QNAME)) .get(); - InstanceIdentifier id = InstanceIdentifier.create( + YangInstanceIdentifier id = YangInstanceIdentifier.create( Lists.newArrayList(NormalizedNodeXmlConverterTest.getNodeIdentifier("ch2"))); NormalizedNodeToProtocolBufferNode nnn = new NormalizedNodeToProtocolBufferNode();