X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fconfig%2FModuleConfig.java;h=a5a625a2d6859a373511a1c22ffc9b98c9df6521;hp=f3d75d07bef7ec9dc33ac1d0a189f9e37d30e50d;hb=3e20a64a21d5b7bced26b03108aedcd025dd8be6;hpb=8145513d5b6430d550a5bce27ba812086c7d1b00 diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleConfig.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleConfig.java index f3d75d07be..a5a625a2d6 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleConfig.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/ModuleConfig.java @@ -8,12 +8,9 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.config; -import java.util.Collection; -import java.util.Date; -import java.util.Map; - -import javax.management.ObjectName; - +import com.google.common.base.Optional; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfig; @@ -25,9 +22,10 @@ import org.opendaylight.yangtools.yang.common.QName; import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.google.common.base.Optional; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import javax.management.ObjectName; +import java.util.Collection; +import java.util.Date; +import java.util.Map; public class ModuleConfig { @@ -64,7 +62,7 @@ public class ModuleConfig { Element root = XmlUtil.createElement(document, XmlNetconfConstants.MODULE_KEY, Optional.absent()); // Xml.addNamespaceAttr(document, root, namespace); - final String prefix = getPrefix(namespace); + final String prefix = getPrefix(); Element typeElement = XmlUtil.createPrefixedTextElement(document, XmlUtil.createPrefixedValue(prefix, XmlNetconfConstants.TYPE_KEY), prefix, moduleName, Optional.of(namespace)); // Xml.addNamespaceAttr(document, typeElement, @@ -82,12 +80,8 @@ public class ModuleConfig { return root; } - private String getPrefix(String namespace) { - // if(namespace.contains(":")==false) + private String getPrefix() { return XmlNetconfConstants.PREFIX; - // return namespace.substring(namespace.lastIndexOf(':') + 1, - // namespace.length()); - } public ModuleElementResolved fromXml(XmlElement moduleElement, ServiceRegistryWrapper depTracker, String instanceName,