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=3d4e5b6d0c2b9b431ae1d73cae22ea035cb304b6;hb=404d4fc52adf17bad6b53aaeedf59d1db85780bc;hp=d835dfd30f0abc0a95bbf51dc4cca7cfe5443a30;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;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 d835dfd30f..3d4e5b6d0c 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
@@ -12,17 +12,22 @@ 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 org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Config;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleElementResolved;
 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.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 {
 
@@ -38,10 +43,11 @@ public class EditConfigXmlParser {
     public EditConfigXmlParser() {
     }
 
-    EditConfigXmlParser.EditConfigExecution fromXml(final XmlElement xml, final Config cfgMapping)
+    EditConfigXmlParser.EditConfigExecution fromXml(final XmlElement xml, final Config cfgMapping,
+                                                    TransactionProvider transactionProvider, ConfigRegistryClient configRegistryClient)
             throws NetconfDocumentedException {
 
-        EditStrategyType.resetDefaultStrategy();
+        EditStrategyType editStrategyType = EditStrategyType.getDefaultStrategy();
 
         xml.checkName(EditConfigXmlParser.EDIT_CONFIG);
         xml.checkNamespace(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
@@ -81,12 +87,22 @@ public class EditConfigXmlParser {
         // Default op
         Optional<XmlElement> defaultContent = xml
                 .getOnlyChildElementWithSameNamespaceOptionally(EditConfigXmlParser.DEFAULT_OPERATION_KEY);
-        if (defaultContent.isPresent())
-            EditStrategyType.setDefaultStrategy(EditStrategyType.valueOf(defaultContent.get().getTextContent()));
+        if (defaultContent.isPresent()) {
+            String mergeStrategyString = defaultContent.get().getTextContent();
+            logger.trace("Setting merge strategy to {}", mergeStrategyString);
+            editStrategyType = EditStrategyType.valueOf(mergeStrategyString);
+        }
+        Set<ObjectName> 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);
+        return new EditConfigXmlParser.EditConfigExecution(xml, cfgMapping, configElement, testOption,
+                instancesForFillingServiceRefMapping, editStrategyType);
     }
 
     private void removeMountpointsFromConfig(XmlElement configElement, XmlElement mountpointsElement) {
@@ -119,14 +135,17 @@ public class EditConfigXmlParser {
 
     @VisibleForTesting
     static class EditConfigExecution {
-        XmlElement editConfigXml;
-        Map<String, Multimap<String, ModuleElementResolved>> resolvedXmlElements;
-        TestOption testOption;
+        private final XmlElement editConfigXml;
+        private final Map<String, Multimap<String, ModuleElementResolved>> resolvedXmlElements;
+        private final TestOption testOption;
+        private final EditStrategyType defaultEditStrategyType;
 
-        EditConfigExecution(XmlElement xml, Config configResolver, XmlElement configElement, TestOption testOption) {
+        EditConfigExecution(XmlElement xml, Config configResolver, XmlElement configElement, TestOption testOption, Set<ObjectName> instancesForFillingServiceRefMapping,
+                            EditStrategyType defaultStrategy) {
             this.editConfigXml = xml;
-            this.resolvedXmlElements = configResolver.fromXml(configElement);
+            this.resolvedXmlElements = configResolver.fromXml(configElement, instancesForFillingServiceRefMapping, defaultStrategy);
             this.testOption = testOption;
+            this.defaultEditStrategyType = defaultStrategy;
         }
 
         boolean shouldTest() {
@@ -136,5 +155,13 @@ public class EditConfigXmlParser {
         boolean shouldSet() {
             return testOption == TestOption.set || testOption == TestOption.testThenSet;
         }
+
+        Map<String, Multimap<String, ModuleElementResolved>> getResolvedXmlElements() {
+            return resolvedXmlElements;
+        }
+
+        EditStrategyType getDefaultStrategy() {
+            return defaultEditStrategyType;
+        }
     }
 }