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=d9076fa89191529fc83aef780b16d1d111b4dc95;hp=b7699bf69ce82fb16f5eaa57197a6829cdab9a0d;hb=refs%2Fchanges%2F13%2F23413%2F26;hpb=071a641d7c12c0e6112d5ce0afe806b54f116ed2 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 b7699bf69c..d9076fa891 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 @@ -10,41 +10,20 @@ 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.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.BeanReader; -import org.opendaylight.controller.config.util.ConfigRegistryClient; -import org.opendaylight.controller.config.util.ConfigTransactionClient; -import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; -import org.opendaylight.controller.netconf.api.NetconfDocumentedException; -import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorSeverity; -import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorTag; -import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorType; +import org.opendaylight.controller.config.facade.xml.ConfigExecution; +import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacade; +import org.opendaylight.controller.config.facade.xml.mapping.config.Config; +import org.opendaylight.controller.config.util.xml.DocumentedException; +import org.opendaylight.controller.config.util.xml.DocumentedException.ErrorSeverity; +import org.opendaylight.controller.config.util.xml.DocumentedException.ErrorTag; +import org.opendaylight.controller.config.util.xml.DocumentedException.ErrorType; +import org.opendaylight.controller.config.util.xml.XmlElement; +import org.opendaylight.controller.config.util.xml.XmlUtil; import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Config; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.InstanceConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.InstanceConfigElementResolved; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleConfig; -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.Services; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services.ServiceInstance; 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.YangStoreContext; -import org.opendaylight.controller.netconf.confignetconfconnector.transactions.TransactionProvider; -import org.opendaylight.controller.netconf.util.xml.XmlElement; -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; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -54,243 +33,30 @@ public class EditConfig extends AbstractConfigNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(EditConfig.class); - private final YangStoreContext yangStoreSnapshot; - - private final TransactionProvider transactionProvider; private EditConfigXmlParser editConfigXmlParser; - public EditConfig(YangStoreContext yangStoreSnapshot, TransactionProvider transactionProvider, - ConfigRegistryClient configRegistryClient, String netconfSessionIdForReporting) { - super(configRegistryClient, netconfSessionIdForReporting); - this.yangStoreSnapshot = yangStoreSnapshot; - this.transactionProvider = transactionProvider; + public EditConfig(final ConfigSubsystemFacade configSubsystemFacade, final String netconfSessionIdForReporting) { + super(configSubsystemFacade, netconfSessionIdForReporting); this.editConfigXmlParser = new EditConfigXmlParser(); } @VisibleForTesting Element getResponseInternal(final Document document, - final EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { - - if (editConfigExecution.shouldTest()) { - executeTests(getConfigRegistryClient(), editConfigExecution); - } - - if (editConfigExecution.shouldSet()) { - executeSet(getConfigRegistryClient(), editConfigExecution); - } - - LOG.trace("Operation {} successful", EditConfigXmlParser.EDIT_CONFIG); - - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); - } + final ConfigExecution configExecution) throws DocumentedException { - private void executeSet(ConfigRegistryClient configRegistryClient, - EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { - set(configRegistryClient, editConfigExecution); - LOG.debug("Set phase for {} operation successful", EditConfigXmlParser.EDIT_CONFIG); - } - - private void executeTests(ConfigRegistryClient configRegistryClient, - EditConfigExecution editConfigExecution) throws NetconfDocumentedException { try { - test(configRegistryClient, editConfigExecution, editConfigExecution.getDefaultStrategy()); - } catch (final ValidationException e) { + getConfigSubsystemFacade().executeConfigExecution(configExecution); + } catch (ValidationException e) { LOG.warn("Test 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, + throw new DocumentedException("Test phase: " + e.getMessage(), e, ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error, errorInfo); } - LOG.debug("Test phase for {} operation successful", EditConfigXmlParser.EDIT_CONFIG); - } - - private void test(ConfigRegistryClient configRegistryClient, EditConfigExecution execution, - EditStrategyType editStrategyType) throws ValidationException, NetconfDocumentedException { - ObjectName taON = transactionProvider.getTestTransaction(); - try { - // default strategy = replace wipes config - if (editStrategyType == EditStrategyType.replace) { - transactionProvider.wipeTestTransaction(taON); - } - - ConfigTransactionClient ta = configRegistryClient.getConfigTransactionClient(taON); - - handleMisssingInstancesOnTransaction(ta, execution); - setServicesOnTransaction(ta, execution); - setOnTransaction(ta, execution); - transactionProvider.validateTestTransaction(taON); - } finally { - transactionProvider.abortTestTransaction(taON); - } - } - - private void set(ConfigRegistryClient configRegistryClient, - EditConfigXmlParser.EditConfigExecution editConfigExecution) throws NetconfDocumentedException { - ObjectName taON = transactionProvider.getOrCreateTransaction(); - - // default strategy = replace wipes config - if (editConfigExecution.getDefaultStrategy() == EditStrategyType.replace) { - transactionProvider.wipeTransaction(); - } - - ConfigTransactionClient ta = configRegistryClient.getConfigTransactionClient(taON); - - handleMisssingInstancesOnTransaction(ta, editConfigExecution); - setServicesOnTransaction(ta, editConfigExecution); - setOnTransaction(ta, editConfigExecution); - } - - private void setServicesOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) throws NetconfDocumentedException { - - Services services = execution.getServices(); - - Map>> namespaceToServiceNameToRefNameToInstance = services - .getNamespaceToServiceNameToRefNameToInstance(); - - for (Map.Entry>> namespaceToServiceToRefEntry : namespaceToServiceNameToRefNameToInstance.entrySet()) { - for (Map.Entry> serviceToRefEntry : namespaceToServiceToRefEntry.getValue().entrySet()) { - - String qnameOfService = getQname(ta, namespaceToServiceToRefEntry.getKey(), serviceToRefEntry.getKey()); - Map refNameToInstance = serviceToRefEntry.getValue(); - - for (Map.Entry refNameToServiceEntry : refNameToInstance.entrySet()) { - ObjectName on = refNameToServiceEntry.getValue().getObjectName(ta.getTransactionName()); - try { - if (ServiceInstance.EMPTY_SERVICE_INSTANCE == refNameToServiceEntry.getValue()) { - ta.removeServiceReference(qnameOfService, refNameToServiceEntry.getKey()); - LOG.debug("Removing service {} with name {}", qnameOfService, refNameToServiceEntry.getKey()); - } else { - ObjectName saved = ta.saveServiceReference(qnameOfService, refNameToServiceEntry.getKey(), on); - LOG.debug("Saving service {} with on {} under name {} with service on {}", qnameOfService, - on, refNameToServiceEntry.getKey(), saved); - } - } catch (InstanceNotFoundException e) { - throw new NetconfDocumentedException(String.format("Unable to edit ref name " + refNameToServiceEntry.getKey() + " for instance " + on, e), - ErrorType.application, - ErrorTag.operation_failed, - ErrorSeverity.error); - } - } - } - } - } - - private String getQname(ConfigTransactionClient ta, String namespace, String serviceName) { - return ta.getServiceInterfaceName(namespace, serviceName); - } - - private void setOnTransaction(ConfigTransactionClient ta, EditConfigExecution execution) throws NetconfDocumentedException { - - for (Multimap modulesToResolved : execution.getResolvedXmlElements(ta).values()) { - - for (Map.Entry moduleToResolved : modulesToResolved.entries()) { - String moduleName = moduleToResolved.getKey(); - - ModuleElementResolved moduleElementResolved = moduleToResolved.getValue(); - String instanceName = moduleElementResolved.getInstanceName(); - InstanceConfigElementResolved ice = moduleElementResolved.getInstanceConfigElementResolved(); - EditConfigStrategy strategy = ice.getEditStrategy(); - strategy.executeConfiguration(moduleName, instanceName, ice.getConfiguration(), ta, execution.getServiceRegistryWrapper(ta)); - } - } - } - - private void handleMisssingInstancesOnTransaction(ConfigTransactionClient ta, - EditConfigExecution execution) throws NetconfDocumentedException { - - for (Multimap modulesToResolved : execution.getModulesDefinition(ta).values()) { - for (Map.Entry moduleToResolved : modulesToResolved.entries()) { - String moduleName = moduleToResolved.getKey(); - - ModuleElementDefinition moduleElementDefinition = moduleToResolved.getValue(); - - EditConfigStrategy strategy = moduleElementDefinition.getEditStrategy(); - strategy.executeConfiguration(moduleName, moduleElementDefinition.getInstanceName(), null, ta, execution.getServiceRegistryWrapper(ta)); - } - } - } - - public static Config getConfigMapping(ConfigRegistryClient configRegistryClient, YangStoreContext yangStoreSnapshot) { - Map> factories = transformMbeToModuleConfigs(configRegistryClient, - yangStoreSnapshot.getModuleMXBeanEntryMap()); - Map> identitiesMap = transformIdentities(yangStoreSnapshot.getModules()); - return new Config(factories, identitiesMap, yangStoreSnapshot.getEnumResolver()); - } - - - public static class IdentityMapping { - private final Map identityNameToSchemaNode; - - public IdentityMapping() { - this.identityNameToSchemaNode = Maps.newHashMap(); - } - - void addIdSchemaNode(IdentitySchemaNode node) { - String name = node.getQName().getLocalName(); - Preconditions.checkState(!identityNameToSchemaNode.containsKey(name)); - identityNameToSchemaNode.put(name, node); - } - - public boolean containsIdName(String idName) { - return identityNameToSchemaNode.containsKey(idName); - } - - } - - private static Map> transformIdentities(Set modules) { - Map> mappedIds = Maps.newHashMap(); - for (Module module : modules) { - String namespace = module.getNamespace().toString(); - Map revisionsByNamespace= mappedIds.get(namespace); - if(revisionsByNamespace == null) { - revisionsByNamespace = Maps.newHashMap(); - mappedIds.put(namespace, revisionsByNamespace); - } - - Date revision = module.getRevision(); - - IdentityMapping identityMapping = revisionsByNamespace.get(revision); - if(identityMapping == null) { - identityMapping = new IdentityMapping(); - revisionsByNamespace.put(revision, identityMapping); - } - - for (IdentitySchemaNode identitySchemaNode : module.getIdentities()) { - identityMapping.addIdSchemaNode(identitySchemaNode); - } - - } - - return mappedIds; - } - - public static Map> transformMbeToModuleConfigs ( - final BeanReader configRegistryClient, Map> mBeanEntries) { - - Map> namespaceToModuleNameToModuleConfig = Maps.newHashMap(); - - for (Map.Entry> namespaceToModuleToMbe : mBeanEntries.entrySet()) { - for (Map.Entry moduleNameToMbe : namespaceToModuleToMbe.getValue().entrySet()) { - String moduleName = moduleNameToMbe.getKey(); - ModuleMXBeanEntry moduleMXBeanEntry = moduleNameToMbe.getValue(); - - ModuleConfig moduleConfig = new ModuleConfig(moduleName, - new InstanceConfig(configRegistryClient,moduleMXBeanEntry.getAttributes(), moduleMXBeanEntry.getNullableDummyContainerName())); - - Map moduleNameToModuleConfig = namespaceToModuleNameToModuleConfig.get(namespaceToModuleToMbe.getKey()); - if(moduleNameToModuleConfig == null) { - moduleNameToModuleConfig = Maps.newHashMap(); - namespaceToModuleNameToModuleConfig.put(namespaceToModuleToMbe.getKey(), moduleNameToModuleConfig); - } - - moduleNameToModuleConfig.put(moduleName, moduleConfig); - } - } + LOG.trace("Operation {} successful", EditConfigXmlParser.EDIT_CONFIG); - return namespaceToModuleNameToModuleConfig; + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override @@ -299,14 +65,14 @@ public class EditConfig extends AbstractConfigNetconfOperation { } @Override - protected Element handleWithNoSubsequentOperations(Document document, XmlElement xml) throws NetconfDocumentedException { - EditConfigXmlParser.EditConfigExecution editConfigExecution; - Config cfg = getConfigMapping(getConfigRegistryClient(), yangStoreSnapshot); - editConfigExecution = editConfigXmlParser.fromXml(xml, cfg); - - Element responseInternal; - responseInternal = getResponseInternal(document, editConfigExecution); - return responseInternal; + protected Element handleWithNoSubsequentOperations(Document document, XmlElement xml) throws DocumentedException { + ConfigExecution configExecution; + // FIXME config mapping getter works on dynamic yang store service and so does later executeConfigExecution method + // They might have different view of current yangs in ODL and might cause race conditions + Config cfg = getConfigSubsystemFacade().getConfigMapping(); + configExecution = editConfigXmlParser.fromXml(xml, cfg); + + return getResponseInternal(document, configExecution); } }