From: Maros Marsalek Date: Wed, 27 Nov 2013 09:16:43 +0000 (+0100) Subject: Add support for configuration attributes based on yang leaves with custom types ... X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~303^2~1 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=16f2dc509f9f9429447bf9dc59c6c56cd09a7fc3 Add support for configuration attributes based on yang leaves with custom types (typedef) to netconf. Change-Id: Iefa79f99772eaa6a0974d6e7a106cd8c14dc648f Signed-off-by: Maros Marsalek --- diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java index 7490ad6084..a2238d1a13 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/TypeProviderWrapper.java @@ -11,6 +11,8 @@ import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; +import org.opendaylight.yangtools.yang.model.api.SchemaNode; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; public class TypeProviderWrapper { private final TypeProvider typeProvider; @@ -20,10 +22,15 @@ public class TypeProviderWrapper { } public Type getType(LeafSchemaNode leaf) { + TypeDefinition type = leaf.getType(); + return getType(leaf, type); + } + + public Type getType(SchemaNode leaf, TypeDefinition type) { Type javaType; try { javaType = typeProvider.javaTypeForSchemaDefinitionType( - leaf.getType(), leaf); + type, leaf); if (javaType == null) throw new IllegalArgumentException("Unknown type received for " + leaf.toString()); @@ -50,4 +57,7 @@ public class TypeProviderWrapper { return javaType; } + public String getJMXParamForBaseType(TypeDefinition baseType) { + return typeProvider.getConstructorPropertyName(baseType); + } } diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java index 5ffc192137..ba2edc4e31 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/AbstractAttribute.java @@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; public abstract class AbstractAttribute implements AttributeIfc { private final String attributeYangName, upperCaseCammelCase, lowerCaseCammelCase; - private final DataSchemaNode node; + protected final DataSchemaNode node; private static String getLocalName(DataSchemaNode attrNode) { return attrNode.getQName().getLocalName(); diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/DependencyAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/DependencyAttribute.java index b6d60e4041..1912b75e0e 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/DependencyAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/DependencyAttribute.java @@ -7,15 +7,14 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.attribute; -import javax.management.ObjectName; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; - import org.opendaylight.controller.config.yangjmxgenerator.ServiceInterfaceEntry; import org.opendaylight.yangtools.binding.generator.util.Types; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import javax.management.ObjectName; +import javax.management.openmbean.SimpleType; + public class DependencyAttribute extends AbstractAttribute implements TypedAttribute { @@ -95,7 +94,7 @@ public class DependencyAttribute extends AbstractAttribute implements } @Override - public OpenType getOpenType() { + public SimpleType getOpenType() { return SimpleType.OBJECTNAME; } diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java index 59ab0ff68e..73c7e227be 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/JavaAttribute.java @@ -11,8 +11,10 @@ import org.opendaylight.controller.config.yangjmxgenerator.TypeProviderWrapper; import org.opendaylight.yangtools.sal.binding.model.api.Type; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; +import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenDataException; import javax.management.openmbean.OpenType; import javax.management.openmbean.SimpleType; @@ -21,11 +23,15 @@ public class JavaAttribute extends AbstractAttribute implements TypedAttribute { private final Type type; private final String nullableDescription, nullableDefault; + private final TypeProviderWrapper typeProviderWrapper; + private final TypeDefinition typeDefinition; public JavaAttribute(LeafSchemaNode leaf, TypeProviderWrapper typeProviderWrapper) { super(leaf); this.type = typeProviderWrapper.getType(leaf); + this.typeDefinition = leaf.getType(); + this.typeProviderWrapper = typeProviderWrapper; this.nullableDefault = leaf.getDefault(); this.nullableDescription = leaf.getDescription(); } @@ -34,10 +40,22 @@ public class JavaAttribute extends AbstractAttribute implements TypedAttribute { TypeProviderWrapper typeProviderWrapper) { super(leaf); this.type = typeProviderWrapper.getType(leaf); + this.typeDefinition = leaf.getType(); + this.typeProviderWrapper = typeProviderWrapper; this.nullableDefault = null; this.nullableDescription = leaf.getDescription(); } + /** + * Returns the most base type + */ + private TypeDefinition getBaseType(TypeProviderWrapper typeProviderWrapper, TypeDefinition baseType) { + while(baseType.getBaseType()!=null) { + baseType = baseType.getBaseType(); + } + return baseType; + } + @Override public Type getType() { return type; @@ -98,27 +116,54 @@ public class JavaAttribute extends AbstractAttribute implements TypedAttribute { @Override public OpenType getOpenType() { - // If is array => arrayType - if (isArray(getType())) { - String innerTypeFullyQName = getInnerType(getType()); - SimpleType innerSimpleType = SimpleTypeResolver - .getSimpleType(innerTypeFullyQName); - try { - ArrayType arrayType = isPrimitive(innerTypeFullyQName) ? new ArrayType<>( - innerSimpleType, true) : new ArrayType<>(1, - innerSimpleType); - return arrayType; - } catch (OpenDataException e) { - throw new RuntimeException("Unable to create " - + ArrayType.class + " with inner element of type " - + innerSimpleType, e); - } + TypeDefinition baseTypeDefinition = getBaseType(typeProviderWrapper, typeDefinition); + Type baseType = typeProviderWrapper.getType(baseTypeDefinition, baseTypeDefinition); + + if (isArray()) { + return getArrayType(); + } else if (isDerivedType(baseType)) { + return getCompositeType(baseType, baseTypeDefinition); } - // else simple type + + return getSimpleType(); + } + + private OpenType getSimpleType() { SimpleType simpleType = SimpleTypeResolver.getSimpleType(getType()); return simpleType; } + private OpenType getCompositeType(Type baseType, TypeDefinition baseTypeDefinition) { + + SimpleType innerItemType = SimpleTypeResolver.getSimpleType(baseType); + String innerItemName = typeProviderWrapper.getJMXParamForBaseType(baseTypeDefinition); + + String[] itemNames = new String[]{innerItemName}; + String description = getNullableDescription() == null ? getAttributeYangName() : getNullableDescription(); + + OpenType[] itemTypes = new OpenType[]{innerItemType}; + try { + return new CompositeType(getUpperCaseCammelCase(), description, itemNames, itemNames, itemTypes); + } catch (OpenDataException e) { + throw new RuntimeException("Unable to create " + CompositeType.class + " with inner element of type " + + itemTypes, e); + } + + } + + private OpenType getArrayType() { + String innerTypeFullyQName = getInnerType(getType()); + SimpleType innerSimpleType = SimpleTypeResolver.getSimpleType(innerTypeFullyQName); + try { + ArrayType arrayType = isPrimitive(innerTypeFullyQName) ? new ArrayType<>(innerSimpleType, true) + : new ArrayType<>(1, innerSimpleType); + return arrayType; + } catch (OpenDataException e) { + throw new RuntimeException("Unable to create " + ArrayType.class + " with inner element of type " + + innerSimpleType, e); + } + } + // TODO verify private boolean isPrimitive(String innerTypeFullyQName) { if (innerTypeFullyQName.contains(".")) @@ -127,13 +172,17 @@ public class JavaAttribute extends AbstractAttribute implements TypedAttribute { return true; } + private boolean isArray() { + return type.getName().endsWith("[]"); + } + + private boolean isDerivedType(Type baseType) { + return baseType.equals(getType()) == false; + } + private static String getInnerType(Type type) { String fullyQualifiedName = type.getFullyQualifiedName(); return fullyQualifiedName.substring(0, fullyQualifiedName.length() - 2); } - private static boolean isArray(Type type) { - return type.getName().endsWith("[]"); - } - } diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/SimpleTypeResolver.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/SimpleTypeResolver.java index 349459a931..61ad74d7ee 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/SimpleTypeResolver.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/SimpleTypeResolver.java @@ -7,18 +7,16 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.attribute; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import org.opendaylight.yangtools.sal.binding.model.api.Type; + +import javax.management.openmbean.SimpleType; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; import java.util.Map; -import javax.management.openmbean.SimpleType; - -import org.opendaylight.yangtools.sal.binding.model.api.Type; - -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; - public class SimpleTypeResolver { public static SimpleType getSimpleType(Type type) { @@ -29,6 +27,10 @@ public class SimpleTypeResolver { return expectedSimpleType; } + public static boolean canResolve(Type type) { + return JAVA_TYPE_TO_SIMPLE_TYPE.containsKey(type.getFullyQualifiedName()); + } + public static SimpleType getSimpleType(String fullyQualifiedName) { SimpleType expectedSimpleType = JAVA_TYPE_TO_SIMPLE_TYPE .get(fullyQualifiedName); diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/TOAttribute.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/TOAttribute.java index 20029d06f9..96656338df 100644 --- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/TOAttribute.java +++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/attribute/TOAttribute.java @@ -7,15 +7,10 @@ */ package org.opendaylight.controller.config.yangjmxgenerator.attribute; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenDataException; -import javax.management.openmbean.OpenType; - +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.config.yangjmxgenerator.TypeProviderWrapper; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; @@ -26,10 +21,13 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class TOAttribute extends AbstractAttribute { @@ -59,7 +57,7 @@ public class TOAttribute extends AbstractAttribute { createInnerAttribute(dataSchemaNode, typeProviderWrapper)); } catch (IllegalArgumentException e) { - throw new IllegalStateException("Unable to create TO"); + throw new IllegalStateException("Unable to create TO", e); } } return new TOAttribute(containerSchemaNode, map, attributeNameMap, @@ -200,7 +198,7 @@ public class TOAttribute extends AbstractAttribute { } @Override - public OpenType getOpenType() { + public CompositeType getOpenType() { String description = getNullableDescription() == null ? getAttributeYangName() : getNullableDescription(); final String[] itemNames = new String[yangNameToAttributeMap.keySet() diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index b7540c8787..f8d86b28bb 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -32,13 +32,71 @@ - - org.opendaylight.yangtools yang-maven-plugin + ${opendaylight.yang.version} + + + config + + generate-sources + + + src/main/yang + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + + ${jmxGeneratorPath} + + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + + true + + + + + types + + generate-sources + + + src/main/yang/types + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + target/generated-sources/sal + + + + true + + + + + + org.opendaylight.controller + yang-jmx-generator-plugin + ${config.version} + + + + org.opendaylight.yangtools + maven-sal-api-gen-plugin + ${yangtools.binding.version} + + diff --git a/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang b/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang index 291e3ebd94..977aa6a87e 100644 --- a/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang +++ b/opendaylight/config/yang-test/src/main/yang/config-test-impl.yang @@ -7,7 +7,7 @@ module config-test-impl { import config { prefix config; revision-date 2013-04-05; } import ietf-inet-types { prefix inet; revision-date 2010-09-24;} import rpc-context { prefix rpcx; revision-date 2013-06-17; } - + import test-types { prefix tt; revision-date 2013-11-27; } description "Testing IMPL"; @@ -107,6 +107,20 @@ module config-test-impl { type string; } + leaf extended { + type tt:extend-once; + } + + leaf extended-twice { + type tt:extend-twice; + } + +/* TODO Add support for enums + + leaf extended-enum { + type tt:extend-enum; + } +*/ container dto-c { leaf simple-arg { type uint32; diff --git a/opendaylight/config/yang-test/src/main/yang/types/test-types.yang b/opendaylight/config/yang-test/src/main/yang/types/test-types.yang new file mode 100644 index 0000000000..84fbcb089d --- /dev/null +++ b/opendaylight/config/yang-test/src/main/yang/types/test-types.yang @@ -0,0 +1,26 @@ +module test-types { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:config:test:types"; + prefix "tt"; + + description + "Types generated for testing"; + + revision "2013-11-27"; + + typedef extend-once { + type uint16; + } + + typedef extend-twice { + type extend-once; + } + + typedef extend-enum { + type enumeration { + enum "ONE"; + enum "TWO"; + } + } + +} diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/AttributeIfcSwitchStatement.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/AttributeIfcSwitchStatement.java index 1ef2ae375e..4b6dcfd465 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/AttributeIfcSwitchStatement.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/AttributeIfcSwitchStatement.java @@ -14,28 +14,70 @@ import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribu import org.opendaylight.controller.config.yangjmxgenerator.attribute.ListAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; +import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; + public abstract class AttributeIfcSwitchStatement { + protected AttributeIfc lastAttribute; + public T switchAttribute(AttributeIfc attributeIfc) { + this.lastAttribute = attributeIfc; + if (attributeIfc instanceof JavaAttribute) { - return caseJavaAttribute((JavaAttribute) attributeIfc); + try { + return caseJavaAttribute(attributeIfc.getOpenType()); + } catch (UnknownOpenTypeException e) { + throw getIllegalArgumentException(attributeIfc); + } + } else if (attributeIfc instanceof DependencyAttribute) { - return caseDependencyAttribute((DependencyAttribute) attributeIfc); + return caseDependencyAttribute(((DependencyAttribute) attributeIfc).getOpenType()); } else if (attributeIfc instanceof ListAttribute) { - return caseListAttribute((ListAttribute) attributeIfc); + return caseListAttribute(((ListAttribute) attributeIfc).getOpenType()); } else if (attributeIfc instanceof TOAttribute) { - return caseTOAttribute((TOAttribute) attributeIfc); + return caseTOAttribute(((TOAttribute) attributeIfc).getOpenType()); + } + + throw getIllegalArgumentException(attributeIfc); + } + + private IllegalArgumentException getIllegalArgumentException(AttributeIfc attributeIfc) { + return new IllegalArgumentException("Unknown attribute type " + attributeIfc.getClass() + ", " + attributeIfc + + " with open type:" + attributeIfc.getOpenType()); + } + + public final T caseJavaAttribute(OpenType openType) { + if (openType instanceof SimpleType) { + return caseJavaSimpleAttribute((SimpleType) openType); + } else if (openType instanceof ArrayType) { + return caseJavaArrayAttribute((ArrayType) openType); + } else if (openType instanceof CompositeType) { + return caseJavaCompositeAttribute((CompositeType) openType); } - throw new IllegalArgumentException("Unknown attribute type " + attributeIfc.getClass() + ", " + attributeIfc); + throw new UnknownOpenTypeException("Unknown attribute open type " + openType); } - protected abstract T caseJavaAttribute(JavaAttribute attributeIfc); + protected abstract T caseJavaSimpleAttribute(SimpleType openType); + + protected abstract T caseJavaArrayAttribute(ArrayType openType); + + protected abstract T caseJavaCompositeAttribute(CompositeType openType); - protected abstract T caseDependencyAttribute(DependencyAttribute attributeIfc); + protected abstract T caseDependencyAttribute(SimpleType attributeIfc); - protected abstract T caseTOAttribute(TOAttribute attributeIfc); + protected abstract T caseTOAttribute(CompositeType openType); - protected abstract T caseListAttribute(ListAttribute attributeIfc); + protected abstract T caseListAttribute(ArrayType openType); + + + private static class UnknownOpenTypeException extends RuntimeException { + public UnknownOpenTypeException(String message) { + super(message); + } + } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AbstractAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AbstractAttributeReadingStrategy.java index 2ba1b61b80..867d94e0b7 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AbstractAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AbstractAttributeReadingStrategy.java @@ -8,27 +8,26 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; -import java.util.List; - -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.netconf.util.xml.XmlElement; -public abstract class AbstractAttributeReadingStrategy implements AttributeReadingStrategy { +import java.util.List; + +public abstract class AbstractAttributeReadingStrategy implements AttributeReadingStrategy { - private final A attributeIfc; + private final String nullableDefault; - public AbstractAttributeReadingStrategy(A attributeIfc) { - this.attributeIfc = attributeIfc; + public AbstractAttributeReadingStrategy(String nullableDefault) { + this.nullableDefault = nullableDefault; } - public A getAttributeIfc() { - return attributeIfc; + public String getNullableDefault() { + return nullableDefault; } @Override public AttributeConfigElement readElement(List configNodes) { if (configNodes.size() == 0) - return AttributeConfigElement.createNullValue(attributeIfc); + return AttributeConfigElement.createNullValue(nullableDefault); return readElementHook(configNodes); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ArrayAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ArrayAttributeReadingStrategy.java index f07e74035c..8f56961900 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ArrayAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ArrayAttributeReadingStrategy.java @@ -9,12 +9,11 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; import com.google.common.collect.Lists; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.netconf.util.xml.XmlElement; import java.util.List; -public class ArrayAttributeReadingStrategy extends AbstractAttributeReadingStrategy { +public class ArrayAttributeReadingStrategy extends AbstractAttributeReadingStrategy { private final AttributeReadingStrategy innerStrategy; @@ -22,8 +21,8 @@ public class ArrayAttributeReadingStrategy extends AbstractAttributeReadingStrat * @param attributeIfc * @param innerStrategy */ - public ArrayAttributeReadingStrategy(AttributeIfc attributeIfc, AttributeReadingStrategy innerStrategy) { - super(attributeIfc); + public ArrayAttributeReadingStrategy(String nullableDefault, AttributeReadingStrategy innerStrategy) { + super(nullableDefault); this.innerStrategy = innerStrategy; } @@ -33,7 +32,7 @@ public class ArrayAttributeReadingStrategy extends AbstractAttributeReadingStrat for (int i = 0; i < configNodes.size(); i++) { innerList.add(innerStrategy.readElement(Lists.newArrayList(configNodes.get(i))).getValue()); } - return AttributeConfigElement.create(getAttributeIfc(), innerList); + return AttributeConfigElement.create(getNullableDefault(), innerList); } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java index fa249da7f2..598935a0bc 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java @@ -8,12 +8,11 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; -import javax.management.openmbean.OpenType; - +import com.google.common.base.Optional; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.resolving.AttributeResolvingStrategy; -import com.google.common.base.Optional; +import javax.management.openmbean.OpenType; /** * Parsed xml element containing configuration for one attribute of an instance @@ -49,13 +48,23 @@ public class AttributeConfigElement { } public static AttributeConfigElement create(AttributeIfc attributeIfc, Object value) { - return new AttributeConfigElement(attributeIfc.getNullableDefault(), value); + String nullableDefault = attributeIfc.getNullableDefault(); + return create(nullableDefault, value); + } + + public static AttributeConfigElement create(String nullableDefault, Object value) { + return new AttributeConfigElement(nullableDefault, value); } public static AttributeConfigElement createNullValue(AttributeIfc attributeIfc) { return new AttributeConfigElement(attributeIfc.getNullableDefault(), null); } + public static AttributeConfigElement createNullValue(String nullableDefault) { + return new AttributeConfigElement(nullableDefault, null); + } + + public Object getValue() { return value; } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java index 1cfb74d652..fdbfb98e1c 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/CompositeAttributeReadingStrategy.java @@ -11,21 +11,19 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attri import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; import org.opendaylight.controller.netconf.util.xml.XmlElement; import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingStrategy { +public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingStrategy { private final Map innerStrategies; - public CompositeAttributeReadingStrategy(TOAttribute attributeIfc, + public CompositeAttributeReadingStrategy(String nullableDefault, Map innerStrategies) { - super(attributeIfc); + super(nullableDefault); this.innerStrategies = innerStrategies; } @@ -38,21 +36,19 @@ public class CompositeAttributeReadingStrategy extends AbstractAttributeReadingS Map innerMap = Maps.newHashMap(); - Map inner = getAttributeIfc().getYangPropertiesToTypesMap(); - List recognisedChildren = Lists.newArrayList(); - for (Entry innerAttrEntry : inner.entrySet()) { + for (Entry innerAttrEntry : innerStrategies.entrySet()) { List childItem = complexElement.getChildElementsWithSameNamespace(innerAttrEntry.getKey()); recognisedChildren.addAll(childItem); - AttributeConfigElement resolvedInner = innerStrategies.get(innerAttrEntry.getKey()).readElement(childItem); + AttributeConfigElement resolvedInner = innerAttrEntry.getValue().readElement(childItem); innerMap.put(innerAttrEntry.getKey(), resolvedInner.getValue()); } complexElement.checkUnrecognisedElements(recognisedChildren); - return AttributeConfigElement.create(getAttributeIfc(), innerMap); + return AttributeConfigElement.create(getNullableDefault(), innerMap); } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectNameAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectNameAttributeReadingStrategy.java index 59dc11f0b8..7a4ba31255 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectNameAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectNameAttributeReadingStrategy.java @@ -8,8 +8,6 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; import com.google.common.base.Preconditions; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.mapping.ObjectNameAttributeMappingStrategy; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; @@ -17,12 +15,12 @@ import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import java.util.List; import java.util.Map; -public class ObjectNameAttributeReadingStrategy extends AbstractAttributeReadingStrategy { +public class ObjectNameAttributeReadingStrategy extends AbstractAttributeReadingStrategy { private static final Object PREFIX_SEPARATOR = ":"; - public ObjectNameAttributeReadingStrategy(DependencyAttribute attributeIfc) { - super(attributeIfc); + public ObjectNameAttributeReadingStrategy(String nullableDefault) { + super(nullableDefault); } @Override @@ -33,7 +31,7 @@ public class ObjectNameAttributeReadingStrategy extends AbstractAttributeReading + " but was " + configNodes.size()); Preconditions.checkNotNull(firstChild, "Element %s should be present", firstChild); - return AttributeConfigElement.create(getAttributeIfc(), resolve(firstChild)); + return AttributeConfigElement.create(getNullableDefault(), resolve(firstChild)); } private ObjectNameAttributeMappingStrategy.MappedDependency resolve(XmlElement firstChild) { diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectXmlReader.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectXmlReader.java index 80a2555074..bc3c74a88f 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectXmlReader.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/ObjectXmlReader.java @@ -8,15 +8,15 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.ListAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.AttributeIfcSwitchStatement; import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; import java.util.Map; import java.util.Map.Entry; @@ -41,26 +41,33 @@ public class ObjectXmlReader extends AttributeIfcSwitchStatement) - return new SimpleAttributeReadingStrategy(attributeIfc); - else if (attributeIfc.getOpenType() instanceof ArrayType) { - SimpleAttributeReadingStrategy innerStrategy = new SimpleAttributeReadingStrategy( - ((ArrayType) attributeIfc.getOpenType()).getElementOpenType()); - return new ArrayAttributeReadingStrategy(attributeIfc, innerStrategy); - } - throw new IllegalStateException(JavaAttribute.class + " can only provide open type " + SimpleType.class - + " or " + ArrayType.class); + public AttributeReadingStrategy caseJavaSimpleAttribute(SimpleType openType) { + return new SimpleAttributeReadingStrategy(lastAttribute.getNullableDefault()); + } + + @Override + public AttributeReadingStrategy caseJavaArrayAttribute(ArrayType openType) { + SimpleAttributeReadingStrategy innerStrategy = new SimpleAttributeReadingStrategy(lastAttribute.getNullableDefault()); + return new ArrayAttributeReadingStrategy(lastAttribute.getNullableDefault(), innerStrategy); } @Override - protected AttributeReadingStrategy caseDependencyAttribute(DependencyAttribute attributeIfc) { - return new ObjectNameAttributeReadingStrategy(attributeIfc); + public AttributeReadingStrategy caseJavaCompositeAttribute(CompositeType openType) { + Preconditions.checkState(openType.keySet().size() == 1, "Unexpected number of elements for open type %s, should be 1", openType); + String mappingKey = openType.keySet().iterator().next(); + return new SimpleCompositeAttributeReadingStrategy(lastAttribute.getNullableDefault(), mappingKey); } @Override - protected AttributeReadingStrategy caseTOAttribute(TOAttribute attributeIfc) { - Map inner = attributeIfc.getYangPropertiesToTypesMap(); + protected AttributeReadingStrategy caseDependencyAttribute(SimpleType openType) { + return new ObjectNameAttributeReadingStrategy(lastAttribute.getNullableDefault()); + } + + @Override + protected AttributeReadingStrategy caseTOAttribute(CompositeType openType) { + Preconditions.checkState(lastAttribute instanceof TOAttribute); + Map inner = ((TOAttribute)lastAttribute).getYangPropertiesToTypesMap(); + Map innerStrategies = Maps.newHashMap(); for (Entry innerAttrEntry : inner.entrySet()) { @@ -69,14 +76,14 @@ public class ObjectXmlReader extends AttributeIfcSwitchStatement openType) { + Preconditions.checkState(lastAttribute instanceof ListAttribute); + AttributeReadingStrategy innerStrategy = prepareReadingStrategy(key, ((ListAttribute) lastAttribute).getInnerAttribute()); + return new ArrayAttributeReadingStrategy(lastAttribute.getNullableDefault(), innerStrategy); } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java index c5c287ffe2..be86a2ab6f 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java @@ -9,23 +9,14 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; import com.google.common.base.Preconditions; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.netconf.util.xml.XmlElement; -import javax.management.openmbean.OpenType; import java.util.List; -public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStrategy { +public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStrategy { - public SimpleAttributeReadingStrategy(AttributeIfc attributeIfc) { - super(attributeIfc); - } - - /** - * @param elementOpenType - */ - public SimpleAttributeReadingStrategy(OpenType elementOpenType) { - super(new AttributeIfcWrapper(elementOpenType)); + public SimpleAttributeReadingStrategy(String nullableDefault) { + super(nullableDefault); } @Override @@ -37,50 +28,11 @@ public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStra String textContent = xmlElement.getTextContent(); Preconditions.checkNotNull(textContent, "This element should contain text %s", xmlElement); - return AttributeConfigElement.create(getAttributeIfc(), textContent); + return AttributeConfigElement.create(getNullableDefault(), postprocessParsedValue(textContent)); } - /** - * Wrapper for JavaAttribute inner element attributes (in case JavaAttribute - * is array) - */ - static class AttributeIfcWrapper implements AttributeIfc { - - private final OpenType elementOpenType; - - public AttributeIfcWrapper(OpenType elementOpenType) { - this.elementOpenType = elementOpenType; - } - - @Override - public String getAttributeYangName() { - return null; - } - - @Override - public String getNullableDescription() { - return null; - } - - @Override - public String getNullableDefault() { - return null; - } - - @Override - public String getUpperCaseCammelCase() { - return null; - } - - @Override - public String getLowerCaseCammelCase() { - return null; - } - - @Override - public OpenType getOpenType() { - return elementOpenType; - } - + protected Object postprocessParsedValue(String textContent) { + return textContent; } + } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleCompositeAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleCompositeAttributeReadingStrategy.java new file mode 100644 index 0000000000..9249ac9fa8 --- /dev/null +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleCompositeAttributeReadingStrategy.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; + +import com.google.common.collect.Maps; + +import java.util.HashMap; + +public class SimpleCompositeAttributeReadingStrategy extends SimpleAttributeReadingStrategy { + + + private final String key; + + public SimpleCompositeAttributeReadingStrategy(String nullableDefault, String key) { + super(nullableDefault); + this.key = key; + } + + protected Object postprocessParsedValue(String textContent) { + HashMap map = Maps.newHashMap(); + map.put(key, textContent); + return map; + } + +} diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/mapping/ObjectMapper.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/mapping/ObjectMapper.java index 3e63b92884..853197c0b0 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/mapping/ObjectMapper.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/mapping/ObjectMapper.java @@ -8,10 +8,10 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.mapping; +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.ListAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.AttributeIfcSwitchStatement; @@ -44,6 +44,12 @@ public class ObjectMapper extends AttributeIfcSwitchStatement> prepareStrategy(AttributeIfc attributeIfc) { + + if(attributeIfc instanceof DependencyAttribute) { + serviceNameOfDepAttr = ((DependencyAttribute)attributeIfc).getDependency().getSie().getQName().getLocalName(); + namespaceOfDepAttr = ((DependencyAttribute)attributeIfc).getDependency().getSie().getQName().getNamespace().toString(); + } + return switchAttribute(attributeIfc); } @@ -56,45 +62,63 @@ public class ObjectMapper extends AttributeIfcSwitchStatement> caseJavaAttribute(JavaAttribute attributeIfc) { - - if (attributeIfc.getOpenType() instanceof SimpleType) - return new SimpleAttributeMappingStrategy((SimpleType) attributeIfc.getOpenType()); - else if (attributeIfc.getOpenType() instanceof ArrayType) { - ArrayType arrayType = (ArrayType) attributeIfc.getOpenType(); - AttributeMappingStrategy> innerStrategy = new SimpleAttributeMappingStrategy( - (SimpleType) arrayType.getElementOpenType()); - return new ArrayAttributeMappingStrategy(arrayType, innerStrategy); + protected AttributeMappingStrategy> caseJavaSimpleAttribute(SimpleType openType) { + return new SimpleAttributeMappingStrategy(openType); + } + + @Override + protected AttributeMappingStrategy> caseJavaArrayAttribute(ArrayType openType) { + + AttributeMappingStrategy> innerStrategy = new SimpleAttributeMappingStrategy( + (SimpleType) openType.getElementOpenType()); + return new ArrayAttributeMappingStrategy(openType, innerStrategy); + } + + @Override + protected AttributeMappingStrategy> caseJavaCompositeAttribute(CompositeType openType) { + Map>> innerStrategies = Maps.newHashMap(); + + Map attributeMapping = Maps.newHashMap(); + + for (String innerAttributeKey : openType.keySet()) { + + innerStrategies.put(innerAttributeKey, caseJavaAttribute(openType.getType(innerAttributeKey))); + attributeMapping.put(innerAttributeKey, innerAttributeKey); } - throw new IllegalStateException(JavaAttribute.class + " can only provide open type " + SimpleType.class - + " or " + ArrayType.class); + + return new CompositeAttributeMappingStrategy(openType, innerStrategies, attributeMapping); } + private String serviceNameOfDepAttr; + private String namespaceOfDepAttr; + @Override protected AttributeMappingStrategy> caseDependencyAttribute( - DependencyAttribute attributeIfc) { - String serviceName = attributeIfc.getDependency().getSie().getQName().getLocalName(); - String namespace = attributeIfc.getDependency().getSie().getQName().getNamespace().toString(); - return new ObjectNameAttributeMappingStrategy((SimpleType) attributeIfc.getOpenType(), dependencyTracker, - serviceName, namespace); + SimpleType openType) { + return new ObjectNameAttributeMappingStrategy(openType, dependencyTracker, + serviceNameOfDepAttr, namespaceOfDepAttr); } @Override - protected AttributeMappingStrategy> caseTOAttribute(TOAttribute attributeIfc) { + protected AttributeMappingStrategy> caseTOAttribute(CompositeType openType) { Map>> innerStrategies = Maps.newHashMap(); - for (Entry innerAttrEntry : attributeIfc.getJmxPropertiesToTypesMap().entrySet()) { + Preconditions.checkState(lastAttribute instanceof TOAttribute); + TOAttribute lastTO = (TOAttribute) lastAttribute; + + for (Entry innerAttrEntry : ((TOAttribute)lastAttribute).getJmxPropertiesToTypesMap().entrySet()) { innerStrategies.put(innerAttrEntry.getKey(), prepareStrategy(innerAttrEntry.getValue())); } - return new CompositeAttributeMappingStrategy((CompositeType) attributeIfc.getOpenType(), innerStrategies, - createJmxToYangMapping(attributeIfc)); + return new CompositeAttributeMappingStrategy(openType, innerStrategies, + createJmxToYangMapping(lastTO)); } @Override - protected AttributeMappingStrategy> caseListAttribute(ListAttribute attributeIfc) { - return new ArrayAttributeMappingStrategy(attributeIfc.getOpenType(), - prepareStrategy(attributeIfc.getInnerAttribute())); + protected AttributeMappingStrategy> caseListAttribute(ArrayType openType) { + Preconditions.checkState(lastAttribute instanceof ListAttribute); + return new ArrayAttributeMappingStrategy(openType, + prepareStrategy(((ListAttribute) lastAttribute).getInnerAttribute())); } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectResolver.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectResolver.java index 94a6947758..c321164cf6 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectResolver.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectResolver.java @@ -8,29 +8,24 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.resolving; -import java.util.Map; -import java.util.Map.Entry; - -import javax.management.openmbean.ArrayType; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.OpenType; -import javax.management.openmbean.SimpleType; - +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.ListAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.AttributeIfcSwitchStatement; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; +import java.util.Map; +import java.util.Map.Entry; public class ObjectResolver extends AttributeIfcSwitchStatement>> { private final Services serviceTracker; - private OpenType openType; public ObjectResolver(Services serviceTracker) { this.serviceTracker = serviceTracker; @@ -42,16 +37,14 @@ public class ObjectResolver extends AttributeIfcSwitchStatement attrEntry : configDefinition.entrySet()) { strategies.put(attrEntry.getKey(), - prepareStrategy(attrEntry.getValue(), attrEntry.getValue().getOpenType())); + prepareStrategy(attrEntry.getValue())); } return strategies; } - private AttributeResolvingStrategy> prepareStrategy(AttributeIfc attributeIfc, - OpenType openType) { + private AttributeResolvingStrategy> prepareStrategy(AttributeIfc attributeIfc) { - this.openType = openType; return switchAttribute(attributeIfc); } @@ -64,45 +57,56 @@ public class ObjectResolver extends AttributeIfcSwitchStatement> caseJavaAttribute(JavaAttribute attributeIfc) { - if (attributeIfc.getOpenType() instanceof SimpleType) - return new SimpleAttributeResolvingStrategy((SimpleType) openType); - else if (attributeIfc.getOpenType() instanceof ArrayType) { - ArrayType arrayType = (ArrayType) openType; - SimpleType innerType = (SimpleType) arrayType.getElementOpenType(); - AttributeResolvingStrategy> strat = new SimpleAttributeResolvingStrategy(innerType); - return new ArrayAttributeResolvingStrategy(strat, arrayType); + protected AttributeResolvingStrategy> caseJavaSimpleAttribute(SimpleType openType) { + return new SimpleAttributeResolvingStrategy(openType); + } + + @Override + protected AttributeResolvingStrategy> caseJavaArrayAttribute(ArrayType openType) { + SimpleType innerType = (SimpleType) openType.getElementOpenType(); + AttributeResolvingStrategy> strat = new SimpleAttributeResolvingStrategy(innerType); + return new ArrayAttributeResolvingStrategy(strat, openType); + } + + @Override + protected AttributeResolvingStrategy> caseJavaCompositeAttribute(CompositeType openType) { + Map>> innerMap = Maps.newHashMap(); + + Map yangToJmxMapping = Maps.newHashMap(); + for (String innerAttributeKey : openType.keySet()) { + innerMap.put(innerAttributeKey, caseJavaAttribute(openType.getType(innerAttributeKey))); + yangToJmxMapping.put(innerAttributeKey, innerAttributeKey); } - throw new IllegalStateException(JavaAttribute.class + " can only provide open type " + SimpleType.class - + " or " + ArrayType.class); + return new CompositeAttributeResolvingStrategy(innerMap, openType, yangToJmxMapping); } @Override protected AttributeResolvingStrategy> caseDependencyAttribute( - DependencyAttribute attributeIfc) { + SimpleType openType) { return new ObjectNameAttributeResolvingStrategy(serviceTracker); } @Override - protected AttributeResolvingStrategy> caseTOAttribute(TOAttribute attributeIfc) { - CompositeType compositeType = (CompositeType) openType; + protected AttributeResolvingStrategy> caseTOAttribute(CompositeType openType) { + Preconditions.checkState(lastAttribute instanceof TOAttribute); + TOAttribute toAttribute = (TOAttribute) lastAttribute; + Map>> innerMap = Maps.newHashMap(); - for (String innerName : compositeType.keySet()) { - Preconditions.checkState(attributeIfc instanceof TOAttribute, "Unexpected state, " + attributeIfc - + " should be instance of " + TOAttribute.class.getName()); - AttributeIfc innerAttributeIfc = attributeIfc.getJmxPropertiesToTypesMap().get(innerName); + + for (String innerName : openType.keySet()) { + + AttributeIfc innerAttributeIfc = toAttribute.getJmxPropertiesToTypesMap().get(innerName); innerMap.put(innerAttributeIfc.getAttributeYangName(), - prepareStrategy(innerAttributeIfc, compositeType.getType(innerName))); + prepareStrategy(innerAttributeIfc)); } - return new CompositeAttributeResolvingStrategy(innerMap, compositeType, createYangToJmxMapping(attributeIfc)); + return new CompositeAttributeResolvingStrategy(innerMap, openType, createYangToJmxMapping(toAttribute)); } @Override - protected AttributeResolvingStrategy> caseListAttribute(ListAttribute attributeIfc) { - ArrayType arrayType = (ArrayType) openType; - OpenType innerType = arrayType.getElementOpenType(); - AttributeIfc inner = attributeIfc.getInnerAttribute(); - return new ArrayAttributeResolvingStrategy(prepareStrategy(inner, innerType), arrayType); + protected AttributeResolvingStrategy> caseListAttribute(ArrayType openType) { + Preconditions.checkState(lastAttribute instanceof ListAttribute); + AttributeIfc innerAttribute = ((ListAttribute) lastAttribute).getInnerAttribute(); + return new ArrayAttributeResolvingStrategy(prepareStrategy(innerAttribute), openType); } } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/ObjectXmlWriter.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/ObjectXmlWriter.java index 4888dd029f..99e969970c 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/ObjectXmlWriter.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/ObjectXmlWriter.java @@ -11,14 +11,13 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attri import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.DependencyAttribute; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.ListAttribute; import org.opendaylight.controller.config.yangjmxgenerator.attribute.TOAttribute; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.AttributeIfcSwitchStatement; import org.w3c.dom.Document; import javax.management.openmbean.ArrayType; +import javax.management.openmbean.CompositeType; import javax.management.openmbean.SimpleType; import java.util.Map; import java.util.Map.Entry; @@ -52,28 +51,33 @@ public class ObjectXmlWriter extends AttributeIfcSwitchStatement openType) { + return new SimpleAttributeWritingStrategy(document, key); + } - if (attributeIfc.getOpenType() instanceof SimpleType) - return new SimpleAttributeWritingStrategy(document, key); - else if (attributeIfc.getOpenType() instanceof ArrayType) { - AttributeWritingStrategy innerStrategy = new SimpleAttributeWritingStrategy(document, key); - return new ArrayAttributeWritingStrategy(innerStrategy); - } - throw new IllegalStateException(JavaAttribute.class + " can only provide open type " + SimpleType.class - + " or " + ArrayType.class); + @Override + protected AttributeWritingStrategy caseJavaArrayAttribute(ArrayType openType) { + AttributeWritingStrategy innerStrategy = new SimpleAttributeWritingStrategy(document, key); + return new ArrayAttributeWritingStrategy(innerStrategy); } @Override - protected AttributeWritingStrategy caseDependencyAttribute(DependencyAttribute attributeIfc) { + protected AttributeWritingStrategy caseJavaCompositeAttribute(CompositeType openType) { + return new SimpleCompositeAttributeWritingStrategy(document, key); + } + + @Override + protected AttributeWritingStrategy caseDependencyAttribute(SimpleType openType) { return new ObjectNameAttributeWritingStrategy(document, key); } @Override - protected AttributeWritingStrategy caseTOAttribute(TOAttribute attributeIfc) { + protected AttributeWritingStrategy caseTOAttribute(CompositeType openType) { + Preconditions.checkState(lastAttribute instanceof TOAttribute); + Map innerStrats = Maps.newHashMap(); String currentKey = key; - for (Entry innerAttrEntry : attributeIfc.getYangPropertiesToTypesMap().entrySet()) { + for (Entry innerAttrEntry : ((TOAttribute) lastAttribute).getYangPropertiesToTypesMap().entrySet()) { AttributeWritingStrategy innerStrategy = prepareWritingStrategy(innerAttrEntry.getKey(), innerAttrEntry.getValue(), document); @@ -84,9 +88,11 @@ public class ObjectXmlWriter extends AttributeIfcSwitchStatement openType) { + Preconditions.checkState(lastAttribute instanceof ListAttribute); + AttributeIfc innerAttribute = ((ListAttribute) lastAttribute).getInnerAttribute(); + + AttributeWritingStrategy innerStrategy = prepareWritingStrategy(key, innerAttribute, document); return new ArrayAttributeWritingStrategy(innerStrategy); } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleAttributeWritingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleAttributeWritingStrategy.java index 514183be2f..62ff682a7f 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleAttributeWritingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleAttributeWritingStrategy.java @@ -29,10 +29,16 @@ public class SimpleAttributeWritingStrategy implements AttributeWritingStrategy @Override public void writeElement(Element parentElement, String namespace, Object value) { + value = preprocess(value); Util.checkType(value, String.class); Element innerNode = XmlUtil.createTextElement(document, key, (String) value); XmlUtil.addNamespaceAttr(innerNode, namespace); parentElement.appendChild(innerNode); } + protected Object preprocess(Object value) { + return value; + } + + } diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleCompositeAttributeWritingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleCompositeAttributeWritingStrategy.java new file mode 100644 index 0000000000..10b643f9f4 --- /dev/null +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/toxml/SimpleCompositeAttributeWritingStrategy.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.toxml; + +import com.google.common.base.Preconditions; +import org.opendaylight.controller.netconf.confignetconfconnector.util.Util; +import org.w3c.dom.Document; + +import java.util.Map; + +public class SimpleCompositeAttributeWritingStrategy extends SimpleAttributeWritingStrategy { + + /** + * @param document + * @param key + */ + public SimpleCompositeAttributeWritingStrategy(Document document, String key) { + super(document, key); + } + + protected Object preprocess(Object value) { + Util.checkType(value, Map.class); + Preconditions.checkArgument(((Map)value).size() == 1, "Unexpected number of values in %s, expected 1", value); + return ((Map)value).values().iterator().next(); + } + +} diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java index 101af48a89..1fca16433a 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfig.java @@ -193,7 +193,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { } catch (IllegalStateException e) { logger.warn("Error parsing xml", e); final Map errorInfo = new HashMap<>(); - errorInfo.put(ErrorTag.missing_attribute.name(), "Missing value for 'target' attribute"); + errorInfo.put(ErrorTag.missing_attribute.name(), "Error parsing xml: " + e.getMessage()); throw new NetconfDocumentedException(e.getMessage(), ErrorType.rpc, ErrorTag.missing_attribute, ErrorSeverity.error, errorInfo); } catch (final IllegalArgumentException e) { diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java index 296b224fff..eabc2b9394 100644 --- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java +++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/NetconfMappingTest.java @@ -143,7 +143,6 @@ public class NetconfMappingTest extends AbstractConfigTest { edit("netconfMessages/editConfig.xml"); checkBinaryLeafEdited(getConfigCandidate()); - // default-operation:none, should not affect binary leaf edit("netconfMessages/editConfig_none.xml"); checkBinaryLeafEdited(getConfigCandidate()); @@ -151,9 +150,10 @@ public class NetconfMappingTest extends AbstractConfigTest { // check after edit commit(); Element response = getConfigRunning(); - + System.err.println(XmlUtil.toString(response)); checkBinaryLeafEdited(response); checkTypeConfigAttribute(response); + checkTypedefs(response); edit("netconfMessages/editConfig_remove.xml"); @@ -375,7 +375,14 @@ public class NetconfMappingTest extends AbstractConfigTest { buf.append(XmlElement.fromDomElement(e).getTextContent()); } assertEquals("810", buf.toString()); + } + + private void checkTypedefs(final Element response) { + NodeList children = response.getElementsByTagName("extended"); + assertEquals(1, children.getLength()); + children = response.getElementsByTagName("extended-twice"); + assertEquals(1, children.getLength()); } private void checkTypeConfigAttribute(Element response) { @@ -643,7 +650,7 @@ public class NetconfMappingTest extends AbstractConfigTest { private List getYangs() throws FileNotFoundException { List paths = Arrays.asList("/META-INF/yang/config.yang", "/META-INF/yang/rpc-context.yang", - "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", + "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", "/META-INF/yang/test-types.yang", "/META-INF/yang/ietf-inet-types.yang"); final Collection yangDependencies = new ArrayList<>(); for (String path : paths) { diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java index e5b9fa3ffc..4c95d14b22 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITTest.java @@ -163,7 +163,7 @@ public class NetconfITTest extends AbstractConfigTest { static Collection getBasicYangs() throws IOException { List paths = Arrays.asList("/META-INF/yang/config.yang", "/META-INF/yang/rpc-context.yang", - "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", + "/META-INF/yang/config-test.yang", "/META-INF/yang/config-test-impl.yang", "/META-INF/yang/test-types.yang", "/META-INF/yang/ietf-inet-types.yang"); final Collection yangDependencies = new ArrayList<>(); List failedToFind = new ArrayList<>(); diff --git a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml index 0611dceb3a..ce52e49365 100644 --- a/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml +++ b/opendaylight/netconf/netconf-util/src/test/resources/netconfMessages/editConfig.xml @@ -31,6 +31,14 @@ test1 + + 1 + + + + 1 + + 44 8 1