diff options
Diffstat (limited to 'src/software')
16 files changed, 43 insertions, 43 deletions
diff --git a/src/software/cli/software.py b/src/software/cli/software.py index 55c3592..effc0c4 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:SoftwareIdentity:"):] + print nevra[len("LMI:LMI_SoftwareIdentity:"):] def list_installed(_conn): """List nevra strings of installed packages.""" diff --git a/src/software/openlmi/software/LMI_SoftwareInstallationService.py b/src/software/openlmi/software/LMI_SoftwareInstallationService.py index 8d29b3d..84f957a 100644 --- a/src/software/openlmi/software/LMI_SoftwareInstallationService.py +++ b/src/software/openlmi/software/LMI_SoftwareInstallationService.py @@ -80,7 +80,7 @@ class LMI_SoftwareInstallationService(CIMProvider2): model['EnabledDefault'] = self.values.EnabledDefault.Not_Applicable model['EnabledState'] = self.values.EnabledState.Not_Applicable model['HealthState'] = self.values.HealthState.OK - model['InstanceID'] = 'LMI:InstallationService' + model['InstanceID'] = 'LMI:LMI_InstallationService' model['OperatingStatus'] = self.values.OperatingStatus.Servicing model['OperationalStatus'] = [self.values.OperationalStatus.OK] model['PrimaryStatus'] = self.values.PrimaryStatus.OK diff --git a/src/software/openlmi/software/core/Identity.py b/src/software/openlmi/software/core/Identity.py index eda0ab9..9208dcb 100644 --- a/src/software/openlmi/software/core/Identity.py +++ b/src/software/openlmi/software/core/Identity.py @@ -170,10 +170,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:softwareidentity:"): + if not instid.lower().startswith("lmi:lmi_softwareidentity:"): raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, - "InstanceID must start with LMI:SoftwareIdentity: prefix.") - instid = instid[len("LMI:SoftwareIdentity:"):] + "InstanceID must start with LMI:LMI_SoftwareIdentity: prefix.") + instid = instid[len("LMI:LMI_SoftwareIdentity:"):] match = util.RE_NEVRA_OPT_EPOCH.match(instid) if not match: raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, @@ -241,7 +241,7 @@ def pkg2model(pkg, keys_only=True, model=None): if not keys_only: model = pywbem.CIMInstance("LMI_SoftwareIdentity", path=model) nevra = pkg if isinstance(pkg, basestring) else pkg.nevra - model['InstanceID'] = 'LMI:SoftwareIdentity:'+nevra + model['InstanceID'] = 'LMI:LMI_SoftwareIdentity:'+nevra if not keys_only: model.path['InstanceID'] = model['InstanceID'] #pylint: disable=E1103 model['Caption'] = pkg.summary diff --git a/src/software/openlmi/software/core/IdentityResource.py b/src/software/openlmi/software/core/IdentityResource.py index 579b0f1..cae81df 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:SoftwareIdentityResource:' + repo.repoid + model['InstanceID'] = 'LMI:LMI_SoftwareIdentityResource:' + repo.repoid if repo.mirror_list: model["MirrorList"] = repo.mirror_list else: diff --git a/src/software/openlmi/software/core/InstallationJob.py b/src/software/openlmi/software/core/InstallationJob.py index 2ac1f10..7b06be2 100644 --- a/src/software/openlmi/software/core/InstallationJob.py +++ b/src/software/openlmi/software/core/InstallationJob.py @@ -481,7 +481,7 @@ def job2model(job, keys_only=True, model=None): path=model) jobid = job.jobid if isinstance(job, jobs.YumAsyncJob) else job - model['InstanceID'] = 'LMI:SoftwareInstallationJob:%d' % jobid + model['InstanceID'] = 'LMI:LMI_SoftwareInstallationJob:%d' % jobid if isinstance(model, pywbem.CIMInstance): model.path['InstanceID'] = model['InstanceID'] #pylint: disable=E1103 if not keys_only: @@ -500,11 +500,11 @@ def object_path2job(op): 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:softwareinstallationjob:"): + if not instid.lower().startswith("lmi:lmi_softwareinstallationjob:"): raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, - "InstanceID must start with LMI:SoftwareInstallationJob: prefix.") + "InstanceID must start with LMI:LMI_SoftwareInstallationJob: prefix.") try: - instid = int(instid[len("LMI:SoftwareInstallationJob:"):]) + instid = int(instid[len("LMI:LMI_SoftwareInstallationJob:"):]) except ValueError: raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, 'Invalid InstanceID "%s"' % instid) diff --git a/src/software/openlmi/software/core/InstallationService.py b/src/software/openlmi/software/core/InstallationService.py index beb4351..acc7ca6 100644 --- a/src/software/openlmi/software/core/InstallationService.py +++ b/src/software/openlmi/software/core/InstallationService.py @@ -547,7 +547,7 @@ def get_path(): systemop = ComputerSystem.get_path() op["SystemCreationClassName"] = systemop.classname op['SystemName'] = systemop["Name"] - op["Name"] = "LMI:SoftwareInstallationService" + op["Name"] = "LMI:LMI_SoftwareInstallationService" return op @cmpi_logging.trace_function diff --git a/src/software/openlmi/software/core/InstallationServiceCapabilities.py b/src/software/openlmi/software/core/InstallationServiceCapabilities.py index 4fbc5ec..f801790 100644 --- a/src/software/openlmi/software/core/InstallationServiceCapabilities.py +++ b/src/software/openlmi/software/core/InstallationServiceCapabilities.py @@ -147,7 +147,7 @@ def get_path(): op = pywbem.CIMInstanceName( classname="LMI_SoftwareInstallationServiceCapabilities", namespace="root/cimv2") - op['InstanceID'] = "LMI:SoftwareInstallationServiceCapabilities" + op['InstanceID'] = "LMI:LMI_SoftwareInstallationServiceCapabilities" return op @cmpi_logging.trace_function @@ -200,9 +200,9 @@ def get_instance(model=None): model['InstanceID'] = path['InstanceID'] model['CanAddToCollection'] = True - model['Caption'] = 'Capabilities of LMI:SoftwareInstallationService' + model['Caption'] = 'Capabilities of LMI:LMI_SoftwareInstallationService' model['Description'] = ('This instance provides information' - ' about LMI:SoftwareInstallationService\'s capabilities.') + ' about LMI:LMI_SoftwareInstallationService\'s capabilities.') model['SupportedAsynchronousActions'] = [ Values.SupportedAsynchronousActions.Install_From_Software_Identity, Values.SupportedAsynchronousActions.Install_from_URI] diff --git a/src/software/openlmi/software/core/MethodResult.py b/src/software/openlmi/software/core/MethodResult.py index 7bfdac5..723edbb 100644 --- a/src/software/openlmi/software/core/MethodResult.py +++ b/src/software/openlmi/software/core/MethodResult.py @@ -32,10 +32,10 @@ def object_path2jobid(op): """ if not isinstance(op, pywbem.CIMInstanceName): raise TypeError("op must be a CIMInstanceName") - if not op["InstanceID"].lower().startswith('lmi:softwaremethodresult:'): + if not op["InstanceID"].lower().startswith('lmi:lmi_softwaremethodresult:'): raise pywbem.CIMError(pywbem.CIM_ERR_NOT_FOUND, - "Missing 'LMI:SoftwareMethodResult:' prefix in InstanceID.") - instid = op['InstanceID'][len('LMI:SoftwareMethodResult:'):] + "Missing 'LMI:LMI_SoftwareMethodResult:' prefix in InstanceID.") + instid = op['InstanceID'][len('LMI:LMI_SoftwareMethodResult:'):] try: instid = int(instid) except ValueError: @@ -66,7 +66,7 @@ def job2model(job, keys_only=True, model=None): namespace="root/cimv2") if not keys_only: model = pywbem.CIMInstance("LMI_SoftwareMethodResult", path=model) - model['InstanceID'] = "LMI:SoftwareMethodResult:"+str(job.jobid) + model['InstanceID'] = "LMI:LMI_SoftwareMethodResult:"+str(job.jobid) if not keys_only: model.path['InstanceID'] = model['InstanceID'] #pylint: disable=E1103 model['Caption'] = 'Result of method %s' % job.metadata['method_name'] diff --git a/src/software/openlmi/software/core/SystemCollection.py b/src/software/openlmi/software/core/SystemCollection.py index 2d07130..d07ecdd 100644 --- a/src/software/openlmi/software/core/SystemCollection.py +++ b/src/software/openlmi/software/core/SystemCollection.py @@ -28,7 +28,7 @@ def get_path(): op = pywbem.CIMInstanceName( classname="LMI_SystemSoftwareCollection", namespace="root/cimv2") - op['InstanceID'] = "LMI:SystemSoftwareCollection" + op['InstanceID'] = "LMI:LMI_SystemSoftwareCollection" return op @cmpi_logging.trace_function 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): |