Added support for persistance of service references to netconf.

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

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
index 2a4a784a8a7bea85a4bcfdc3ee10836d00b5aa1d..06befb0565067592b58465782d66caa74a568100 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/MergeEditConfigStrategy.java
@@ -8,37 +8,67 @@
 
 package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.management.Attribute;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.ObjectName;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import org.opendaylight.controller.config.util.ConfigTransactionClient;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml.AttributeConfigElement;
+import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.Services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.management.Attribute;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+import java.util.Map;
+import java.util.Map.Entry;
+
 public class MergeEditConfigStrategy extends AbstractEditConfigStrategy {
 
     private static final Logger logger = LoggerFactory.getLogger(MergeEditConfigStrategy.class);
+    private final Multimap<String, String> providedServices;
+
+    public MergeEditConfigStrategy() {
+        this.providedServices = HashMultimap.create();
+    }
+
+    public MergeEditConfigStrategy(Multimap<String, String> providedServices) {
+        this.providedServices = providedServices;
+    }
 
     @Override
     void handleMissingInstance(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta,
-            String module, String instance) {
-        ObjectName on;
+                               String module, String instance, Services services) {
+        ObjectName on = null;
         try {
             on = ta.createModule(module, instance);
             logger.info("New instance for {} {} created under name {}", module, instance, on);
-            executeStrategy(configuration, ta, on);
+            addRefNames(services, providedServices, module, instance, ta, on);
+            executeStrategy(configuration, ta, on, services);
         } catch (InstanceAlreadyExistsException e1) {
             throw new IllegalStateException("Unable to create instance for " + module + " : " + instance);
+        } catch (InstanceNotFoundException e) {
+            throw new IllegalStateException("Unable to save default ref name for instance " + on, e);
+        }
+    }
+
+    private void addRefNames(Services services, Multimap<String, String> providedServices, String module,
+            String instance, ConfigTransactionClient ta, ObjectName on) throws InstanceNotFoundException {
+        for (Entry<String, String> namespaceToService : providedServices.entries()) {
+
+            if(services.hasRefName(namespaceToService.getKey(),
+                    namespaceToService.getValue(), on))
+                continue;
+
+            String refName = services.getNewDefaultRefName(namespaceToService.getKey(), namespaceToService.getValue(),
+                    module, instance);
+            ta.saveServiceReference(
+                    ta.getServiceInterfaceName(namespaceToService.getKey(), namespaceToService.getValue()), refName, on);
         }
     }
 
     @Override
-    void executeStrategy(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta, ObjectName on) {
+    void executeStrategy(Map<String, AttributeConfigElement> configuration, ConfigTransactionClient ta, ObjectName on, Services services) {
         for (Entry<String, AttributeConfigElement> configAttributeEntry : configuration.entrySet()) {
             try {
                 AttributeConfigElement ace = configAttributeEntry.getValue();