changed LMI:* prefixes in key properties

to avoid id collisions with other OpenLMI classes

8 files changed, 27 insertions, 26 deletions

diff --git a/src/software/cli/software.py b/src/software/cli/software.py
index 14c26df..9c250f2 100755
--- a/src/software/cli/software.py
+++ b/src/software/cli/software.py
@@ -106,7 +106,7 @@ def list_available(conn):
             Role="Collection",
             ResultRole="Member")
     for nevra in (i['InstanceID'] for i in inames):
-        print nevra[len("LMI:PKG:"):]
+        print nevra[len("LMI:SoftwareIdentity:"):]
 
 def list_installed(_conn):
     """List nevra strings of installed packages."""
diff --git a/src/software/openlmi/software/core/Identity.py b/src/software/openlmi/software/core/Identity.py
index 1668586..8c1efb8 100644
--- a/src/software/openlmi/software/core/Identity.py
+++ b/src/software/openlmi/software/core/Identity.py
@@ -169,10 +169,10 @@ def object_path2nevra(op, with_epoch='NOT_ZERO'):
     if (not "InstanceID" in op or not op['InstanceID']):
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, "Wrong keys.")
     instid = op['InstanceID']
-    if not instid.lower().startswith("lmi:pkg:"):
+    if not instid.lower().startswith("lmi:softwareidentity:"):
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
-                "InstanceID must start with LMI:PKG: prefix.")
-    instid = instid[len("LMI:PKG:"):]
+                "InstanceID must start with LMI:SoftwareIdentity: prefix.")
+    instid = instid[len("LMI:SoftwareIdentity:"):]
     match = util.RE_NEVRA_OPT_EPOCH.match(instid)
     if not match:
         raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER,
@@ -243,7 +243,7 @@ def pkg2model(pkg_info, keys_only=True, model=None):
             model.path[k] = value #pylint: disable=E1103
     else:
         _set_key = model.__setitem__
-    _set_key('InstanceID', 'LMI:PKG:'+pkg_info.nevra)
+    _set_key('InstanceID', 'LMI:SoftwareIdentity:'+pkg_info.nevra)
     if not keys_only:
         #model['BuildNumber'] = pywbem.Uint16() # TODO 
         model['Caption'] = pkg_info.summary
diff --git a/src/software/openlmi/software/core/IdentityResource.py b/src/software/openlmi/software/core/IdentityResource.py
index 722c29b..984a2cb 100644
--- a/src/software/openlmi/software/core/IdentityResource.py
+++ b/src/software/openlmi/software/core/IdentityResource.py
@@ -587,7 +587,7 @@ def _fill_non_keys(repo, model):
         model['Generation'] = pywbem.CIMProperty('Generation',
                 None, type='uint64')
     model['InfoFormat'] = Values.InfoFormat.URL
-    model['InstanceID'] = 'LMI:REPO:' + repo.repoid
+    model['InstanceID'] = 'LMI:SoftwareIdentityResource:' + repo.repoid
     if repo.mirror_list:
         model["MirrorList"] = repo.mirror_list
     else:
diff --git a/src/software/test/test_installed_software_identity.py b/src/software/test/test_installed_software_identity.py
index 1065c20..b05b9c2 100755
--- a/src/software/test/test_installed_software_identity.py
+++ b/src/software/test/test_installed_software_identity.py
@@ -53,7 +53,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase):
                 classname="LMI_SoftwareIdentity",
                 namespace="root/cimv2",
                 keybindings=pywbem.NocaseDict({
-                    "InstanceID" : 'LMI:PKG:' + pkg.get_nevra(newer=newer,
+                    "InstanceID" : 'LMI:SoftwareIdentity:' + pkg.get_nevra(newer=newer,
                         with_epoch="ALWAYS")
                 }))
         return objpath
@@ -104,7 +104,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase):
             self.assertEqual(objpath["System"], iname["System"])
         nevra_set = set(i["InstalledSoftware"]["InstanceID"] for i in inames)
         for pkg in self.safe_pkgs:
-            nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
             self.assertTrue(nevra in nevra_set,
                     'Missing nevra "%s".' % nevra)
 
@@ -126,7 +126,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase):
                 self.assertEqual(inst[key], inst.path[key])
         nevra_set = set(i["InstalledSoftware"]["InstanceID"] for i in insts)
         for pkg in self.safe_pkgs:
-            nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
             self.assertTrue(nevra in nevra_set, "Missing pkg %s in nevra_set."
                     % nevra)
 
@@ -143,21 +143,21 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase):
         inames1 = self.conn.EnumerateInstanceNames(
                 ClassName=self.CLASS_NAME)
         self.assertGreater(len(inames1), 1)
-        self.assertIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
                 set(i["InstalledSoftware"]["InstanceID"] for i in inames1))
 
         rpmcache.remove_pkg(pkg.name)
         inames2 = self.conn.EnumerateInstanceNames(
                 ClassName=self.CLASS_NAME)
         self.assertEqual(len(inames1), len(inames2) + 1)
-        self.assertNotIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertNotIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
                 set(i["InstalledSoftware"]["InstanceID"] for i in inames2))
 
         rpmcache.install_pkg(pkg)
         inames3 = self.conn.EnumerateInstanceNames(
                 ClassName=self.CLASS_NAME)
         self.assertEqual(len(inames1), len(inames3))
-        self.assertIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
                 set(i["InstalledSoftware"]["InstanceID"] for i in inames3))
 
     @base.mark_dangerous
@@ -222,11 +222,11 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase):
             self.assertEqual(ref.namespace, 'root/cimv2')
             self.assertEqual(ref.classname, "LMI_SoftwareIdentity")
             self.assertEqual(sorted(ref.keys()), ["InstanceID"])
-            self.assertTrue(ref["InstanceID"].startswith("LMI:PKG:"))
+            self.assertTrue(ref["InstanceID"].startswith("LMI:SoftwareIdentity:"))
 
         nevra_set = set(i["InstanceID"] for i in refs)
         for pkg in self.safe_pkgs:
-            nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
             self.assertTrue(nevra in nevra_set,
                     'Missing nevra "%s".' % nevra)
 
diff --git a/src/software/test/test_member_of_software_collection.py b/src/software/test/test_member_of_software_collection.py
index df259fe..5f0aa60 100755
--- a/src/software/test/test_member_of_software_collection.py
+++ b/src/software/test/test_member_of_software_collection.py
@@ -50,7 +50,7 @@ class TestMemberOfSoftwareCollection(base.SoftwareBaseTestCase):
                 classname="LMI_SoftwareIdentity",
                 namespace="root/cimv2",
                 keybindings=pywbem.NocaseDict({
-                    "InstanceID" : 'LMI:PKG:' + pkg.get_nevra(newer=newer,
+                    "InstanceID" : 'LMI:SoftwareIdentity:' + pkg.get_nevra(newer=newer,
                         with_epoch="ALWAYS")
                 }))
         return objpath
@@ -85,7 +85,7 @@ class TestMemberOfSoftwareCollection(base.SoftwareBaseTestCase):
 #            self.assertEqual(objpath["Collection"], iname["Collection"])
 #        nevra_set = set(i["Member"]["InstanceID"] for i in inames)
 #        for pkg in self.safe_pkgs:
-#            nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS")
+#            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
 #            self.assertTrue(nevra in nevra_set,
 #                    'Missing nevra "%s".' % nevra)
 
@@ -123,11 +123,11 @@ class TestMemberOfSoftwareCollection(base.SoftwareBaseTestCase):
 #            self.assertEqual(ref.namespace, 'root/cimv2')
 #            self.assertEqual(ref.classname, "LMI_SoftwareIdentity")
 #            self.assertEqual(sorted(ref.keys()), ["InstanceID"])
-#            self.assertTrue(ref["InstanceID"].startswith("LMI:PKG:"))
+#            self.assertTrue(ref["InstanceID"].startswith("LMI:SoftwareIdentity:"))
 #        nevra_set = set(i["InstanceID"] for i in refs)
 #        # NOTE: installed packages might not be available
 #        for pkg in self.dangerous_pkgs:
-#            nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS")
+#            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
 #            self.assertTrue(nevra in nevra_set,
 #                    'Missing nevra "%s".' % nevra)
 #
diff --git a/src/software/test/test_resource_for_software_identity.py b/src/software/test/test_resource_for_software_identity.py
index 15fc047..c48c19d 100755
--- a/src/software/test/test_resource_for_software_identity.py
+++ b/src/software/test/test_resource_for_software_identity.py
@@ -63,7 +63,7 @@ class TestResourceForSoftwareIdentity(base.SoftwareBaseTestCase):
                 namespace="root/cimv2")
         if pkg is not None:
             objpath["ManagedElement"]["InstanceID"] = \
-                'LMI:PKG:' + pkg.get_nevra(newer=newer, with_epoch="ALWAYS")
+                'LMI:SoftwareIdentity:' + pkg.get_nevra(newer=newer, with_epoch="ALWAYS")
         return objpath
 
     def test_get_instance(self):
@@ -104,13 +104,13 @@ class TestResourceForSoftwareIdentity(base.SoftwareBaseTestCase):
                 self.assertEqual(ref.namespace, 'root/cimv2')
                 self.assertEqual(ref.classname, "LMI_SoftwareIdentity")
                 self.assertEqual(sorted(ref.keys()), ["InstanceID"])
-                self.assertTrue(ref["InstanceID"].startswith("LMI:PKG:"))
+                self.assertTrue(ref["InstanceID"].startswith("LMI:SoftwareIdentity:"))
 
             nevra_set = set(i["InstanceID"] for i in refs)
             # NOTE: installed packages might not be available
             for pkg, up in ((pkg, up) for pkg in self.dangerous_pkgs
                     for up in (True, False)):
-                nevra = 'LMI:PKG:'+pkg.get_nevra(
+                nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(
                         newer=up, with_epoch="ALWAYS")
                 reponame = getattr(pkg, 'up_repo' if up else 'repo')
                 if reponame == repo.repoid:
@@ -138,7 +138,7 @@ class TestResourceForSoftwareIdentity(base.SoftwareBaseTestCase):
                 self.assertEqual(ref.namespace, 'root/cimv2')
                 self.assertEqual(ref.classname, "LMI_SoftwareIdentity")
                 self.assertEqual(sorted(ref.keys()), ["InstanceID"])
-                self.assertTrue(ref["InstanceID"].startswith("LMI:PKG:"))
+                self.assertTrue(ref["InstanceID"].startswith("LMI:SoftwareIdentity:"))
 
     def test_get_managed_element_referents(self):
         """
diff --git a/src/software/test/test_software_identity.py b/src/software/test/test_software_identity.py
index 934d4c9..e40cc8c 100755
--- a/src/software/test/test_software_identity.py
+++ b/src/software/test/test_software_identity.py
@@ -45,7 +45,7 @@ class TestSoftwareIdentity(base.SoftwareBaseTestCase): #pylint: disable=R0904
         @return object path of SoftwareIdentity
         """
         objpath = self.objpath.copy()
-        objpath["InstanceID"] = 'LMI:PKG:'+pkg.get_nevra(newer, "ALWAYS")
+        objpath["InstanceID"] = 'LMI:SoftwareIdentity:'+pkg.get_nevra(newer, "ALWAYS")
         return objpath
 
     @base.mark_dangerous
@@ -120,7 +120,7 @@ class TestSoftwareIdentity(base.SoftwareBaseTestCase): #pylint: disable=R0904
             self.assertEqual(sorted(iname.keys()), sorted(self.KEYS))
         nevra_set = set(i["InstanceID"] for i in inames)
         for pkg in self.safe_pkgs:
-            self.assertIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"),
+            self.assertIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
                     nevra_set)
 
 #    @base.mark_tedious
@@ -141,7 +141,7 @@ class TestSoftwareIdentity(base.SoftwareBaseTestCase): #pylint: disable=R0904
 #            nevra_set.add(inst["InstanceID"])
 #            name_set.add(inst["Name"])
 #        for pkg in self.safe_pkgs:
-#            self.assertIn("LMI:PKG:"+pkg.get_nevra(with_epoch="ALWAYS"),
+#            self.assertIn("LMI:SoftwareIdentity:"+pkg.get_nevra(with_epoch="ALWAYS"),
 #                    nevra_set)
 #            self.assertIn(pkg.name, name_set)
 
diff --git a/src/software/test/test_software_identity_resource.py b/src/software/test/test_software_identity_resource.py
index 13f05de..6de9b18 100755
--- a/src/software/test/test_software_identity_resource.py
+++ b/src/software/test/test_software_identity_resource.py
@@ -106,7 +106,8 @@ class TestSoftwareIdentityResource(
         self.assertEqual(5, inst["HealthState"])
         self.assertIsInstance(inst["GPGCheck"], bool)
         self.assertEqual(200, inst["InfoFormat"])
-        self.assertEqual("LMI:REPO:"+repo.repoid, inst["InstanceID"])
+        self.assertEqual("LMI:SoftwareIdentityResource:"+repo.repoid,
+                inst["InstanceID"])
         if repo.mirror_list is None and repo.metalink is None:
             self.assertIsNone(inst["MirrorList"])
         else: