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%2Foperations%2Feditconfig%2FEditConfig.java;h=ffc69eb8efd2baa4fc1b6399a2a66e9ac058331f;hp=bd85f948f5325a8a6756fd5ab236bfb66aaba986;hb=8720a3f3498bbc6fab675431f4200d26641a8ec8;hpb=7d9b07a6cf8171e97eb5ce6ed4ccdcfadff8e741 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 bd85f948f5..ffc69eb8ef 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 @@ -9,13 +9,19 @@ 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.Maps; import com.google.common.collect.Multimap; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import javax.management.InstanceNotFoundException; +import javax.management.ObjectName; import org.opendaylight.controller.config.api.ValidationException; import org.opendaylight.controller.config.util.ConfigRegistryClient; import org.opendaylight.controller.config.util.ConfigTransactionClient; -import org.opendaylight.controller.config.yang.store.api.YangStoreSnapshot; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorSeverity; @@ -30,9 +36,11 @@ import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services; import org.opendaylight.controller.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation; import org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig.EditConfigXmlParser.EditConfigExecution; +import org.opendaylight.controller.netconf.confignetconfconnector.osgi.YangStoreSnapshot; 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.netconf.util.xml.XmlUtil; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.slf4j.Logger; @@ -40,14 +48,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.management.InstanceNotFoundException; -import javax.management.ObjectName; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - public class EditConfig extends AbstractConfigNetconfOperation { private static final Logger logger = LoggerFactory.getLogger(EditConfig.class); @@ -70,33 +70,21 @@ public class EditConfig extends AbstractConfigNetconfOperation { final EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { if (editConfigExecution.shouldTest()) { - executeTests(configRegistryClient, editConfigExecution); + executeTests(getConfigRegistryClient(), editConfigExecution); } if (editConfigExecution.shouldSet()) { - executeSet(configRegistryClient, editConfigExecution); + executeSet(getConfigRegistryClient(), editConfigExecution); } logger.trace("Operation {} successful", EditConfigXmlParser.EDIT_CONFIG); - return document.createElement(XmlNetconfConstants.OK); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } private void executeSet(ConfigRegistryClient configRegistryClient, EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { - try { - set(configRegistryClient, editConfigExecution); - - } catch (IllegalStateException e) { - //FIXME: when can IllegalStateException be thrown? - // JmxAttributeValidationException is wrapped in DynamicWritableWrapper with ValidationException - // ValidationException is not thrown until validate or commit is issued - logger.warn("Set phase for {} failed", EditConfigXmlParser.EDIT_CONFIG, e); - final Map errorInfo = new HashMap<>(); - errorInfo.put(ErrorTag.operation_failed.name(), e.getMessage()); - throw new NetconfDocumentedException("Test phase: " + e.getMessage(), e, ErrorType.application, - ErrorTag.operation_failed, ErrorSeverity.error, errorInfo); - } + set(configRegistryClient, editConfigExecution); logger.debug("Set phase for {} operation successful", EditConfigXmlParser.EDIT_CONFIG); } @@ -104,8 +92,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { EditConfigExecution editConfigExecution) throws NetconfDocumentedException { try { test(configRegistryClient, editConfigExecution, editConfigExecution.getDefaultStrategy()); - } catch (IllegalStateException | ValidationException e) { - //FIXME: when can IllegalStateException be thrown? + } catch (final ValidationException e) { logger.warn("Test phase for {} failed", EditConfigXmlParser.EDIT_CONFIG, e); final Map errorInfo = new HashMap<>(); errorInfo.put(ErrorTag.operation_failed.name(), e.getMessage()); @@ -116,10 +103,9 @@ public class EditConfig extends AbstractConfigNetconfOperation { } private void test(ConfigRegistryClient configRegistryClient, EditConfigExecution execution, - EditStrategyType editStrategyType) throws ValidationException { + EditStrategyType editStrategyType) throws ValidationException, NetconfDocumentedException { ObjectName taON = transactionProvider.getTestTransaction(); try { - // default strategy = replace wipes config if (editStrategyType == EditStrategyType.replace) { transactionProvider.wipeTestTransaction(taON); @@ -137,7 +123,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { } private void set(ConfigRegistryClient configRegistryClient, - EditConfigXmlParser.EditConfigExecution editConfigExecution) { + EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { ObjectName taON = transactionProvider.getOrCreateTransaction(); // default strategy = replace wipes config @@ -152,7 +138,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { setOnTransaction(ta, editConfigExecution); } - private void setServicesOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) { + private void setServicesOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) throws NetconfDocumentedException { Services services = execution.getServices(); @@ -173,7 +159,10 @@ public class EditConfig extends AbstractConfigNetconfOperation { logger.debug("Saving service {} with on {} under name {} with service on {}", qnameOfService, on, refName, saved); } catch (InstanceNotFoundException e) { - throw new IllegalStateException("Unable to save ref name " + refName + " for instance " + on, e); + throw new NetconfDocumentedException(String.format("Unable to save ref name " + refName + " for instance " + on, e), + ErrorType.application, + ErrorTag.operation_failed, + ErrorSeverity.error); } } } @@ -184,11 +173,11 @@ public class EditConfig extends AbstractConfigNetconfOperation { return ta.getServiceInterfaceName(namespace, serviceName); } - private void setOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) { + private void setOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) throws NetconfDocumentedException { for (Multimap modulesToResolved : execution.getResolvedXmlElements(ta).values()) { - for (Entry moduleToResolved : modulesToResolved.entries()) { + for (Map.Entry moduleToResolved : modulesToResolved.entries()) { String moduleName = moduleToResolved.getKey(); ModuleElementResolved moduleElementResolved = moduleToResolved.getValue(); @@ -202,10 +191,10 @@ public class EditConfig extends AbstractConfigNetconfOperation { } private void handleMisssingInstancesOnTransaction(ConfigTransactionClient ta, - EditConfigExecution execution) { + EditConfigExecution execution) throws NetconfDocumentedException { for (Multimap modulesToResolved : execution.getModulesDefinition(ta).values()) { - for (Entry moduleToResolved : modulesToResolved.entries()) { + for (Map.Entry moduleToResolved : modulesToResolved.entries()) { String moduleName = moduleToResolved.getKey(); ModuleElementDefinition moduleElementDefinition = moduleToResolved.getValue(); @@ -233,7 +222,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { void addIdSchemaNode(IdentitySchemaNode node) { String name = node.getQName().getLocalName(); - Preconditions.checkState(identityNameToSchemaNode.containsKey(name) == false); + Preconditions.checkState(!identityNameToSchemaNode.containsKey(name)); identityNameToSchemaNode.put(name, node); } @@ -241,11 +230,6 @@ public class EditConfig extends AbstractConfigNetconfOperation { return identityNameToSchemaNode.containsKey(idName); } - // FIXME method never used - public IdentitySchemaNode getIdentitySchemaNode(String idName) { - Preconditions.checkState(identityNameToSchemaNode.containsKey(idName), "No identity under name %s", idName); - return identityNameToSchemaNode.get(idName); - } } private static Map> transformIdentities(Set modules) { @@ -259,7 +243,7 @@ public class EditConfig extends AbstractConfigNetconfOperation { } Date revision = module.getRevision(); - Preconditions.checkState(revisionsByNamespace.containsKey(revision) == false, + Preconditions.checkState(!revisionsByNamespace.containsKey(revision), "Duplicate revision %s for namespace %s", revision, namespace); IdentityMapping identityMapping = revisionsByNamespace.get(revision); @@ -285,13 +269,12 @@ public class EditConfig extends AbstractConfigNetconfOperation { Map> namespaceToModuleNameToModuleConfig = Maps.newHashMap(); for (String namespace : mBeanEntries.keySet()) { - for (Entry moduleNameToMbe : mBeanEntries.get(namespace).entrySet()) { + for (Map.Entry moduleNameToMbe : mBeanEntries.get(namespace).entrySet()) { String moduleName = moduleNameToMbe.getKey(); ModuleMXBeanEntry moduleMXBeanEntry = moduleNameToMbe.getValue(); ModuleConfig moduleConfig = new ModuleConfig(moduleName, new InstanceConfig(configRegistryClient, - moduleMXBeanEntry.getAttributes()), moduleMXBeanEntry - .getProvidedServices().values()); + moduleMXBeanEntry.getAttributes())); Map moduleNameToModuleConfig = namespaceToModuleNameToModuleConfig.get(namespace); if(moduleNameToModuleConfig == null) { @@ -312,33 +295,15 @@ public class EditConfig extends AbstractConfigNetconfOperation { } @Override - protected Element handle(Document document, XmlElement xml) throws NetconfDocumentedException { + protected Element handleWithNoSubsequentOperations(Document document, XmlElement xml) throws NetconfDocumentedException { EditConfigXmlParser.EditConfigExecution editConfigExecution; - Config cfg = getConfigMapping(configRegistryClient, yangStoreSnapshot); - try { - editConfigExecution = editConfigXmlParser.fromXml(xml, cfg, transactionProvider, configRegistryClient); - } catch (IllegalStateException e) { - logger.warn("Error parsing xml", e); - final Map errorInfo = new HashMap<>(); - 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) { - logger.warn("Error parsing xml", e); - final Map errorInfo = new HashMap<>(); - errorInfo.put(ErrorTag.bad_attribute.name(), e.getMessage()); - throw new NetconfDocumentedException(e.getMessage(), ErrorType.rpc, ErrorTag.bad_attribute, - ErrorSeverity.error, errorInfo); - } catch (final UnsupportedOperationException e) { - logger.warn("Unsupported", e); - final Map errorInfo = new HashMap<>(); - errorInfo.put(ErrorTag.operation_not_supported.name(), "Unsupported option for 'edit-config'"); - throw new NetconfDocumentedException(e.getMessage(), ErrorType.application, - ErrorTag.operation_not_supported, ErrorSeverity.error, errorInfo); - } + Config cfg = getConfigMapping(getConfigRegistryClient(), yangStoreSnapshot); + editConfigExecution = editConfigXmlParser.fromXml(xml, cfg); - return getResponseInternal(document, editConfigExecution); + Element responseInternal; + responseInternal = getResponseInternal(document, editConfigExecution); + return responseInternal; } }