X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Foperations%2Feditconfig%2FEditConfigXmlParser.java;h=47220f18571a275641a7f0671cfe6da9e0e2ff1d;hb=b80124e3f7b11cf2f5e5bd4a6b033d855ff4d0d4;hp=3d4e5b6d0c2b9b431ae1d73cae22ea035cb304b6;hpb=0f14bf97fb20a4d506a7ed4826b2a6ed3b9ebeab;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java index 3d4e5b6d0c..47220f1857 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigXmlParser.java @@ -10,25 +10,24 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations.ed import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; -import org.opendaylight.controller.config.util.ConfigRegistryClient; +import java.util.Arrays; +import java.util.Map; +import org.opendaylight.controller.config.api.ServiceReferenceReadableRegistry; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Config; +import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleElementDefinition; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleElementResolved; +import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ServiceRegistryWrapper; +import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services; import org.opendaylight.controller.netconf.confignetconfconnector.operations.Datastore; -import org.opendaylight.controller.netconf.confignetconfconnector.transactions.TransactionProvider; +import org.opendaylight.controller.netconf.util.exception.MissingNameSpaceException; +import org.opendaylight.controller.netconf.util.exception.UnexpectedNamespaceException; import org.opendaylight.controller.netconf.util.xml.XmlElement; import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.management.ObjectName; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.Set; - public class EditConfigXmlParser { private static final Logger logger = LoggerFactory.getLogger(EditConfigXmlParser.class); @@ -43,24 +42,40 @@ public class EditConfigXmlParser { public EditConfigXmlParser() { } - EditConfigXmlParser.EditConfigExecution fromXml(final XmlElement xml, final Config cfgMapping, - TransactionProvider transactionProvider, ConfigRegistryClient configRegistryClient) + EditConfigXmlParser.EditConfigExecution fromXml(final XmlElement xml, final Config cfgMapping) throws NetconfDocumentedException { + //TODO remove transactionProvider and CfgRegistry from parameters, accept only service ref store + EditStrategyType editStrategyType = EditStrategyType.getDefaultStrategy(); xml.checkName(EditConfigXmlParser.EDIT_CONFIG); xml.checkNamespace(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0); - XmlElement targetElement = xml.getOnlyChildElementWithSameNamespace(EditConfigXmlParser.TARGET_KEY); - XmlElement targetChildNode = targetElement.getOnlyChildElementWithSameNamespace(); + + XmlElement targetElement = null; + XmlElement targetChildNode = null; + try { + targetElement = xml.getOnlyChildElementWithSameNamespace(EditConfigXmlParser.TARGET_KEY); + targetChildNode = targetElement.getOnlyChildElementWithSameNamespace(); + } catch (final MissingNameSpaceException | UnexpectedNamespaceException e) { + logger.trace("Can't get only child element with same namespace due to {}",e); + throw NetconfDocumentedException.wrap(e); + } String datastoreValue = targetChildNode.getName(); Datastore targetDatastore = Datastore.valueOf(datastoreValue); logger.debug("Setting {} to '{}'", EditConfigXmlParser.TARGET_KEY, targetDatastore); // check target - Preconditions.checkArgument(targetDatastore == Datastore.candidate, - "Only %s datastore supported for edit config but was: %s", Datastore.candidate, targetDatastore); + if (targetDatastore != Datastore.candidate){ + throw new NetconfDocumentedException(String.format( + "Only %s datastore supported for edit config but was: %s", + Datastore.candidate, + targetDatastore), + NetconfDocumentedException.ErrorType.application, + NetconfDocumentedException.ErrorTag.invalid_value, + NetconfDocumentedException.ErrorSeverity.error); + } // Test option TestOption testOption; @@ -79,9 +94,10 @@ public class EditConfigXmlParser { .getOnlyChildElementWithSameNamespaceOptionally(EditConfigXmlParser.ERROR_OPTION_KEY); if (errorOptionElement.isPresent()) { String errorOptionParsed = errorOptionElement.get().getTextContent(); - if (false == errorOptionParsed.equals(EditConfigXmlParser.DEFAULT_ERROR_OPTION)) + if (!errorOptionParsed.equals(EditConfigXmlParser.DEFAULT_ERROR_OPTION)){ throw new UnsupportedOperationException("Only " + EditConfigXmlParser.DEFAULT_ERROR_OPTION + " supported for " + EditConfigXmlParser.ERROR_OPTION_KEY + ", was " + errorOptionParsed); + } } // Default op @@ -92,21 +108,16 @@ public class EditConfigXmlParser { logger.trace("Setting merge strategy to {}", mergeStrategyString); editStrategyType = EditStrategyType.valueOf(mergeStrategyString); } - Set instancesForFillingServiceRefMapping = Collections.emptySet(); - if (editStrategyType == EditStrategyType.merge) { - instancesForFillingServiceRefMapping = Datastore.getInstanceQueryStrategy(targetDatastore, transactionProvider) - .queryInstances(configRegistryClient); - logger.trace("Pre-filling services from following instances: {}", instancesForFillingServiceRefMapping); - } - XmlElement configElement = xml.getOnlyChildElementWithSameNamespace(XmlNetconfConstants.CONFIG_KEY); - - return new EditConfigXmlParser.EditConfigExecution(xml, cfgMapping, configElement, testOption, - instancesForFillingServiceRefMapping, editStrategyType); - } + XmlElement configElement = null; + try { + configElement = xml.getOnlyChildElementWithSameNamespace(XmlNetconfConstants.CONFIG_KEY); + } catch (MissingNameSpaceException e) { + logger.trace("Can't get only child element with same namespace due to {}",e); + throw NetconfDocumentedException.wrap(e); + } - private void removeMountpointsFromConfig(XmlElement configElement, XmlElement mountpointsElement) { - configElement.getDomElement().removeChild(mountpointsElement.getDomElement()); + return new EditConfigXmlParser.EditConfigExecution(cfgMapping, configElement, testOption, editStrategyType); } @VisibleForTesting @@ -135,15 +146,18 @@ public class EditConfigXmlParser { @VisibleForTesting static class EditConfigExecution { - private final XmlElement editConfigXml; - private final Map> resolvedXmlElements; + private final TestOption testOption; private final EditStrategyType defaultEditStrategyType; - - EditConfigExecution(XmlElement xml, Config configResolver, XmlElement configElement, TestOption testOption, Set instancesForFillingServiceRefMapping, - EditStrategyType defaultStrategy) { - this.editConfigXml = xml; - this.resolvedXmlElements = configResolver.fromXml(configElement, instancesForFillingServiceRefMapping, defaultStrategy); + private final Services services; + private final Config configResolver; + private final XmlElement configElement; + + EditConfigExecution(Config configResolver, XmlElement configElement, TestOption testOption, EditStrategyType defaultStrategy) throws NetconfDocumentedException { + Config.checkUnrecognisedChildren(configElement); + this.configResolver = configResolver; + this.configElement = configElement; + this.services = configResolver.fromXmlServices(configElement); this.testOption = testOption; this.defaultEditStrategyType = defaultStrategy; } @@ -156,12 +170,25 @@ public class EditConfigXmlParser { return testOption == TestOption.set || testOption == TestOption.testThenSet; } - Map> getResolvedXmlElements() { - return resolvedXmlElements; + Map> getResolvedXmlElements(ServiceReferenceReadableRegistry serviceRegistry) throws NetconfDocumentedException { + return configResolver.fromXmlModulesResolved(configElement, defaultEditStrategyType, getServiceRegistryWrapper(serviceRegistry)); + } + + ServiceRegistryWrapper getServiceRegistryWrapper(ServiceReferenceReadableRegistry serviceRegistry) { + // TODO cache service registry + return new ServiceRegistryWrapper(serviceRegistry); + } + + Map> getModulesDefinition(ServiceReferenceReadableRegistry serviceRegistry) throws NetconfDocumentedException { + return configResolver.fromXmlModulesMap(configElement, defaultEditStrategyType, getServiceRegistryWrapper(serviceRegistry)); } EditStrategyType getDefaultStrategy() { return defaultEditStrategyType; } + + Services getServices() { + return services; + } } }