diff options
Diffstat (limited to 'src/software/openlmi/software/core')
7 files changed, 18 insertions, 18 deletions
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 |