X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fattributes%2Fresolving%2FObjectNameAttributeResolvingStrategy.java;h=c6f306b3605cdc83652efd36e53cca6bb9b9f446;hb=03abf047ba966c53f4901d36ae5198156d66dc05;hp=af6e3db8e9406827868cfe214ee498bc2ac0c08c;hpb=0ecc684421b03f8eb53cdd042fb3adc40f6732c7;p=controller.git

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 af6e3db8e9..c6f306b360 100644
--- 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
@@ -40,13 +40,11 @@ public class ObjectNameAttributeResolvingStrategy extends AbstractAttributeResol
 
         ObjectNameAttributeMappingStrategy.MappedDependency mappedDep = (ObjectNameAttributeMappingStrategy.MappedDependency) value;
         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);
+        String namespace = mappedDep.getNamespace();
+        logger.trace("Getting service instance by service name {} : {} and ref name {}", namespace, serviceName, refName);
+
+        ServiceInstance byRefName = serviceTracker.getByServiceAndRefName(namespace, serviceName, refName);
         ObjectName on = ObjectNameUtil.createReadOnlyModuleON(byRefName.getModuleName(), byRefName.getInstanceName());
         logger.debug("Attribute {} : {} parsed to type {}", attrName, value, getOpenType());
         return Optional.of(on);