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%2Fmapping%2Fconfig%2FServices.java;h=74655f938fdcacf58417fe3e6a8efca79b517e59;hp=a49eda31f17af85bb41304ca42f8b95cfbed9647;hb=b38840f0ca28b5968bf3841e7bde37d8904ca878;hpb=9ad394ce89be3a36de94be385ae3190583a29c69

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/Services.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/Services.java
index a49eda31f1..74655f938f 100644
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/Services.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/config/Services.java
@@ -23,11 +23,13 @@ import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml.ObjectNameAttributeReadingStrategy;
 import org.opendaylight.controller.netconf.util.xml.XmlElement;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
+import org.opendaylight.yangtools.yang.data.api.ModifyAction;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public final class Services {
 
+    private static final String EMPTY_PROVIDER = "";
     private static final String PROVIDER_KEY = "provider";
     private static final String NAME_KEY = "name";
     public static final String TYPE_KEY = "type";
@@ -68,9 +70,11 @@ public final class Services {
                     }
 
                     String refName = refEntry.getKey();
-
-                    ServiceInstance serviceInstance = ServiceInstance.fromString(refEntry.getValue());
-                    refNameToInstance.put(refName, serviceInstance);
+                    //we want to compare reference not value of the provider
+                    refNameToInstance.put(refName, refEntry.getValue() == EMPTY_PROVIDER
+                            //provider name cannot be EMPTY_PROVIDER instance unless we are executing delete
+                            ? ServiceInstance.EMPTY_SERVICE_INSTANCE
+                            : ServiceInstance.fromString(refEntry.getValue()));
 
                 }
             }
@@ -114,12 +118,21 @@ public final class Services {
                 XmlElement nameElement = instance.getOnlyChildElement(NAME_KEY);
                 String refName = nameElement.getTextContent();
 
-                XmlElement providerElement = instance.getOnlyChildElement(PROVIDER_KEY);
-                String providerName = providerElement.getTextContent();
+                if (!ModifyAction.DELETE.toString().toLowerCase().equals(
+                        instance.getAttribute(
+                                XmlNetconfConstants.OPERATION_ATTR_KEY,
+                                XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0)))
+                {
+                    XmlElement providerElement = instance.getOnlyChildElement(PROVIDER_KEY);
+                    String providerName = providerElement.getTextContent();
 
-                instance.checkUnrecognisedElements(nameElement, providerElement);
+                    instance.checkUnrecognisedElements(nameElement, providerElement);
 
-                innerMap.put(refName, providerName);
+                    innerMap.put(refName, providerName);
+                } else {
+                    //since this is a delete we dont have a provider name - we want empty service instance
+                    innerMap.put(refName, EMPTY_PROVIDER);
+                }
             }
         }
 
@@ -161,6 +174,8 @@ public final class Services {
     }
 
     public static final class ServiceInstance {
+        public static final ServiceInstance EMPTY_SERVICE_INSTANCE = new ServiceInstance("", "");
+
         public ServiceInstance(String moduleName, String instanceName) {
             this.moduleName = moduleName;
             this.instanceName = instanceName;