Merge "BUG 2705 : No need to ReadData asynchronously in ShardTransaction"

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / operations / editconfig / ReplaceEditConfigStrategy.java

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategy.java
index 0091d6cc84ca7a42ed13d08259685dd127fa4d56..8d786d2c8d17757a7104e2e362499a22836c13ab 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategy.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/ReplaceEditConfigStrategy.java
@@ -10,35 +10,34 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations.ed
 
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.management.Attribute;
-import javax.management.InstanceAlreadyExistsException;
 import javax.management.ObjectName;
-
 import org.opendaylight.controller.config.util.ConfigTransactionClient;
+import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
+import org.opendaylight.controller.netconf.confignetconfconnector.exception.NetconfConfigHandlingException;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml.AttributeConfigElement;
+import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ServiceRegistryWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ReplaceEditConfigStrategy extends AbstractEditConfigStrategy {
 
-    private static final Logger logger = LoggerFactory.getLogger(ReplaceEditConfigStrategy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReplaceEditConfigStrategy.class);
 
     @Override
     void handleMissingInstance(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta,
-            String module, String instance) {
-        try {
-            ObjectName on = ta.createModule(module, instance);
-            logger.debug("New instance for {} {} created under name {}", module, instance, on);
-            executeStrategy(configuration, ta, on);
-        } catch (InstanceAlreadyExistsException e) {
-            logger.warn("Error creating instance {}:{}, replace failed", module, instance, e);
-            throw new IllegalStateException("Unable to create new instance for " + module + " : " + instance, e);
-        }
+                               String module, String instance, ServiceRegistryWrapper services) throws NetconfConfigHandlingException {
+        throw new NetconfConfigHandlingException(
+                String.format("Unable to handle missing instance, no missing instances should appear at this point, missing: %s : %s ",
+                        module,
+                        instance),
+                NetconfDocumentedException.ErrorType.application,
+                NetconfDocumentedException.ErrorTag.operation_failed,
+                NetconfDocumentedException.ErrorSeverity.error);
     }
 
     @Override
-    void executeStrategy(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta, ObjectName on) {
+    void executeStrategy(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta, ObjectName on, ServiceRegistryWrapper services) throws NetconfConfigHandlingException {
         for (Entry<String, AttributeConfigElement> configAttributeEntry : configuration.entrySet()) {
             try {
                 AttributeConfigElement ace = configAttributeEntry.getValue();
@@ -46,12 +45,12 @@ public class ReplaceEditConfigStrategy extends AbstractEditConfigStrategy {
                 if (!ace.getResolvedValue().isPresent()) {
                     Object value = ace.getResolvedDefaultValue();
                     ta.setAttribute(on, ace.getJmxName(), new Attribute(ace.getJmxName(), value));
-                    logger.debug("Attribute {} set to default value {} for {}", configAttributeEntry.getKey(), value,
+                    LOG.debug("Attribute {} set to default value {} for {}", configAttributeEntry.getKey(), value,
                             on);
                 } else {
                     Object value = ace.getResolvedValue().get();
                     ta.setAttribute(on, ace.getJmxName(), new Attribute(ace.getJmxName(), value));
-                    logger.debug("Attribute {} set to value {} for {}", configAttributeEntry.getKey(), value, on);
+                    LOG.debug("Attribute {} set to value {} for {}", configAttributeEntry.getKey(), value, on);
                 }
 
             } catch (Exception e) {