Fix config-netconf-connector needed for interacting with yuma's yangcli.

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / mapping / attributes / resolving / ObjectNameAttributeResolvingStrategy.java

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectNameAttributeResolvingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectNameAttributeResolvingStrategy.java
index 5469015a2306089a44ab497306969737daf72267..af6e3db8e9406827868cfe214ee498bc2ac0c08c 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectNameAttributeResolvingStrategy.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/ObjectNameAttributeResolvingStrategy.java
@@ -39,8 +39,14 @@ public class ObjectNameAttributeResolvingStrategy extends AbstractAttributeResol
         Util.checkType(value, ObjectNameAttributeMappingStrategy.MappedDependency.class);
 
         ObjectNameAttributeMappingStrategy.MappedDependency mappedDep = (ObjectNameAttributeMappingStrategy.MappedDependency) value;
-        ServiceInstance byRefName = serviceTracker.getByServiceAndRefName(mappedDep.getServiceName(),
-                mappedDep.getRefName());
+        String serviceName = mappedDep.getServiceName();
+        if (serviceName.contains(":")) {
+            // hack for yuma
+            serviceName = serviceName.substring(serviceName.indexOf(":") + 1);
+        }
+        String refName = mappedDep.getRefName();
+        logger.trace("Getting service instance by service name {} and ref name {}", serviceName, refName);
+        ServiceInstance byRefName = serviceTracker.getByServiceAndRefName(serviceName, refName);
         ObjectName on = ObjectNameUtil.createReadOnlyModuleON(byRefName.getModuleName(), byRefName.getInstanceName());
         logger.debug("Attribute {} : {} parsed to type {}", attrName, value, getOpenType());
         return Optional.of(on);