[ONOS-5341] Namespace modification to include module name to support RESTCONF based namespace
Change-Id: I663d7fcfaac98f9d1076e46d958557430851da87
diff --git a/plugin/src/test/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListenerTest.java b/plugin/src/test/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListenerTest.java
index 3a96361..53ed289 100644
--- a/plugin/src/test/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListenerTest.java
+++ b/plugin/src/test/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListenerTest.java
@@ -51,7 +51,8 @@
YangNode node = manager.getDataModel("src/test/resources/NamespaceInDoubleQuotes.yang");
// Checks for the version value in data model tree.
- assertThat(((YangModule) node).getNameSpace(), is("urn:ietf:params:xml:ns:yang:ietf-ospf"));
+ assertThat(((YangModule) node).getModuleNamespace(), is
+ ("urn:ietf:params:xml:ns:yang:ietf-ospf"));
}
/**
@@ -63,7 +64,7 @@
YangNode node = manager.getDataModel("src/test/resources/NamespaceWithoutQuotes.yang");
// Checks for the version value in data model tree.
- assertThat(((YangModule) node).getNameSpace(), is("urn:ietf:params:xml:ns:yang:ietf-ospf"));
+ assertThat(((YangModule) node).getModuleNamespace(), is("urn:ietf:params:xml:ns:yang:ietf-ospf"));
}
/**
diff --git a/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/SchemaNodeTest.java b/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/SchemaNodeTest.java
index a38cf12..366cefe 100644
--- a/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/SchemaNodeTest.java
+++ b/plugin/src/test/java/org/onosproject/yangutils/plugin/manager/SchemaNodeTest.java
@@ -88,14 +88,14 @@
.getNextSibling();
YangSchemaNodeIdentifier yangInputNode = new YangSchemaNodeIdentifier();
yangInputNode.setName("input");
- yangInputNode.setNameSpace("http://huawei.com");
+ yangInputNode.setNameSpace(yangRpcNode.getNameSpace());
assertThat(yangRpcNode.getChildSchema(yangInputNode).getSchemaNode(),
is(yangRpcNode.getChild()));
YangSchemaNodeIdentifier yangOutputNode = new
YangSchemaNodeIdentifier();
yangOutputNode.setName("output");
- yangOutputNode.setNameSpace("http://huawei.com");
+ yangOutputNode.setNameSpace(yangRpcNode.getNameSpace());
assertThat(yangRpcNode.getChildSchema(yangOutputNode).getSchemaNode(),
is(yangRpcNode.getChild().getNextSibling()));
@@ -104,7 +104,7 @@
YangSchemaNodeIdentifier yangInputLeafNode = new
YangSchemaNodeIdentifier();
yangInputLeafNode.setName("image-name");
- yangInputLeafNode.setNameSpace("http://huawei.com");
+ yangInputLeafNode.setNameSpace(yangRpcNode.getNameSpace());
assertThat(yangInput.getChildSchema(yangInputLeafNode),
is(notNullValue()));
@@ -112,7 +112,7 @@
YangSchemaNodeIdentifier yangOutputLeafNode = new
YangSchemaNodeIdentifier();
yangOutputLeafNode.setName("image-name");
- yangOutputLeafNode.setNameSpace("http://huawei.com");
+ yangOutputLeafNode.setNameSpace(yangRpcNode.getNameSpace());
assertThat(yangOutput.getChildSchema(yangOutputLeafNode),
is(notNullValue()));
@@ -123,7 +123,7 @@
YangSchemaNodeIdentifier yangSchemaNodeIdentifier =
new YangSchemaNodeIdentifier();
yangSchemaNodeIdentifier.setName("testcontainer");
- yangSchemaNodeIdentifier.setNameSpace("http://huawei.com");
+ yangSchemaNodeIdentifier.setNameSpace(yangRpcNode.getNameSpace());
assertThat(schemaMap.get(yangSchemaNodeIdentifier), is(notNullValue()));
YangSchemaNodeContextInfo yangSchemaNodeContextInfo =
schemaMap.get(yangSchemaNodeIdentifier);
@@ -136,12 +136,12 @@
rootNode.getChild()
.getYsnContextInfoMap();
yangSchemaNodeIdentifier.setName("testleaf");
- yangSchemaNodeIdentifier.setNameSpace("http://huawei.com");
+ yangSchemaNodeIdentifier.setNameSpace(yangRpcNode.getNameSpace());
assertThat(schemaMap2.get(yangSchemaNodeIdentifier),
is(notNullValue()));
yangSchemaNodeIdentifier.setName("pretzel");
- yangSchemaNodeIdentifier.setNameSpace("http://huawei.com");
+ yangSchemaNodeIdentifier.setNameSpace(yangRpcNode.getNameSpace());
assertThat(schemaMap2.get(yangSchemaNodeIdentifier),
is(notNullValue()));
@@ -151,7 +151,7 @@
rootNode.getChild().getChild()
.getYsnContextInfoMap();
yangSchemaNodeIdentifier.setName("pretzel");
- yangSchemaNodeIdentifier.setNameSpace("http://huawei.com");
+ yangSchemaNodeIdentifier.setNameSpace(yangRpcNode.getNameSpace());
assertThat(schemaMap3.get(yangSchemaNodeIdentifier),
is(notNullValue()));
YangSchemaNodeContextInfo yangSchemaNodeContextInfo3 =
@@ -164,7 +164,7 @@
rootNode.getChild().getChild().getChild()
.getYsnContextInfoMap();
yangSchemaNodeIdentifier.setName("pretzel");
- yangSchemaNodeIdentifier.setNameSpace("http://huawei.com");
+ yangSchemaNodeIdentifier.setNameSpace(yangRpcNode.getNameSpace());
assertThat(schemaMap4.get(yangSchemaNodeIdentifier),
is(notNullValue()));