Menu
▾
▴
[Omc-commit] SF.net SVN: omc: [523] pybase/trunk
|
From: <jc...@us...> - 2007-12-19 00:03:15
|
Revision: 523
http://omc.svn.sourceforge.net/omc/?rev=523&view=rev
Author: jcarey
Date: 2007-12-18 16:03:20 -0800 (Tue, 18 Dec 2007)
Log Message:
-----------
Operating System finished
Modified Paths:
--------------
pybase/trunk/OMC_OperatingSystem.mof
pybase/trunk/OMC_OperatingSystem.py
pybase/trunk/OMC_UnitaryComputerSystem.mof
pybase/trunk/OMC_UnixProcess.mof
Modified: pybase/trunk/OMC_OperatingSystem.mof
===================================================================
--- pybase/trunk/OMC_OperatingSystem.mof 2007-12-18 23:37:41 UTC (rev 522)
+++ pybase/trunk/OMC_OperatingSystem.mof 2007-12-19 00:03:20 UTC (rev 523)
@@ -34,7 +34,7 @@
"At most one OperatingSystem can execute at any time on a "
"ComputerSystem. 'At most one' is specified, since the Computer "
"System may not be currently booted, or its OperatingSystem may "
- "be unknown.", Version("0.0.1") ]
+ "be unknown."), Version("0.0.1") ]
class OMC_RunningOS : CIM_RunningOS
{
[Override ( "Antecedent" ), Max ( 1 ), Description (
@@ -44,26 +44,26 @@
[Override ( "Dependent" ), Max ( 1 ), Description (
"The ComputerSystem.")]
- CIM_ComputerSystem REF Dependent;
+ OMC_UnitaryComputerSystem REF Dependent;
};
// ===================================================================
// InstalledOS
// ===================================================================
- [Association, Aggregation, Composition, Version ( "2.7.0" ),
+ [Association, Aggregation, Composition, Version ( "0.0.2" ),
Description (
"A link between the ComputerSystem and the OperatingSystem(s) "
"installed or loaded on it. An OperatingSystem is 'installed' "
"on a ComputerSystem, when placed on one of its StorageExtents "
"- for example, copied to a disk drive or downloaded to Memory. "
"Using this definition, an OperatingSystem is 'installed' on a "
- "NetPC when downloaded via the network.", Version("0.0.1") ]
+ "NetPC when downloaded via the network.")]
class OMC_InstalledOS : CIM_InstalledOS
{
[Aggregate, Override ( "GroupComponent" ), Min ( 1 ), Max ( 1 ),
Description (
"The ComputerSystem.")]
- CIM_ComputerSystem REF GroupComponent;
+ OMC_UnitaryComputerSystem REF GroupComponent;
[Override ( "PartComponent" ), Weak, Description (
"The OperatingSystem installed on the ComputerSystem.")]
Modified: pybase/trunk/OMC_OperatingSystem.py
===================================================================
--- pybase/trunk/OMC_OperatingSystem.py 2007-12-18 23:37:41 UTC (rev 522)
+++ pybase/trunk/OMC_OperatingSystem.py 2007-12-19 00:03:20 UTC (rev 523)
@@ -440,29 +440,6 @@
"""
def get_instance(self, env, model, cim_class):
- """Return an instance.
-
- Keyword arguments:
- env -- Provider Environment (pycimmb.ProviderEnvironment)
- model -- A template of the pywbem.CIMInstance to be returned. The
- key properties are set on this instance to correspond to the
- instanceName that was requested. The properties of the model
- are already filtered according to the PropertyList from the
- request. Only properties present in the model need to be
- given values. If you prefer, you can set all of the
- values, and the instance will be filtered for you.
- cim_class -- The pywbem.CIMClass
-
- Possible Errors:
- CIM_ERR_ACCESS_DENIED
- CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
- or otherwise incorrect parameters)
- 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)
-
- """
-
logger = env.get_logger()
logger.log_debug('Entering %s.get_instance()' \
% self.__class__.__name__)
@@ -471,29 +448,6 @@
return model
def enum_instances(self, env, model, cim_class, keys_only):
- """Enumerate instances.
-
- The WBEM operations EnumerateInstances and EnumerateInstanceNames
- are both mapped to this method.
- This method is a python generator
-
- Keyword arguments:
- env -- Provider Environment (pycimmb.ProviderEnvironment)
- model -- A template of the pywbem.CIMInstances to be generated.
- The properties of the model are already filtered according to
- the PropertyList from the request. Only properties present in
- the model need to be given values. If you prefer, you can
- always set all of the values, and the instance will be filtered
- for you.
- cim_class -- The pywbem.CIMClass
- keys_only -- A boolean. True if only the key properties should be
- set on the generated instances.
-
- Possible Errors:
- CIM_ERR_FAILED (some other unspecified error occurred)
-
- """
-
logger = env.get_logger()
logger.log_debug('Entering %s.enum_instances()' \
% self.__class__.__name__)
@@ -514,115 +468,13 @@
raise
def set_instance(self, env, instance, previous_instance, cim_class):
- """Return a newly created or modified instance.
+ raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED)
- Keyword arguments:
- env -- Provider Environment (pycimmb.ProviderEnvironment)
- instance -- The new pywbem.CIMInstance. If modifying an existing
- instance, the properties on this instance have been filtered by
- the PropertyList from the request.
- previous_instance -- The previous pywbem.CIMInstance if modifying
- an existing instance. None if creating a new instance.
- cim_class -- The pywbem.CIMClass
-
- Return the new instance. The keys must be set on the new instance.
-
- Possible Errors:
- CIM_ERR_ACCESS_DENIED
- CIM_ERR_NOT_SUPPORTED
- CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
- or otherwise incorrect parameters)
- CIM_ERR_ALREADY_EXISTS (the CIM Instance already exists -- only
- valid if previous_instance is None, indicating that the operation
- was CreateInstance)
- CIM_ERR_NOT_FOUND (the CIM Instance does not exist -- only valid
- if previous_instance is not None, indicating that the operation
- was ModifyInstance)
- CIM_ERR_FAILED (some other unspecified error occurred)
-
- """
-
- logger = env.get_logger()
- logger.log_debug('Entering %s.set_instance()' \
- % self.__class__.__name__)
- # TODO create or modify the instance
- raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED) # Remove to implement
- return instance
-
def delete_instance(self, env, instance_name):
- """Delete an instance.
-
- Keyword arguments:
- env -- Provider Environment (pycimmb.ProviderEnvironment)
- instance_name -- A pywbem.CIMInstanceName specifying the instance
- to delete.
-
- Possible Errors:
- CIM_ERR_ACCESS_DENIED
- CIM_ERR_NOT_SUPPORTED
- CIM_ERR_INVALID_NAMESPACE
- CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
- or otherwise incorrect parameters)
- CIM_ERR_INVALID_CLASS (the CIM Class does not exist in the specified
- namespace)
- 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)
-
- """
-
- logger = env.get_logger()
- logger.log_debug('Entering %s.delete_instance()' \
- % self.__class__.__name__)
-
- # TODO delete the resource
- raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED) # Remove to implement
+ raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED)
def references(self, env, object_name, model, assoc_class,
result_class_name, role, result_role, keys_only):
- """Instrument Associations.
-
- All four association-related operations (Associators, AssociatorNames,
- References, ReferenceNames) are mapped to this method.
- This method is a python generator
-
- Keyword arguments:
- env -- Provider Environment (pycimmb.ProviderEnvironment)
- object_name -- A pywbem.CIMInstanceName that defines the source
- CIM Object whose associated Objects are to be returned.
- model -- A template pywbem.CIMInstance to serve as a model
- of the objects to be returned. Only properties present on this
- model need to be set.
- assoc_class -- The pywbem.CIMClass.
- result_class_name -- If not None, this string acts as a filter on
- the returned set of Objects by mandating that each returned
- Object MUST be either an Instance of this Class (or one of its
- subclasses) or be this Class (or one of its subclasses).
- role -- If not None, this string acts as a filter on the returned
- set of Objects by mandating that each returned Object MUST be
- associated to the source Object via an Association in which the
- source Object plays the specified role (i.e. the name of the
- Property in the Association Class that refers to the source
- Object MUST match the value of this parameter).
- result_role -- If not None this string acts as a filter on the
- returned set of Objects by mandating that each returned Object
- MUST be associated to the source Object via an Association in
- which the returned Object plays the specified role (i.e. the
- name of the Property in the Association Class that refers to
- the returned Object MUST match the value of this parameter).
- keys_only -- A boolean. True if only the key properties should be
- set on the generated instances.
-
- Possible Errors:
- CIM_ERR_ACCESS_DENIED
- CIM_ERR_NOT_SUPPORTED
- CIM_ERR_INVALID_NAMESPACE
- CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
- or otherwise incorrect parameters)
- CIM_ERR_FAILED (some other unspecified error occurred)
-
- """
-
logger = env.get_logger()
logger.log_debug('Entering %s.references()' \
% self.__class__.__name__)
Modified: pybase/trunk/OMC_UnitaryComputerSystem.mof
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem.mof 2007-12-18 23:37:41 UTC (rev 522)
+++ pybase/trunk/OMC_UnitaryComputerSystem.mof 2007-12-19 00:03:20 UTC (rev 523)
@@ -17,9 +17,9 @@
};
//////////////////////////////////////////////////////////////////////////////
-[ Association, Version ( "2.7.0" ),
+[ Association, Version ( "0.0.1" ),
Description ("OMC_ComputerSystemSettingData is associates "
- " the computer name setting with the computer system"), Version("0.0.1") ]
+ " the computer name setting with the computer system")]
class OMC_ComputerSystemHostNameSettingData : CIM_ElementSettingData
{
[ Override("ManagedElement"), Key,
Modified: pybase/trunk/OMC_UnixProcess.mof
===================================================================
--- pybase/trunk/OMC_UnixProcess.mof 2007-12-18 23:37:41 UTC (rev 522)
+++ pybase/trunk/OMC_UnixProcess.mof 2007-12-19 00:03:20 UTC (rev 523)
@@ -21,7 +21,7 @@
//////////////////////////////////////////////////////////////////////////////
[ Association, Aggregation, Composition, Version ( "2.7.0" ),
Description ("A link between the OperatingSystem and Process(es) "
- "running in the context of this OperatingSystem."), Version("0.0.1") ]
+ "running in the context of this OperatingSystem.")]
class OMC_OSProcess : CIM_OSProcess
{
[Aggregate, Override ( "GroupComponent" ), Min ( 1 ), Max ( 1 ),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
