diff options
21 files changed, 44 insertions, 44 deletions
diff --git a/src/account/doc/source/usage.rst b/src/account/doc/source/usage.rst index 7a2638a..f8a5e89 100644 --- a/src/account/doc/source/usage.rst +++ b/src/account/doc/source/usage.rst @@ -71,7 +71,7 @@ For user creation we have to use which will create user with descired attributes:: # get computer system - cs = c.root.cimv2.Linux_ComputerSystem.first_instance() + cs = c.root.cimv2.PG_ComputerSystem.first_instance() # get service lams = c.root.cimv2.LMI_AccountManagementService.first_instance() # invoke method, print result @@ -84,7 +84,7 @@ Similarly like creating user, creating groups are don in :ref:`CreateGroup <LMI-AccountManagementService-CreateGroup>` method:: # get computer system - cs = c.root.cimv2.Linux_ComputerSystem.first_instance() + cs = c.root.cimv2.PG_ComputerSystem.first_instance() # get service lams = c.root.cimv2.LMI_AccountManagementService.first_instance() # invoke method, print result diff --git a/src/account/test/TestAccount.py b/src/account/test/TestAccount.py index 5763c4d..53cb429 100644 --- a/src/account/test/TestAccount.py +++ b/src/account/test/TestAccount.py @@ -49,7 +49,7 @@ class TestAccount(AccountBase): # make sure the account will not exist clean_account(self.user_name) computer_system = self.wbemconnection.ExecQuery('WQL', - 'select * from Linux_ComputerSystem')[0] + 'select * from PG_ComputerSystem')[0] lams = self.wbemconnection.ExecQuery('WQL', 'select * from LMI_AccountManagementService')[0] self.wbemconnection.InvokeMethod("CreateAccount", lams.path, diff --git a/src/account/test/TestGroup.py b/src/account/test/TestGroup.py index 6c294eb..1ad104d 100644 --- a/src/account/test/TestGroup.py +++ b/src/account/test/TestGroup.py @@ -47,7 +47,7 @@ class TestGroup(AccountBase): # make sure the group will not exist clean_group(self.group_name) computer_system = self.wbemconnection.ExecQuery('WQL', - 'select * from Linux_ComputerSystem')[0] + 'select * from PG_ComputerSystem')[0] lams = self.wbemconnection.ExecQuery('WQL', 'select * from LMI_AccountManagementService')[0] self.wbemconnection.InvokeMethod("CreateGroup", lams.path, diff --git a/src/account/test/TestService.py b/src/account/test/TestService.py index 62cdf9d..8881b64 100644 --- a/src/account/test/TestService.py +++ b/src/account/test/TestService.py @@ -34,9 +34,9 @@ class TestService(AccountBase): # make sure the account will not exist clean_account(self.user_name) computer_system = self.wbemconnection.ExecQuery('WQL', - 'select * from Linux_ComputerSystem')[0] + 'select * from PG_ComputerSystem')[0] lams = self.wbemconnection.ExecQuery('WQL', - 'select * from LMI_AccountManagementService')[0] + 'select * from PG_AccountManagementService')[0] # create account and test all parameters shell = "testshell" diff --git a/src/logicalfile/LMI_RootDirectoryProvider.c b/src/logicalfile/LMI_RootDirectoryProvider.c index 45660a8..7de3689 100644 --- a/src/logicalfile/LMI_RootDirectoryProvider.c +++ b/src/logicalfile/LMI_RootDirectoryProvider.c @@ -78,7 +78,7 @@ static CMPIStatus associators( CMReturnInstance(cr, ci); } } else { - /* got Linux_ComputerSystem - GroupComponent */ + /* got CIM_ComputerSystem - GroupComponent */ st = check_assoc_class(_cb, ns, resultClass, LMI_UnixDirectory_ClassName); check_class_check_status(st); if (role && strcmp(role, GROUP_COMPONENT) != 0) { @@ -153,7 +153,7 @@ static CMPIStatus references( CMSetClassName(o, comp_ccname); LMI_RootDirectory_SetObjectPath_GroupComponent(&lmi_rd, o); } else { - /* got Linux_ComputerSystem - GroupComponent */ + /* got CIM_ComputerSystem - GroupComponent */ if (role && strcmp(role, GROUP_COMPONENT) != 0) { CMReturn(CMPI_RC_OK); } diff --git a/src/logicalfile/doc/source/usage.rst b/src/logicalfile/doc/source/usage.rst index ecd55d0..70cc3fe 100644 --- a/src/logicalfile/doc/source/usage.rst +++ b/src/logicalfile/doc/source/usage.rst @@ -102,7 +102,7 @@ been acquired. c = connect('https://myhost') # namespace alias for convenience ns = c.root.cimv2 - system = ns.Linux_ComputerSystem.first_instance() + system = ns.PG_ComputerSystem.first_instance() Get an instance of the home directory:: diff --git a/src/logicalfile/test/test_base.py b/src/logicalfile/test/test_base.py index 5c71196..3cd6531 100644 --- a/src/logicalfile/test/test_base.py +++ b/src/logicalfile/test/test_base.py @@ -28,7 +28,7 @@ class LogicalFileTestBase(unittest.TestCase): Base class for all LogicalFile tests. """ - SYSTEM_CLASS_NAME = "Linux_ComputerSystem" + SYSTEM_CLASS_NAME = "PG_ComputerSystem" SYSTEM_NAME = socket.getfqdn() @classmethod diff --git a/src/logicalfile/test/test_basic.py b/src/logicalfile/test/test_basic.py index f682b33..e477dee 100644 --- a/src/logicalfile/test/test_basic.py +++ b/src/logicalfile/test/test_basic.py @@ -327,7 +327,7 @@ class TestLogicalFile(LogicalFileTestBase): cop = self.cop.copy() cop.keybindings['Name'] = '/' for assoc_method in [self.wbemconnection.Associators, self.wbemconnection.AssociatorNames]: - ## PartComponent - Linux_ComputerSystem + ## PartComponent - CIM_ComputerSystem assocs = assoc_method(cop, AssocClass=assoc_class, Role='PartComponent', @@ -378,7 +378,7 @@ class TestLogicalFile(LogicalFileTestBase): ### References and ReferenceNames for assoc_method in [self.wbemconnection.References, self.wbemconnection.ReferenceNames]: - ## PartComponent - Linux_ComputerSystem + ## PartComponent - CIM_ComputerSystem assocs = assoc_method(cop, ResultClass=assoc_class) self.assertEquals(len(assocs), 1) system = assocs[0]['GroupComponent'] diff --git a/src/openlmi.c b/src/openlmi.c index b991f6a..de21d3c 100644 --- a/src/openlmi.c +++ b/src/openlmi.c @@ -52,7 +52,7 @@ static bool _log_stderr = false; static ConfigEntry _toplevel_config_defaults[] = { { "CIM", "Namespace", "root/cimv2" }, - { "CIM", "SystemClassName", "Linux_ComputerSystem" }, + { "CIM", "SystemClassName", "PG_ComputerSystem" }, { "LOG", "Level", "ERROR" }, { "LOG", "Stderr" , "false" } }; @@ -120,13 +120,13 @@ const char *lmi_get_system_creation_class_name() if (_system_creation_class_name == NULL) { if (_masterKeyFile == NULL) { lmi_error("Configuration was not read, using default option"); - return "Linux_ComputerSystem"; + return "PG_ComputerSystem"; } _system_creation_class_name = lmi_read_config("CIM", "SystemClassName"); if (_system_creation_class_name == NULL) { // This shouldn't happen, SystemClassName should be at least // in default config keys - return "Linux_ComputerSystem"; + return "PG_ComputerSystem"; } } return _system_creation_class_name; diff --git a/src/openlmi.conf b/src/openlmi.conf index 8028b20..64684a8 100644 --- a/src/openlmi.conf +++ b/src/openlmi.conf @@ -6,7 +6,7 @@ # To change the CIM class of ComputerSystem, which is associated to many # software classes, uncomment the line below. -#SystemClassName = Linux_ComputerSystem +#SystemClassName = PG_ComputerSystem [Log] # These options modify logging configuration of the main process spawned diff --git a/src/python/lmi/base/BaseConfiguration.py b/src/python/lmi/base/BaseConfiguration.py index 275fc0f..8333cca 100644 --- a/src/python/lmi/base/BaseConfiguration.py +++ b/src/python/lmi/base/BaseConfiguration.py @@ -84,7 +84,7 @@ class BaseConfiguration(Singleton): DEFAULT_OPTIONS = { 'Namespace' : 'root/cimv2', - 'SystemClassName' : 'Linux_ComputerSystem', + 'SystemClassName' : 'PG_ComputerSystem', # Default logging level "Level" : "ERROR", 'DebugBlivet' : 'false', diff --git a/src/software/config/software.conf b/src/software/config/software.conf index 91a809d..ad7a7cc 100644 --- a/src/software/config/software.conf +++ b/src/software/config/software.conf @@ -6,7 +6,7 @@ # To change the CIM class of ComputerSystem, which is associated to many # software classes, uncomment the line below. -#SystemClassName = Linux_ComputerSystem +#SystemClassName = PG_ComputerSystem [Yum] # Number of seconds to wait before next try to lock yum package database. This diff --git a/src/software/doc/admin/usage.rst b/src/software/doc/admin/usage.rst index 0f5205d..42cc2cd 100644 --- a/src/software/doc/admin/usage.rst +++ b/src/software/doc/admin/usage.rst @@ -12,7 +12,7 @@ Simple Simple but very slow way: :: c = connect("host", "user", "pass") - cs = c.root.cimv2.Linux_ComputerSystem.first_instance() + cs = c.root.cimv2.PG_ComputerSystem.first_instance() for identity in cs.associators( AssocClass="LMI_InstalledSoftwareIdentity", Role="System", @@ -21,7 +21,7 @@ Simple but very slow way: :: print(identity.ElementName) .. note:: - Here we use ``Linux_ComputerSystem`` as a class representing computer + Here we use ``PG_ComputerSystem`` as a class representing computer system. It is part of ``sblim-cmpi-base`` package, which is obsoleted. If you use *Pegasus* as your *CIMOM* you may safely switch to ``PG_ComputerSystem``. @@ -185,7 +185,7 @@ with a reference to some available software identity. :: c = connect("host", "user", "pass") identity = c.root.cimv2.LMI_SoftwareIdentity.new_instance_name( {"InstanceID" : "LMI:LMI_SoftwareIdentity:sblim-sfcb-0:1.3.16-3.fc19.x86_64"}) - cs = c.root.cimv2.Linux_ComputerSystem.first_instance_name() + cs = c.root.cimv2.PG_ComputerSystem.first_instance_name() installed_assoc = c.root.cimv2.LMI_InstalledSoftwareIdentity.create_instance( properties={ "InstalledSoftware" : identity.path, @@ -210,7 +210,7 @@ at background. Please refer to `Asynchronous Jobs`_ for more details. service = c.root.cimv2.LMI_SoftwareInstallationService.first_instance() identity = c.root.cimv2.LMI_SoftwareIdentity.new_instance_name( {"InstanceID" : "LMI:LMI_SoftwareIdentity:sblim-sfcb-0:1.3.16-5.fc19.x86_64"}) - cs = c.root.cimv2.Linux_ComputerSystem.first_instance_name() + cs = c.root.cimv2.PG_ComputerSystem.first_instance_name() ret = service.InstallFromSoftwareIdentity( Source=identity.path, Target=cs.path, @@ -284,7 +284,7 @@ This is also possible with: :: c = connect("host", "user", "pass") service = c.root.cimv2.LMI_SoftwareInstallationService.first_instance() - cs = c.root.cimv2.Linux_ComputerSystem.first_instance_name() + cs = c.root.cimv2.PG_ComputerSystem.first_instance_name() ret = service.to_instance().InstallFromSoftwareURI( Source="http://someserver.com/fedora/repo/package.rpm", Target=cs.path, @@ -345,7 +345,7 @@ Asynchronous removal service = c.root.cimv2.LMI_SoftwareInstallationService.first_instance() identity = c.root.cimv2.LMI_SoftwareIdentity.new_instance_name( {"InstanceID" : "LMI:LMI_SoftwareIdentity:sblim-sfcb-0:1.3.16-5.fc19.x86_64"}) - cs = c.root.cimv2.Linux_ComputerSystem.first_instance_name() + cs = c.root.cimv2.PG_ComputerSystem.first_instance_name() ret = service.InstallFromSoftwareIdentity( Source=identity.path, Target=cs.path, @@ -373,7 +373,7 @@ Example below shows the synchronous invocation of asynchronous method. :: service = c.root.cimv2.LMI_SoftwareInstallationService.first_instance() identity = c.root.cimv2.LMI_SoftwareIdentity.new_instance_name( {"InstanceID" : "LMI:LMI_SoftwareIdentity:sblim-sfcb-0:1.3.16-5.fc19.x86_64"}) - cs = c.root.cimv2.Linux_ComputerSystem.first_instance_name() + cs = c.root.cimv2.PG_ComputerSystem.first_instance_name() ret = service.SyncInstallFromSoftwareIdentity( Source=identity.path, Target=cs.path, @@ -420,7 +420,7 @@ if we want to be able to list failed files. {"InstanceID" : "LMI:LMI_SoftwareIdentity:sblim-sfcb-0:1.3.16-5.fc19.x86_64"}) results = service.VerifyInstalledIdentity( Source=identity.path, - Target=ns.Linux_ComputerSystem.first_instance().path) + Target=ns.PG_ComputerSystem.first_instance().path) nevra = ( identity.path['InstanceId'] if isinstance(identity, LMIInstanceName) else identity.InstanceId)[len('LMI:LMI_SoftwareIdentity:'):] diff --git a/src/software/lmi/software/core/AffectedSoftwareJobElement.py b/src/software/lmi/software/core/AffectedSoftwareJobElement.py index df4e123..9a0e370 100644 --- a/src/software/lmi/software/core/AffectedSoftwareJobElement.py +++ b/src/software/lmi/software/core/AffectedSoftwareJobElement.py @@ -125,7 +125,7 @@ def check_path(env, op): else: raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, "Expected an instance of LMI_SoftwareIdentity," - " LMI_SystemSoftwareCollection or Linux_ComputerSystem.") + " LMI_SystemSoftwareCollection or CIM_ComputerSystem.") return (job, affected) @cmpi_logging.trace_function diff --git a/src/software/test/base.py b/src/software/test/base.py index e1adb2d..35e437a 100644 --- a/src/software/test/base.py +++ b/src/software/test/base.py @@ -150,7 +150,7 @@ class SoftwareBaseTestCase(unittest.TestCase): #pylint: disable=R0904 if "CreationClassName" in self.KEYS: self.objpath["CreationClassName"] = self.CLASS_NAME if "SystemCreationClassName" in self.KEYS: - self.objpath["SystemCreationClassName"] = "Linux_ComputerSystem" + self.objpath["SystemCreationClassName"] = "PG_ComputerSystem" def install_pkg(self, pkg, newer=True, repolist=None): """ diff --git a/src/software/test/test_hosted_software_collection.py b/src/software/test/test_hosted_software_collection.py index e399b4a..6f4adc3 100755 --- a/src/software/test/test_hosted_software_collection.py +++ b/src/software/test/test_hosted_software_collection.py @@ -47,10 +47,10 @@ class TestHostedSoftwareCollection(base.SoftwareBaseTestCase): """ objpath = self.objpath.copy() objpath["Antecedent"] = pywbem.CIMInstanceName( - classname="Linux_ComputerSystem", + classname="PG_ComputerSystem", namespace="root/cimv2", keybindings=pywbem.NocaseDict({ - "CreationClassName" : "Linux_ComputerSystem", + "CreationClassName" : "PG_ComputerSystem", "Name" : socket.getfqdn() })) objpath["Dependent"] = pywbem.CIMInstanceName( @@ -145,7 +145,7 @@ class TestHostedSoftwareCollection(base.SoftwareBaseTestCase): ObjectName=objpath["Dependent"], Role="Dependent", ResultRole="Antecedent", - ResultClass="Linux_ComputerSystem") + ResultClass="PG_ComputerSystem") self.assertEqual(1, len(refs)) ref = refs[0] self.assertEqual(objpath["Antecedent"], ref) diff --git a/src/software/test/test_hosted_software_identity_resource.py b/src/software/test/test_hosted_software_identity_resource.py index 4771e9b..df4b11f 100755 --- a/src/software/test/test_hosted_software_identity_resource.py +++ b/src/software/test/test_hosted_software_identity_resource.py @@ -50,10 +50,10 @@ class TestHostedSoftwareIdentityResource(base.SoftwareBaseTestCase): """ objpath = self.objpath.copy() objpath["Antecedent"] = pywbem.CIMInstanceName( - classname="Linux_ComputerSystem", + classname="PG_ComputerSystem", namespace="root/cimv2", keybindings=pywbem.NocaseDict({ - "CreationClassName" : "Linux_ComputerSystem", + "CreationClassName" : "PG_ComputerSystem", "Name" : socket.getfqdn() })) objpath["Dependent"] = pywbem.CIMInstanceName( @@ -61,7 +61,7 @@ class TestHostedSoftwareIdentityResource(base.SoftwareBaseTestCase): namespace="root/cimv2", keybindings=pywbem.NocaseDict({ "CreationClassName" : "LMI_SoftwareIdentityResource", - "SystemCreationClassName" : "Linux_ComputerSystem", + "SystemCreationClassName" : "PG_ComputerSystem", "SystemName" : socket.getfqdn(), "Name" : repo.repoid })) @@ -154,7 +154,7 @@ class TestHostedSoftwareIdentityResource(base.SoftwareBaseTestCase): Role="Dependent", ObjectName=objpath["Dependent"], ResultRole="Antecedent", - ResultClass="Linux_ComputerSystem") + ResultClass="PG_ComputerSystem") self.assertEqual(len(refs), 1) self.assertEqual(objpath["Antecedent"], refs[0]) diff --git a/src/software/test/test_installed_software_identity.py b/src/software/test/test_installed_software_identity.py index 3ca3e05..31bbd1c 100755 --- a/src/software/test/test_installed_software_identity.py +++ b/src/software/test/test_installed_software_identity.py @@ -43,10 +43,10 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): """ objpath = self.objpath.copy() objpath["System"] = pywbem.CIMInstanceName( - classname="Linux_ComputerSystem", + classname="PG_ComputerSystem", namespace="root/cimv2", keybindings=pywbem.NocaseDict({ - "CreationClassName" : "Linux_ComputerSystem", + "CreationClassName" : "PG_ComputerSystem", "Name" : socket.getfqdn() })) objpath["InstalledSoftware"] = pywbem.CIMInstanceName( @@ -238,7 +238,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): ObjectName=objpath["InstalledSoftware"], Role="InstalledSoftware", ResultRole="System", - ResultClass="Linux_ComputerSystem") + ResultClass="PG_ComputerSystem") self.assertEqual(len(refs), 1) ref = refs[0] self.assertEqual(objpath["System"], ref) diff --git a/src/software/test/test_resource_for_software_identity.py b/src/software/test/test_resource_for_software_identity.py index a2d1e7e..39bbfb2 100755 --- a/src/software/test/test_resource_for_software_identity.py +++ b/src/software/test/test_resource_for_software_identity.py @@ -50,7 +50,7 @@ class TestResourceForSoftwareIdentity(base.SoftwareBaseTestCase): namespace="root/cimv2", keybindings=pywbem.NocaseDict({ "CreationClassName" : "LMI_SoftwareIdentityResource", - "SystemCreationClassName" : "Linux_ComputerSystem", + "SystemCreationClassName" : "PG_ComputerSystem", "SystemName" : socket.getfqdn() })) if repo is not None: diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py index 3242113..96e086d 100755 --- a/src/software/test/test_software_identity_file_check.py +++ b/src/software/test/test_software_identity_file_check.py @@ -371,9 +371,9 @@ class TestSoftwareIdentityFileCheck( ObjectName=objpath, TargetSystem=pywbem.CIMInstanceName( namespace="root/cimv2", - classname="Linux_ComputerSystem", + classname="PG_ComputerSystem", keybindings=pywbem.NocaseDict({ - "CreationClassName" : "Linux_ComputerSystem", + "CreationClassName" : "PG_ComputerSystem", "Name" : socket.getfqdn()}))) self.assertEqual(pywbem.Uint32(0), #Satisfied @@ -386,7 +386,7 @@ class TestSoftwareIdentityFileCheck( ObjectName=objpath, TargetSystem=pywbem.CIMInstanceName( namespace="root/cimv2", - classname="Linux_ComputerSystem", + classname="PG_ComputerSystem", keybindings=pywbem.NocaseDict({ "CreationClassName" : "Bad class name", "Name" : "some random name"}))) diff --git a/tools/gendoc/doc/config.rst b/tools/gendoc/doc/config.rst index 7bf292f..0c28609 100644 --- a/tools/gendoc/doc/config.rst +++ b/tools/gendoc/doc/config.rst @@ -24,7 +24,7 @@ Default configuration:: [CIM] Namespace=root/cimv2 - SystemClassName=Linux_ComputerSystem + SystemClassName=PG_ComputerSystem [Log] Level=ERROR @@ -34,7 +34,7 @@ Default configuration:: Section Option name Default value Desciption ======= =================== ==================== =========== ``CIM`` ``Namespace`` root/cimv2 Namespace where OpenLMI providers are registered. -``CIM`` ``SystemClassName`` Linux_ComputerSystem Name of CIM_ComputerSystem class, which is used to represent the computer system. It will be used as ``SystemClassName`` property value of various classes. +``CIM`` ``SystemClassName`` PG_ComputerSystem Name of CIM_ComputerSystem class, which is used to represent the computer system. It will be used as ``SystemClassName`` property value of various classes. ``Log`` ``Level`` ERROR Chooses which messages are logged, either to CIMOM and (if configured) to standard error output. Available levels (sorted by severity) are: * CRITICAL |