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=3995a0a5a4b364e5099185d7122ce87b225fcfb1;hb=23fe9ca678ada6263fec5dd996f4025e4a32fcf5;hp=e481bbe57f68bf4d043a8365362ce2c90ab46893;hpb=34c82598f1a898798e5b6dfcad5186889d58dc6c;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 e481bbe57f..3995a0a5a4 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 @@ -8,31 +8,21 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig; -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.api.ServiceReferenceReadableRegistry; -import org.opendaylight.controller.config.util.ConfigRegistryClient; -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.xml.XmlElement; -import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; +import org.opendaylight.controller.config.facade.xml.ConfigExecution; +import org.opendaylight.controller.config.facade.xml.Datastore; +import org.opendaylight.controller.config.facade.xml.TestOption; +import org.opendaylight.controller.config.facade.xml.mapping.config.Config; +import org.opendaylight.controller.config.facade.xml.strategy.EditStrategyType; +import org.opendaylight.controller.config.util.xml.DocumentedException; +import org.opendaylight.controller.config.util.xml.XmlElement; +import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.Map; - public class EditConfigXmlParser { - private static final Logger logger = LoggerFactory.getLogger(EditConfigXmlParser.class); + private static final Logger LOG = LoggerFactory.getLogger(EditConfigXmlParser.class); public static final String EDIT_CONFIG = "edit-config"; public static final String DEFAULT_OPERATION_KEY = "default-operation"; @@ -44,9 +34,8 @@ public class EditConfigXmlParser { public EditConfigXmlParser() { } - EditConfigXmlParser.EditConfigExecution fromXml(final XmlElement xml, final Config cfgMapping, - TransactionProvider transactionProvider, ConfigRegistryClient configRegistryClient) - throws NetconfDocumentedException { + ConfigExecution fromXml(final XmlElement xml, final Config cfgMapping) + throws DocumentedException { //TODO remove transactionProvider and CfgRegistry from parameters, accept only service ref store @@ -55,15 +44,26 @@ public class EditConfigXmlParser { 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; + targetElement = xml.getOnlyChildElementWithSameNamespace(EditConfigXmlParser.TARGET_KEY); + targetChildNode = targetElement.getOnlyChildElementWithSameNamespace(); + String datastoreValue = targetChildNode.getName(); Datastore targetDatastore = Datastore.valueOf(datastoreValue); - logger.debug("Setting {} to '{}'", EditConfigXmlParser.TARGET_KEY, targetDatastore); + LOG.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 DocumentedException(String.format( + "Only %s datastore supported for edit config but was: %s", + Datastore.candidate, + targetDatastore), + DocumentedException.ErrorType.application, + DocumentedException.ErrorTag.invalid_value, + DocumentedException.ErrorSeverity.error); + } // Test option TestOption testOption; @@ -71,20 +71,21 @@ public class EditConfigXmlParser { .getOnlyChildElementWithSameNamespaceOptionally(EditConfigXmlParser.TEST_OPTION_KEY); if (testOptionElementOpt.isPresent()) { String testOptionValue = testOptionElementOpt.get().getTextContent(); - testOption = EditConfigXmlParser.TestOption.getFromXmlName(testOptionValue); + testOption = TestOption.getFromXmlName(testOptionValue); } else { - testOption = EditConfigXmlParser.TestOption.getDefault(); + testOption = TestOption.getDefault(); } - logger.debug("Setting {} to '{}'", EditConfigXmlParser.TEST_OPTION_KEY, testOption); + LOG.debug("Setting {} to '{}'", EditConfigXmlParser.TEST_OPTION_KEY, testOption); // Error option Optional errorOptionElement = xml .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,84 +93,13 @@ public class EditConfigXmlParser { .getOnlyChildElementWithSameNamespaceOptionally(EditConfigXmlParser.DEFAULT_OPERATION_KEY); if (defaultContent.isPresent()) { String mergeStrategyString = defaultContent.get().getTextContent(); - logger.trace("Setting merge strategy to {}", mergeStrategyString); + LOG.trace("Setting merge strategy to {}", mergeStrategyString); editStrategyType = EditStrategyType.valueOf(mergeStrategyString); } - XmlElement configElement = xml.getOnlyChildElementWithSameNamespace(XmlNetconfConstants.CONFIG_KEY); - - return new EditConfigXmlParser.EditConfigExecution(cfgMapping, configElement, testOption, editStrategyType); - } + XmlElement configElement = null; + configElement = xml.getOnlyChildElementWithSameNamespace(XmlNetconfConstants.CONFIG_KEY); - @VisibleForTesting - static enum TestOption { - testOnly, set, testThenSet; - - static TestOption getFromXmlName(String testOptionXmlName) { - switch (testOptionXmlName) { - case "test-only": - return testOnly; - case "test-then-set": - return testThenSet; - case "set": - return set; - default: - throw new IllegalArgumentException("Unsupported test option " + testOptionXmlName + " supported: " - + Arrays.toString(TestOption.values())); - } - } - - public static TestOption getDefault() { - return testThenSet; - } - - } - - @VisibleForTesting - static class EditConfigExecution { - - private final TestOption testOption; - private final EditStrategyType defaultEditStrategyType; - private final Services services; - private final Config configResolver; - private final XmlElement configElement; - - EditConfigExecution(Config configResolver, XmlElement configElement, TestOption testOption, EditStrategyType defaultStrategy) { - Config.checkUnrecognisedChildren(configElement); - this.configResolver = configResolver; - this.configElement = configElement; - this.services = configResolver.fromXmlServices(configElement); - this.testOption = testOption; - this.defaultEditStrategyType = defaultStrategy; - } - - boolean shouldTest() { - return testOption == TestOption.testOnly || testOption == TestOption.testThenSet; - } - - boolean shouldSet() { - return testOption == TestOption.set || testOption == TestOption.testThenSet; - } - - Map> getResolvedXmlElements(ServiceReferenceReadableRegistry serviceRegistry) { - return configResolver.fromXmlModulesResolved(configElement, defaultEditStrategyType, getServiceRegistryWrapper(serviceRegistry)); - } - - ServiceRegistryWrapper getServiceRegistryWrapper(ServiceReferenceReadableRegistry serviceRegistry) { - // TODO cache service registry - return new ServiceRegistryWrapper(serviceRegistry); - } - - Map> getModulesDefinition(ServiceReferenceReadableRegistry serviceRegistry) { - return configResolver.fromXmlModulesMap(configElement, defaultEditStrategyType, getServiceRegistryWrapper(serviceRegistry)); - } - - EditStrategyType getDefaultStrategy() { - return defaultEditStrategyType; - } - - Services getServices() { - return services; - } + return new ConfigExecution(cfgMapping, configElement, testOption, editStrategyType); } }