- // FIXME: Also II should be updated unwrap result from augmentation and choice nodes on PUT
- if (!isPost()) {
- while (partialResult instanceof AugmentationNode || partialResult instanceof ChoiceNode) {
- final Object childNode = ((DataContainerNode) partialResult).getValue().iterator().next();
- partialResult = (NormalizedNode<?, ?>) childNode;
+ if (isPost()) {
+ while (result instanceof AugmentationNode || result instanceof ChoiceNode) {
+ final Object childNode = ((DataContainerNode) result).getValue().iterator().next();
+ iiToDataList.add(result.getIdentifier());
+ result = (NormalizedNode<?, ?>) childNode;
+ }
+ if (result instanceof MapEntryNode) {
+ iiToDataList.add(new YangInstanceIdentifier.NodeIdentifier(result.getNodeType()));
+ iiToDataList.add(result.getIdentifier());
+ } else {
+ iiToDataList.add(result.getIdentifier());