diff options
author | Jan Safranek <jsafrane@redhat.com> | 2013-10-09 14:50:28 +0200 |
---|---|---|
committer | Jan Safranek <jsafrane@redhat.com> | 2013-10-09 14:50:28 +0200 |
commit | 97f7d0cd33684ed88ea2ff80c578dbc8009f5000 (patch) | |
tree | b9b7c9d5baf45ea5796ce19a599352917bfbd12c /src/logicalfile | |
parent | d75505f629e290ae9feb647017e349a027921c41 (diff) | |
download | openlmi-providers-97f7d0cd33684ed88ea2ff80c578dbc8009f5000.tar.gz openlmi-providers-97f7d0cd33684ed88ea2ff80c578dbc8009f5000.tar.xz openlmi-providers-97f7d0cd33684ed88ea2ff80c578dbc8009f5000.zip |
Use PG_ComputerSystem by default.
And get rid of sblim-cmpi-base dependency.
It would be nice if our tests have an option to select Linux_ComputerSystem
or PG_ComputerSystem in the future...
Diffstat (limited to 'src/logicalfile')
-rw-r--r-- | src/logicalfile/LMI_RootDirectoryProvider.c | 4 | ||||
-rw-r--r-- | src/logicalfile/doc/source/usage.rst | 2 | ||||
-rw-r--r-- | src/logicalfile/test/test_base.py | 2 | ||||
-rw-r--r-- | src/logicalfile/test/test_basic.py | 4 |
4 files changed, 6 insertions, 6 deletions
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'] |