import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
-
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.management.ObjectName;
import org.opendaylight.controller.config.api.jmx.ObjectNameUtil;
import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
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;
-import javax.management.ObjectName;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
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";
}
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()));
}
}
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);
+ }
}
}
Element root = XmlUtil.createElement(document, XmlNetconfConstants.SERVICES_KEY, Optional.of(XmlNetconfConstants.URN_OPENDAYLIGHT_PARAMS_XML_NS_YANG_CONTROLLER_CONFIG));
Map<String, Map<String, Map<String, String>>> mappedServices = serviceRegistryWrapper.getMappedServices();
- for (String namespace : mappedServices.keySet()) {
+ for (Entry<String, Map<String, Map<String, String>>> namespaceToRefEntry : mappedServices.entrySet()) {
- for (Entry<String, Map<String, String>> serviceEntry : mappedServices.get(namespace).entrySet()) {
+ for (Entry<String, Map<String, String>> serviceEntry : namespaceToRefEntry.getValue().entrySet()) {
// service belongs to config.yang namespace
Element serviceElement = XmlUtil.createElement(document, SERVICE_KEY, Optional.<String>absent());
root.appendChild(serviceElement);
// type belongs to config.yang namespace
String serviceType = serviceEntry.getKey();
Element typeElement = XmlUtil.createTextElementWithNamespacedContent(document, XmlNetconfConstants.TYPE_KEY,
- XmlNetconfConstants.PREFIX, namespace, serviceType);
+ XmlNetconfConstants.PREFIX, namespaceToRefEntry.getKey(), serviceType);
serviceElement.appendChild(typeElement);
}
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;