omc-commit Mailing List for OMC - Open Management with CIM

Revision: 538
          http://omc.svn.sourceforge.net/omc/?rev=538&view=rev
Author:   npaxton
Date:     2008-03-31 12:42:19 -0700 (Mon, 31 Mar 2008)

Log Message:
-----------
Referred to OMC_LinuxOperatingSystem... doesn't exist... Changed to OMC_OperatingSystem

Modified Paths:
--------------
    pybase/trunk/OMC_UnixProcess.py

Modified: pybase/trunk/OMC_UnixProcess.py
===================================================================
--- pybase/trunk/OMC_UnixProcess.py	2008-03-26 19:44:45 UTC (rev 537)
+++ pybase/trunk/OMC_UnixProcess.py	2008-03-31 19:42:19 UTC (rev 538)
@@ -206,7 +206,7 @@
 
     def get_instance_name(self, ns):
         return pywbem.CIMInstanceName(classname='OMC_UnixProcess', namespace=ns,
-                keybindings={'OSCreationClassName':'OMC_LinuxOperatingSystem',
+                keybindings={'OSCreationClassName':'OMC_OperatingSystem',
                              'CreationClassName':'OMC_UnixProcess',
                              'Handle':str(self.pid),
                              'CSCreationClassName':'OMC_UnitaryComputerSystem',
@@ -454,7 +454,7 @@
     """
 
     def fill_instance(self, model, lp, keys_only=False):
-        model['OSCreationClassName'] = 'OMC_LinuxOperatingSystem'
+        model['OSCreationClassName'] = 'OMC_OperatingSystem'
         model['CreationClassName'] = 'OMC_UnixProcess'
         model['Handle'] = str(lp.pid)
         model['CSCreationClassName'] = 'OMC_UnitaryComputerSystem'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 537
          http://omc.svn.sourceforge.net/omc/?rev=537&view=rev
Author:   npaxton
Date:     2008-03-26 12:44:45 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Add ComputerSystemHostNameSettingData association class instrumentation

Modified Paths:
--------------
    pybase/trunk/OMC_UnitaryComputerSystem-peg.reg
    pybase/trunk/OMC_UnitaryComputerSystem.py

Modified: pybase/trunk/OMC_UnitaryComputerSystem-peg.reg
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem-peg.reg	2008-02-14 03:50:09 UTC (rev 536)
+++ pybase/trunk/OMC_UnitaryComputerSystem-peg.reg	2008-03-26 19:44:45 UTC (rev 537)
@@ -36,5 +36,13 @@
     ProviderType = {2}; // Instance
 };
 
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_ComputerSystemHostNameSettingData";
+    ProviderModuleName = "/usr/lib/pycim/OMC_UnitaryComputerSystem.py";
+    ProviderName = "OMC_UnitaryComputerSystem"; 
+    ClassName = "OMC_ComputerSystemHostNameSettingData";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,3}; // Instance, Associator
+};
 
-

Modified: pybase/trunk/OMC_UnitaryComputerSystem.py
===================================================================
--- pybase/trunk/OMC_UnitaryComputerSystem.py	2008-02-14 03:50:09 UTC (rev 536)
+++ pybase/trunk/OMC_UnitaryComputerSystem.py	2008-03-26 19:44:45 UTC (rev 537)
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (C) 2007 Novell, Inc. All rights reserved.
+# Copyright (C) 2007,2008 Novell, Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -599,9 +599,138 @@
         
 ## end of class OMC_HostNameSettingDataProvider
 
+
+class OMC_ComputerSystemHostNameSettingDataProvider(pywbem.CIMProvider):
+    """Instrument the CIM class OMC_ComputerSystemHostNameSettingData 
+
+    OMC_ComputerSystemSettingData is associates  the computer name setting
+    with the computer system
+    
+    """
+    def get_hnsd_path(self, ns):
+        hnsd = pywbem.CIMInstanceName(classname = 'OMC_HostNameSettingData', \
+                namespace=ns, \
+                keybindings={'InstanceID':'omc:computername'})
+        return hnsd
+        
+    def get_cs_path(self, ns):
+        cs_path = pywbem.CIMInstanceName(classname='OMC_UnitaryComputerSystem', \
+                namespace=ns, \
+                keybindings={'CreationClassName':'OMC_UnitaryComputerSystem', \
+                             'Name': getfqdn() })
+        return cs_path
+
+    def __init__ (self, env):
+        logger = env.get_logger()
+        logger.log_debug('Initializing provider %s from %s' \
+                % (self.__class__.__name__, __file__))
+        # If you will be filtering instances yourself according to 
+        # property_list, role, result_role, and result_class_name 
+        # parameters, set self.filter_results to False
+        # self.filter_results = False
+
+    def get_instance(self, env, model, cim_class):
+        logger = env.get_logger()
+        logger.log_debug('Entering %s.get_instance()' \
+                % self.__class__.__name__)
+
+        if model['SettingData']['InstanceID'] == 'omc:computername' and \
+                model['ManagedElement']['Name'] == getfqdn() and \
+                model['ManagedElement']['CreationClassName'] == 'OMC_UnitaryComputerSystem':        
+
+            ux = model.update_existing
+
+            # SettingData has additional fields on it
+            # These are not applicable for HostNameSettingData
+            # We'll set the IsCurrent and isDefault to TRUE, but ignore others
+            ux(IsCurrent=self.Values.IsCurrent.Is_Current) 
+            ux(IsDefault=self.Values.IsDefault.Is_Default) 
+            return model
+
+    def enum_instances(self, env, model, cim_class, keys_only):
+        logger = env.get_logger()
+        logger.log_debug('Entering %s.enum_instances()' \
+                % self.__class__.__name__)
+                
+        #one and only one instance?
+
+        model['SettingData'] = self.get_hnsd_path(model.path.namespace)
+        model['ManagedElement'] = self.get_cs_path(model.path.namespace)
+        yield model
+
+    def set_instance(self, env, instance, previous_instance, cim_class):
+        raise pywbem.CIMError(pywbem.CIM_ERR_NOT_SUPPORTED)
+
+    def delete_instance(self, env, instance_name):
+        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):
+        logger = env.get_logger()
+        logger.log_debug('Entering %s.references()' \
+                % self.__class__.__name__)
+        ch = env.get_cimom_handle()
+        # This is a common pattern.  YMMV
+        if (not role or role.lower() == 'settingdata') and \
+           pywbem.is_subclass(ch, object_name.namespace, 
+                       sub=object_name.classname, 
+                       super='OMC_HostNameSettingData'):
+            if object_name['InstanceID'] == 'omc:computername':
+                model['SettingData'] = object_name
+                model['ManagedElement']= self.get_cs_path(model.path.namespace)
+            yield model
+
+        if (not role or role.lower() == 'managedelement') and \
+           pywbem.is_subclass(ch, object_name.namespace, 
+                       sub=object_name.classname, 
+                       super='OMC_UnitaryComputerSystem'):
+            if object_name['Name'] == getfqdn() and \
+                    object_name['CreationClassName'] == 'OMC_UnitaryComputerSystem':
+                model['ManagedElement'] = object_name
+                model['SettingData'] = self.get_hnsd_path(model.path.namespace)
+                yield model
+                
+    class Values(object):
+        class IsDefault(object):
+            Unknown = pywbem.Uint16(0)
+            Is_Default = pywbem.Uint16(1)
+            Is_Not_Default = pywbem.Uint16(2)
+
+        class IsMaximum(object):
+            Unknown = pywbem.Uint16(0)
+            Not_Applicable = pywbem.Uint16(1)
+            Is_Maximum = pywbem.Uint16(2)
+            Is_Not_Maximum = pywbem.Uint16(3)
+
+        class IsMinimum(object):
+            Unknown = pywbem.Uint16(0)
+            Not_Applicable = pywbem.Uint16(1)
+            Is_Minimum = pywbem.Uint16(2)
+            Is_Not_Minimum = pywbem.Uint16(3)
+
+        class IsCurrent(object):
+            Unknown = pywbem.Uint16(0)
+            Is_Current = pywbem.Uint16(1)
+            Is_Not_Current = pywbem.Uint16(2)
+
+        class IsNext(object):
+            Unknown = pywbem.Uint16(0)
+            Is_Next = pywbem.Uint16(1)
+            Is_Not_Next = pywbem.Uint16(2)
+            Is_Next_For_Single_Use = pywbem.Uint16(3)
+
+## end of class OMC_ComputerSystemHostNameSettingDataProvider
+
+
+
 def get_providers(env): # register provider
     omc_hostnamesettingdata_prov = OMC_HostNameSettingDataProvider(env)  
     omc_unitarycomputersystem_prov = OMC_UnitaryComputerSystemProvider() 
+    omc_computersystemhostnamesettingdata_prov = OMC_ComputerSystemHostNameSettingDataProvider(env)  
     return {'OMC_UnitaryComputerSystem': omc_unitarycomputersystem_prov,
-        'OMC_HostNameSettingData': omc_hostnamesettingdata_prov} 
+        'OMC_HostNameSettingData': omc_hostnamesettingdata_prov,
+        'OMC_ComputerSystemHostNameSettingData': omc_computersystemhostnamesettingdata_prov} 
 
+
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.