diff options
author | Michal Minar <miminar@redhat.com> | 2013-03-26 11:07:44 +0100 |
---|---|---|
committer | Michal Minar <miminar@redhat.com> | 2013-03-26 11:57:17 +0100 |
commit | 4619526c1f0cab2da73f2b8e233e1ad7b52007b0 (patch) | |
tree | 150886f1e05bc92c8ed91cea1797b2ad8cf0db77 /src | |
parent | e4c58708ed07313059044a76c20a1336060cd473 (diff) | |
download | openlmi-providers-4619526c1f0cab2da73f2b8e233e1ad7b52007b0.tar.gz openlmi-providers-4619526c1f0cab2da73f2b8e233e1ad7b52007b0.tar.xz openlmi-providers-4619526c1f0cab2da73f2b8e233e1ad7b52007b0.zip |
small comments and spaces cleanup, removed tabs
removed redundant spaces in mof
Diffstat (limited to 'src')
-rw-r--r-- | src/software/openlmi/software/LMI_HostedSoftwareCollection.py | 15 | ||||
-rw-r--r-- | src/software/openlmi/software/cimom_entry.py | 8 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/software/openlmi/software/LMI_HostedSoftwareCollection.py b/src/software/openlmi/software/LMI_HostedSoftwareCollection.py index 113ce7c..4a51041 100644 --- a/src/software/openlmi/software/LMI_HostedSoftwareCollection.py +++ b/src/software/openlmi/software/LMI_HostedSoftwareCollection.py @@ -64,10 +64,6 @@ class LMI_HostedSoftwareCollection(CIMProvider2): CIM_ERR_FAILED (some other unspecified error occurred) """ - for key_prop in ("Antecedent", "Dependent"): - if not key_prop in model: - raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, - "Missing Antecedent key property!") ComputerSystem.check_path_property(env, model, "Antecedent") SystemCollection.check_path_property(env, model, "Dependent") @@ -99,11 +95,7 @@ class LMI_HostedSoftwareCollection(CIMProvider2): Possible Errors: CIM_ERR_FAILED (some other unspecified error occurred) - """ - # Prime model.path with knowledge of the keys, so key values on - # the CIMInstanceName (model.path) will automatically be set when - # we set property values on the model. model.path.update({'Dependent': None, 'Antecedent': None}) model["Antecedent"] = ComputerSystem.get_path() @@ -111,7 +103,6 @@ class LMI_HostedSoftwareCollection(CIMProvider2): yield model - @cmpi_logging.trace_method def set_instance(self, env, instance, modify_existing): """Return a newly created or modified instance. @@ -137,7 +128,6 @@ class LMI_HostedSoftwareCollection(CIMProvider2): if modify_existing is True, indicating that the operation was ModifyInstance) CIM_ERR_FAILED (some other unspecified error occurred) - """ raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED) @@ -161,7 +151,6 @@ class LMI_HostedSoftwareCollection(CIMProvider2): CIM_ERR_NOT_FOUND (the CIM Class does exist, but the requested CIM Instance does not exist in the specified namespace) CIM_ERR_FAILED (some other unspecified error occurred) - """ raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED) @@ -222,11 +211,9 @@ class LMI_HostedSoftwareCollection(CIMProvider2): CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized or otherwise incorrect parameters) CIM_ERR_FAILED (some other unspecified error occurred) - """ ch = env.get_cimom_handle() - # If you want to get references for free, implemented in terms - # of enum_instances, just leave the code below unaltered. + if ch.is_subclass(object_name.namespace, sub=object_name.classname, super='CIM_SystemSpecificCollection') or \ diff --git a/src/software/openlmi/software/cimom_entry.py b/src/software/openlmi/software/cimom_entry.py index a83f2b8..40ae357 100644 --- a/src/software/openlmi/software/cimom_entry.py +++ b/src/software/openlmi/software/cimom_entry.py @@ -45,13 +45,13 @@ from openlmi.software.LMI_SoftwareInstallationService import \ from openlmi.software.LMI_SoftwareInstallationJob import \ LMI_SoftwareInstallationJob from openlmi.software.LMI_SoftwareMethodResult import \ - LMI_SoftwareMethodResult + LMI_SoftwareMethodResult from openlmi.software.LMI_AffectedSoftwareJobElement import \ - LMI_AffectedSoftwareJobElement + LMI_AffectedSoftwareJobElement from openlmi.software.LMI_AssociatedSoftwareJobMethodResult import \ - LMI_AssociatedSoftwareJobMethodResult + LMI_AssociatedSoftwareJobMethodResult from openlmi.software.LMI_OwningSoftwareJobElement import \ - LMI_OwningSoftwareJobElement + LMI_OwningSoftwareJobElement from openlmi.software.yumdb import YumDB def get_providers(env): |