added LMI_ to classnames prefix for to key properties

previous pattern of key properties:
  LMI:ShortClassName:*

replaces with
  LMI:FullClassName:*

where
  FullClassName = "LMI_" + ShortClassName

7 files changed, 23 insertions, 23 deletions

diff --git a/src/software/test/test_hosted_software_collection.py b/src/software/test/test_hosted_software_collection.py
index ccd00b8..c260210 100755
--- a/src/software/test/test_hosted_software_collection.py
+++ b/src/software/test/test_hosted_software_collection.py
@@ -57,7 +57,7 @@ class TestHostedSoftwareCollection(base.SoftwareBaseTestCase):
                 classname="LMI_SystemSoftwareCollection",
                 namespace="root/cimv2",
                 keybindings=pywbem.NocaseDict({
-                    "InstanceID" : "LMI:SystemSoftwareCollection"
+                    "InstanceID" : "LMI:LMI_SystemSoftwareCollection"
                 }))
         return objpath
 
diff --git a/src/software/test/test_installed_software_identity.py b/src/software/test/test_installed_software_identity.py
index ade841b..72bb7cd 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:SoftwareIdentity:' + pkg.get_nevra(newer=newer,
+                    "InstanceID" : 'LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertIn('LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertNotIn('LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
+        self.assertIn('LMI:LMI_SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
                 set(i["InstalledSoftware"]["InstanceID"] for i in inames3))
 
     @base.mark_dangerous
@@ -221,11 +221,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:SoftwareIdentity:"))
+            self.assertTrue(ref["InstanceID"].startswith("LMI:LMI_SoftwareIdentity:"))
 
         nevra_set = set(i["InstanceID"] for i in refs)
         for pkg in self.safe_pkgs:
-            nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
+            nevra = 'LMI: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 0f6bac8..50c3b86 100755
--- a/src/software/test/test_member_of_software_collection.py
+++ b/src/software/test/test_member_of_software_collection.py
@@ -44,13 +44,13 @@ class TestMemberOfSoftwareCollection(base.SoftwareBaseTestCase):
                 classname="LMI_SystemSoftwareCollection",
                 namespace="root/cimv2",
                 keybindings=pywbem.NocaseDict({
-                    "InstanceID" : "LMI:SystemSoftwareCollection"
+                    "InstanceID" : "LMI:LMI_SystemSoftwareCollection"
                 }))
         objpath["Member"] = pywbem.CIMInstanceName(
                 classname="LMI_SoftwareIdentity",
                 namespace="root/cimv2",
                 keybindings=pywbem.NocaseDict({
-                    "InstanceID" : 'LMI:SoftwareIdentity:' + pkg.get_nevra(newer=newer,
+                    "InstanceID" : 'LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
+#            nevra = 'LMI: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:SoftwareIdentity:"))
+#            self.assertTrue(ref["InstanceID"].startswith("LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS")
+#            nevra = 'LMI: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 0a6afbb..d38da46 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:SoftwareIdentity:' + pkg.get_nevra(newer=newer, with_epoch="ALWAYS")
+                'LMI:LMI_SoftwareIdentity:' + pkg.get_nevra(newer=newer, with_epoch="ALWAYS")
         return objpath
 
     @base.mark_dangerous
@@ -105,13 +105,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:SoftwareIdentity:"))
+                self.assertTrue(ref["InstanceID"].startswith("LMI: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:SoftwareIdentity:'+pkg.get_nevra(
+                nevra = 'LMI:LMI_SoftwareIdentity:'+pkg.get_nevra(
                         newer=up, with_epoch="ALWAYS")
                 reponame = getattr(pkg, 'up_repo' if up else 'repo')
                 if reponame == repo.repoid:
@@ -139,7 +139,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:SoftwareIdentity:"))
+                self.assertTrue(ref["InstanceID"].startswith("LMI:LMI_SoftwareIdentity:"))
 
     @base.mark_dangerous
     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 cf92bab..3b94e01 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:SoftwareIdentity:'+pkg.get_nevra(newer, "ALWAYS")
+        objpath["InstanceID"] = 'LMI: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:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"),
+            self.assertIn('LMI: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:SoftwareIdentity:"+pkg.get_nevra(with_epoch="ALWAYS"),
+#            self.assertIn("LMI: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 34e5008..5c3c329 100755
--- a/src/software/test/test_software_identity_resource.py
+++ b/src/software/test/test_software_identity_resource.py
@@ -106,7 +106,7 @@ class TestSoftwareIdentityResource(
         self.assertEqual(5, inst["HealthState"])
         self.assertIsInstance(inst["GPGCheck"], bool)
         self.assertEqual(200, inst["InfoFormat"])
-        self.assertEqual("LMI:SoftwareIdentityResource:"+repo.repoid,
+        self.assertEqual("LMI:LMI_SoftwareIdentityResource:"+repo.repoid,
                 inst["InstanceID"])
         if repo.mirror_list is None and repo.metalink is None:
             self.assertIsNone(inst["MirrorList"])
diff --git a/src/software/test/test_system_software_collection.py b/src/software/test/test_system_software_collection.py
index d68da47..bf33c56 100755
--- a/src/software/test/test_system_software_collection.py
+++ b/src/software/test/test_system_software_collection.py
@@ -41,7 +41,7 @@ class TestSystemSoftwareCollection(
         @return object path of SoftwareIdentity
         """
         objpath = self.objpath.copy()
-        objpath["InstanceID"] = "LMI:SystemSoftwareCollection"
+        objpath["InstanceID"] = "LMI:LMI_SystemSoftwareCollection"
         return objpath
 
     def test_get_instance(self):