mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 18:32:28 +02:00
Code Issues Projects Releases Wiki Activity

Fixed decode of YANG presence container with YCH

Browse Source 
Change-Id: I3bd323dcdc84771da310ebb19d1573f7cf5252ba
This commit is contained in:
Sean Condon 2017-02-26 16:40:03 +00:00 committed by Thomas Vachuska
parent c7eb0d0777
commit fe6cebadeb
9 changed files with 267 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/yms/api/src/main/java/org/onosproject/yms/ydt/YdtBuilder.java
View File

@ -198,6 +198,18 @@ public interface YdtBuilder extends Ydt {
void addLeaf(String name, String namespace, Set<String> valueSet)
throws IllegalArgumentException;
/**
* Adds a child node or leaf node based on schema.
*
* @param name name of child/leaf to be added
* @param namespace namespace of child/leaf to be added, if it's null, parent's
* namespace will be applied to child
* @throws IllegalArgumentException when method has been passed an illegal
* or inappropriate argument.
*/
void addNode(String name, String namespace)
throws IllegalArgumentException;
/**
* Adds an instance of a child list node, or adds a child leaf list with
* multiple instance.

19
apps/yms/app/src/main/java/org/onosproject/yms/app/ych/defaultcodecs/xml/XmlCodecListener.java
View File

@ -73,8 +73,8 @@ class XmlCodecListener implements XmlListener {
/*
* When new module has to be added, and if curnode has reference of
* previous module, then we need to traverse back to parent(logical root
* node).
* previous module, then we need to traverse back to parent(logical
* root node).
*/
if (ydtExtBuilder.getRootNode() == ydtExtBuilder.getCurNode()
.getParent() && prevNodeNamespace != null &&
@ -82,11 +82,15 @@ class XmlCodecListener implements XmlListener {
ydtExtBuilder.traverseToParent();
}
if (nodeType == OBJECT_NODE && element.content() == null || element
.content().isEmpty()) {
nodeType = TEXT_NODE;
}
if (nodeType == OBJECT_NODE) {
if (nodeType == OBJECT_NODE &&
(element.content() == null || element.content().isEmpty())) {
if (ydtExtBuilder != null) {
if (ydtExtBuilder.getCurNode() == ydtExtBuilder.getRootNode()) {
ydtExtBuilder.addChild(null, nameSpace, opType);
}
ydtExtBuilder.addNode(element.getName(), nameSpace);
}
} else if (nodeType == OBJECT_NODE) {
if (ydtExtBuilder != null) {
if (ydtExtBuilder.getCurNode() == ydtExtBuilder.getRootNode()) {
ydtExtBuilder.addChild(null, nameSpace, opType);
@ -94,7 +98,6 @@ class XmlCodecListener implements XmlListener {
ydtExtBuilder.addChild(element.getName(), nameSpace, opType);
}
} else if (nodeType == TEXT_NODE) {
if (ydtExtBuilder != null) {
if (ydtExtBuilder.getCurNode() == ydtExtBuilder.getRootNode()) {
ydtExtBuilder.addChild(null, nameSpace, opType);

6
apps/yms/app/src/main/java/org/onosproject/yms/app/ydt/RequestedCallType.java
View File

@ -35,5 +35,9 @@ enum RequestedCallType {
* Requested Node is of type multi instance leaf/node.
*/
MULTI_INSTANCE,
}
/**
* Requested Node is of type container but is empty.
*/
EMPTY_CONTAINER,
}

8
apps/yms/app/src/main/java/org/onosproject/yms/app/ydt/YangRequestWorkBench.java
View File

@ -522,6 +522,14 @@ public class YangRequestWorkBench implements YdtExtendedBuilder {
addLeaf(name, namespace, null, valueSet, MULTI_INSTANCE_LEAF);
}
@Override
public void addNode(String name, String namespace)
throws IllegalArgumentException {
addChild(name, namespace, RequestedCardinality.UNKNOWN,
null, RequestedCallType.EMPTY_CONTAINER);
}
/**
* Adds a last leaf with list of values/single value to YANG data tree.
* This method is used by all protocols which knows the nature

13
apps/yms/app/src/main/java/org/onosproject/yms/app/ydt/YdtNodeFactory.java
View File

@ -186,6 +186,19 @@ final class YdtNodeFactory {
throw new YdtException(E_MULTI_INS);
}
case EMPTY_CONTAINER:
switch (nodeType) {
case YANG_SINGLE_INSTANCE_NODE:
return new YdtSingleInstanceNode(node);
case YANG_SINGLE_INSTANCE_LEAF_NODE:
return new YdtSingleInstanceLeafNode(node);
default:
return null;
}
default:
return null;
}

213
apps/yms/ut/src/test/java/org/onosproject/yms/app/ych/DefaultYangCodecHandlerTest.java
View File

@ -16,6 +16,23 @@
package org.onosproject.yms.app.ych;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.onosproject.yms.ych.YangProtocolEncodingFormat.XML;
import static org.onosproject.yms.ydt.YmsOperationType.QUERY_CONFIG_REQUEST;
import static org.onosproject.yms.ydt.YmsOperationType.QUERY_REQUEST;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.onosproject.yang.gen.v1.ych.combined.rev20160524.CombinedOpParam;
import org.onosproject.yang.gen.v1.ych.combined.rev20160524.combined.AsNum;
@ -45,10 +62,11 @@ import org.onosproject.yang.gen.v1.ych.combined.rev20160524.combined.attributes.
import org.onosproject.yang.gen.v1.ych.combined.rev20160524.combined.attributes.bgpparameters.optionalcapabilities.cparameters.DefaultAs4BytesCapability;
import org.onosproject.yang.gen.v1.ych.empty.container.rev20160524.EmptyContainerOpParam;
import org.onosproject.yang.gen.v1.ych.empty.container.rev20160524.emptycontainer.EmptyContainer;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.YchPurchasingsupervisor.OnosYangOpType;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.YchPurchasingsupervisorOpParam;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.ychpurchasingsupervisor.DefaultYchPurchasingSupervisor;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.ychpurchasingsupervisor.YchPurchasingSupervisor;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.YchPurchasingsupervisor.OnosYangOpType;
import org.onosproject.yang.gen.v1.ych.purchasing.supervisor.rev20160524.ychpurchasingsupervisor.ychpurchasingsupervisor.DefaultYchIsManager;
import org.onosproject.yang.gen.v1.ydt.customs.supervisor.rev20160524.CustomssupervisorOpParam;
import org.onosproject.yang.gen.v1.ydt.material.supervisor.rev20160524.MaterialsupervisorOpParam;
import org.onosproject.yang.gen.v1.ydt.material.supervisor.rev20160524.materialsupervisor.DefaultSupervisor;
@ -61,21 +79,6 @@ import org.onosproject.yms.app.ysr.DefaultYangSchemaRegistry;
import org.onosproject.yms.app.ysr.TestYangSchemaNodeProvider;
import org.onosproject.yms.ych.YangCompositeEncoding;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.onosproject.yms.ych.YangProtocolEncodingFormat.XML;
import static org.onosproject.yms.ydt.YmsOperationType.QUERY_CONFIG_REQUEST;
import static org.onosproject.yms.ydt.YmsOperationType.QUERY_REQUEST;
/**
* Unit test case for default codec handler.
*/
@ -87,6 +90,7 @@ public class DefaultYangCodecHandlerTest {
private static final String EMPTY_CONTAINER = "EmptyContainerOpParam";
private static final String LOGISTIC_MOD = "LogisticsManagerOpParam";
private static final String MERCHA_MOD = "MerchandisersupervisorOpParam";
private static final String PURCH_MOD = "YchPurchasingsupervisorOpParam";
/**
* Returns the xml string for customssupervisor module.
@ -100,6 +104,19 @@ public class DefaultYangCodecHandlerTest {
"</filter>";
}
/**
* Returns the xml string for purchasesupervisor with empty selection node.
*
* @return the xml string for purchasesupervisor with empty selection node
*/
private static String purchaseXmlEmptySelectionNode() {
return "<filter xmlns=\"ydt.filter-type\" type=\"subtree\">" +
"<ych-purchasing-supervisor xmlns=\"ych.purchasing-supervisor\">" +
"<ych-purchasing-specialist/>" +
"</ych-purchasing-supervisor>" +
"</filter>";
}
/**
* Returns the xml string for merchandisersupervisor module.
*
@ -242,10 +259,47 @@ public class DefaultYangCodecHandlerTest {
"<ych-purchasing-specialist>purchasingSpecialist" +
"</ych-purchasing-specialist>" +
"<ych-purchasing-support>support</ych-purchasing-support>" +
"<ych-is-manager/>" +
"</ych-purchasing-supervisor>" +
"</config>";
}
/**
* Returns the xml string for ych-purchasingsupervisor module with BitSet options.
*
* @return the XML string for ych-purchasingsupervisor module
*/
private static String purchaseXmlOptions(BitSet options) {
boolean isFirst = true;
StringBuffer sb = new StringBuffer();
sb.append("<config xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
sb.append("xmlns:nc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">");
sb.append("<ych-purchasing-supervisor xmlns=\"ych.purchasing-supervisor\" " +
"nc:operation=\"create\">");
sb.append("<ych-purchasing-support>support</ych-purchasing-support>");
if (options == null || options.isEmpty()) {
sb.append("<ych-purchasing-options/>");
} else {
sb.append("<ych-purchasing-options>");
for (int i = 0; i < 4; i++) {
if (options.get(i)) {
if (isFirst) {
isFirst = false;
} else {
sb.append(' ');
}
sb.append("option" + i);
}
}
sb.append("</ych-purchasing-options>");
}
sb.append("</ych-purchasing-supervisor>");
sb.append("</config>");
return sb.toString();
}
/**
* Returns the xml string for employeeid module.
*
@ -815,6 +869,7 @@ public class DefaultYangCodecHandlerTest {
.YchPurchasingSupervisorBuilder()
.ychPurchasingSpecialist("purchasingSpecialist")
.ychPurchasingSupport("support")
.ychIsManager(DefaultYchIsManager.builder().build())
.yangYchPurchasingSupervisorOpType(OnosYangOpType.CREATE).build();
Object object = YchPurchasingsupervisorOpParam.builder()
.ychPurchasingSupervisor(supervisor).build();
@ -1420,4 +1475,130 @@ public class DefaultYangCodecHandlerTest {
XML, null);
processMerchandiserObj(objectList);
}
@Test
public void proceessCodecDecodeFunctionForPresenceContainer() {
testYangSchemaNodeProvider.processSchemaRegistry(null);
DefaultYangSchemaRegistry schemaRegistry =
testYangSchemaNodeProvider.getDefaultYangSchemaRegistry();
YangCodecRegistry.initializeDefaultCodec();
DefaultYangCodecHandler defaultYangCodecHandler =
new DefaultYangCodecHandler(schemaRegistry);
// Verify the received object list
List<Object> objectList = defaultYangCodecHandler.decode(purchaseXml(),
XML, null);
assertNotNull(objectList);
Iterator<Object> iterator = objectList.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object.getClass().getSimpleName().equals(PURCH_MOD)) {
YchPurchasingsupervisorOpParam purchasingsupervisorOpParam =
(YchPurchasingsupervisorOpParam) object;
assertEquals(AM_OBJ + "purchasing-specialist: leaf value", "purchasingSpecialist",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingSpecialist());
assertEquals(AM_OBJ + "purchasing-support: leaf value", "support",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingSupport());
assertNotNull(AM_OBJ + "purchasing-manager: leaf value",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychIsManager());
} else {
assertEquals(AM_OBJ, PURCH_MOD, object.getClass().getSimpleName());
}
}
}
@Test
public void proceessCodecDecodeFunctionForSelectionNode() {
testYangSchemaNodeProvider.processSchemaRegistry(null);
DefaultYangSchemaRegistry schemaRegistry =
testYangSchemaNodeProvider.getDefaultYangSchemaRegistry();
YangCodecRegistry.initializeDefaultCodec();
DefaultYangCodecHandler defaultYangCodecHandler =
new DefaultYangCodecHandler(schemaRegistry);
// Verify the received object list
List<Object> objectList = defaultYangCodecHandler.decode(
purchaseXmlEmptySelectionNode(), XML, null);
assertNotNull(objectList);
Iterator<Object> iterator = objectList.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object.getClass().getSimpleName().equals(PURCH_MOD)) {
YchPurchasingsupervisorOpParam purchasingsupervisorOpParam =
(YchPurchasingsupervisorOpParam) object;
assertNull(AM_OBJ + "purchasing-specialist: leaf value not empty",
purchasingsupervisorOpParam.
ychPurchasingSupervisor().ychPurchasingSpecialist());
} else {
assertEquals(AM_OBJ, PURCH_MOD, object.getClass().getSimpleName());
}
}
}
@Test
public void proceessCodecDecodeFunctionForBitmaskContainer() {
testYangSchemaNodeProvider.processSchemaRegistry(null);
DefaultYangSchemaRegistry schemaRegistry =
testYangSchemaNodeProvider.getDefaultYangSchemaRegistry();
YangCodecRegistry.initializeDefaultCodec();
DefaultYangCodecHandler defaultYangCodecHandler =
new DefaultYangCodecHandler(schemaRegistry);
BitSet purchaseOptions = new BitSet(4);
purchaseOptions.set(1); //option1
purchaseOptions.set(3); //option3
// Verify the received object list
List<Object> objectList = defaultYangCodecHandler.decode(
purchaseXmlOptions(purchaseOptions), XML, null);
assertNotNull(objectList);
Iterator<Object> iterator = objectList.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object.getClass().getSimpleName().equals(PURCH_MOD)) {
YchPurchasingsupervisorOpParam purchasingsupervisorOpParam =
(YchPurchasingsupervisorOpParam) object;
assertEquals(AM_OBJ + "purchasing-support: leaf value", "support",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingSupport());
assertEquals(AM_OBJ + "ych-puchasing-options: leaf value",
purchaseOptions,
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingOptions());
} else {
assertEquals(AM_OBJ, PURCH_MOD, object.getClass().getSimpleName());
}
}
}
@Test
public void proceessCodecDecodeFunctionForEmptyBitmask() {
testYangSchemaNodeProvider.processSchemaRegistry(null);
DefaultYangSchemaRegistry schemaRegistry =
testYangSchemaNodeProvider.getDefaultYangSchemaRegistry();
YangCodecRegistry.initializeDefaultCodec();
DefaultYangCodecHandler defaultYangCodecHandler =
new DefaultYangCodecHandler(schemaRegistry);
// Verify the received object list
List<Object> objectList = defaultYangCodecHandler.decode(
purchaseXmlOptions(null), XML, null);
assertNotNull(objectList);
Iterator<Object> iterator = objectList.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object.getClass().getSimpleName().equals(PURCH_MOD)) {
YchPurchasingsupervisorOpParam purchasingsupervisorOpParam =
(YchPurchasingsupervisorOpParam) object;
assertEquals(AM_OBJ + "purchasing-support: leaf value", "support",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingSupport());
assertNull(AM_OBJ + "ych-puchasing-options: leaf value empty",
purchasingsupervisorOpParam.ychPurchasingSupervisor().ychPurchasingOptions());
} else {
assertEquals(AM_OBJ, PURCH_MOD, object.getClass().getSimpleName());
}
}
}
}

2
apps/yms/ut/src/test/java/org/onosproject/yms/app/ydt/FoodArenaTest.java
View File

@ -70,7 +70,7 @@ public class FoodArenaTest {
ydtBuilder = getYdtBuilder("foodarena", "food", "ydt.food", NONE);
ydtBuilder.addChild("food", "ydt.food", DELETE);
YdtAppContext appRootNode = ydtBuilder.getAppRootNode();
assertEquals(appRootNode.getFirstChild().getOperationType(), DELETE_ONLY);
assertEquals(DELETE_ONLY, appRootNode.getFirstChild().getOperationType());
}
/**

15
apps/yms/ut/src/test/resources/ychTestResourceFiles/purchasingsupervisor.yang
View File

@ -24,5 +24,20 @@ module ych-purchasingsupervisor {
type string;
description "name of the support person";
}
leaf ych-purchasing-options {
type bits {
bit "option0";
bit "option1";
bit "option2";
bit "option3";
}
description
"A bit mask that may have 0, 1, many or all options present";
}
container ych-is-manager {
presence "If node is present denotes that supervisor is a manager";
}
}
}

5
protocols/restconf/server/utils/src/test/java/org/onosproject/protocol/restconf/server/utils/parser/api/TestYdtBuilder.java
View File

@ -182,4 +182,9 @@ public class TestYdtBuilder implements YdtBuilder {
public YdtContextOperationType getYdtDefaultOpType() {
return ydtDefaultOpType;
}
@Override
public void addNode(String name, String namespace) throws IllegalArgumentException {
addChild(name, namespace, SINGLE_INSTANCE_NODE, null);
}
}