1 files changed, 10 insertions, 10 deletions
diff --git a/src/software/lmi/software/core/IdentityResource.py b/src/software/lmi/software/core/IdentityResource.py
index 228015b..392dac7 100644
--- a/src/software/lmi/software/core/IdentityResource.py
+++ b/src/software/lmi/software/core/IdentityResource.py
@@ -20,10 +20,9 @@ Just a common functionality related to LMI_SoftwareIdentityResource provider.
 """
 
 import pywbem
-import socket
 
 from lmi.common import cmpi_logging
-from lmi.software.core import ComputerSystem
+from lmi.software import util
 from lmi.software.yumdb import YumDB
 from lmi.software.yumdb.repository import Repository
 
@@ -518,18 +517,19 @@ def object_path2repo(env, op, kind='enabled'):
           or not op["SystemCreationClassName"])
        or (not "SystemName" in op or not op["SystemName"])):
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, "Wrong keys.")
-    if op["SystemName"] != socket.gethostname():
+    if op["SystemName"] != util.Configuration().system_name:
         raise pywbem.CIMError(pywbem.CIM_ERR_NOT_FOUND,
                 'SystemName "%s" does not match "%s".' % (
-                    op["SystemName"], socket.gethostname()))
+                    op["SystemName"],
+                    util.Configuration.get_instance().system_name))
     ch = env.get_cimom_handle()
-    if not ch.is_subclass("root/cimv2",
+    if not ch.is_subclass(util.Configuration.get_instance().namespace,
             sub=op["CreationClassName"],
             super="CIM_SoftwareIdentityResource"):
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
                 'CreationClassName \"%s\" must be a subclass of "%s".' % (
                     op["CreationClassName"], "CIM_SoftwareIdentityResource"))
-    if not ch.is_subclass("root/cimv2",
+    if not ch.is_subclass(util.Configuration.get_instance().namespace,
             sub=op["SystemCreationClassName"],
             super="CIM_ComputerSystem"):
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
@@ -627,8 +627,7 @@ def repo2model(repo, keys_only=True, model=None):
     if not isinstance(repo, Repository):
         raise TypeError("pkg must be an instance of Repository")
     if model is None:
-        model = pywbem.CIMInstanceName("LMI_SoftwareIdentityResource",
-                namespace="root/cimv2")
+        model = util.new_instance_name("LMI_SoftwareIdentityResource")
         if not keys_only:
             model = pywbem.CIMInstance(
                     "LMI_SoftwareIdentityResource", path=model)
@@ -641,8 +640,9 @@ def repo2model(repo, keys_only=True, model=None):
         _set_key = model.__setitem__
     _set_key('CreationClassName', "LMI_SoftwareIdentityResource")
     _set_key("Name", repo.repoid)
-    _set_key("SystemCreationClassName", "Linux_ComputerSystem")
-    _set_key("SystemName", ComputerSystem.get_path()["Name"])
+    _set_key("SystemCreationClassName",
+            util.Configuration.get_instance().system_class_name)
+    _set_key("SystemName", util.Configuration.get_instance().system_name)
     if not keys_only:
         _fill_non_keys(repo, model)