commit 53cc4eaf623bde4d63d26bd00f39a3fe4a820605
Author: Michael Calmer
Date: Wed Jan 21 16:29:40 2009 +0100
Be more specific and require our SUSE_* Classes in the
association providers.
---
mof/SUSE_HostedCollection.mof | 7 ++++++-
mof/SUSE_InstalledSoftwareIdentity.mof | 6 +++++-
mof/SUSE_MemberOfCollection.mof | 10 +++++++++-
src/SUSE_HostedCollectionProvider.cc | 2 +-
src/SUSE_InstalledSoftwareIdentityProvider.cc | 2 +-
src/SUSE_MemberOfCollectionProvider.cc | 7 ++-----
6 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/mof/SUSE_HostedCollection.mof b/mof/SUSE_HostedCollection.mof
index 391837f..6d3e192 100644
--- a/mof/SUSE_HostedCollection.mof
+++ b/mof/SUSE_HostedCollection.mof
@@ -17,6 +17,11 @@
Description ("Association between System and SystemSpecificCollection")
]
class SUSE_HostedCollection : CIM_HostedCollection
-{ };
+{
+ [Override ( "Dependent" ),
+ Description (
+ "The collection defined in the context of a system." )]
+ SUSE_SystemSpecificCollection REF Dependent;
+};
diff --git a/mof/SUSE_InstalledSoftwareIdentity.mof b/mof/SUSE_InstalledSoftwareIdentity.mof
index cba0b32..9209c88 100644
--- a/mof/SUSE_InstalledSoftwareIdentity.mof
+++ b/mof/SUSE_InstalledSoftwareIdentity.mof
@@ -17,6 +17,10 @@
Description ("Association between System and SoftwareIdentity")
]
class SUSE_InstalledSoftwareIdentity : CIM_InstalledSoftwareIdentity
-{ };
+{
+ [Override ( "InstalledSoftware" ),
+ Description ( "The SoftwareIdentity that is installed." )]
+ SUSE_SoftwareIdentity REF InstalledSoftware;
+};
diff --git a/mof/SUSE_MemberOfCollection.mof b/mof/SUSE_MemberOfCollection.mof
index dfd0b5f..305223d 100644
--- a/mof/SUSE_MemberOfCollection.mof
+++ b/mof/SUSE_MemberOfCollection.mof
@@ -17,6 +17,14 @@
Description ("Association between SystemSpecificCollection and SoftwareIdentity")
]
class SUSE_MemberOfCollection : CIM_MemberOfCollection
-{ };
+{
+ [Override ( "Collection" ),
+ Description ( "Overwrite a CIM_Collection." )]
+ SUSE_SystemSpecificCollection REF Collection;
+
+ [Override ( "Member" ),
+ Description ( "Overwrite a CIM_ManagedElement." )]
+ SUSE_SoftwareIdentity REF Member;
+};
diff --git a/src/SUSE_HostedCollectionProvider.cc b/src/SUSE_HostedCollectionProvider.cc
index 6f92cfa..c86cee3 100644
--- a/src/SUSE_HostedCollectionProvider.cc
+++ b/src/SUSE_HostedCollectionProvider.cc
@@ -26,7 +26,7 @@ namespace cmpizypp
const char * _RefLeft = "Antecedent";
const char * _RefRight = "Dependent";
const char * _RefLeftClass = "CIM_System";
- const char * _RefRightClass = "CIM_SystemSpecificCollection";
+ const char * _RefRightClass = "SUSE_SystemSpecificCollection";
} // namespace
diff --git a/src/SUSE_InstalledSoftwareIdentityProvider.cc b/src/SUSE_InstalledSoftwareIdentityProvider.cc
index 647bf30..5e67468 100644
--- a/src/SUSE_InstalledSoftwareIdentityProvider.cc
+++ b/src/SUSE_InstalledSoftwareIdentityProvider.cc
@@ -26,7 +26,7 @@ namespace cmpizypp
const char * _ClassName = "SUSE_InstalledSoftwareIdentity";
const char * _RefLeft = "InstalledSoftware";
const char * _RefRight = "System";
- const char * _RefLeftClass = "CIM_SoftwareIdentity";
+ const char * _RefLeftClass = "SUSE_SoftwareIdentity";
const char * _RefRightClass = "CIM_System";
} // namespace
diff --git a/src/SUSE_MemberOfCollectionProvider.cc b/src/SUSE_MemberOfCollectionProvider.cc
index 4ec7492..fee0342 100644
--- a/src/SUSE_MemberOfCollectionProvider.cc
+++ b/src/SUSE_MemberOfCollectionProvider.cc
@@ -26,11 +26,8 @@ namespace cmpizypp
const char * _ClassName = "SUSE_MemberOfCollection";
const char * _RefLeft = "Collection";
const char * _RefRight = "Member";
- const char * _RefLeftClass = "CIM_Collection";
- // FIXME: CIM_ManagedElement is too generic. So I used CIM_SoftwareIdentity as RightClass
- // Check, if this is correct/allowed.
- //const char * _RefRightClass = "CIM_ManagedElement";
- const char * _RefRightClass = "CIM_SoftwareIdentity";
+ const char * _RefLeftClass = "SUSE_SystemSpecificCollection";
+ const char * _RefRightClass = "SUSE_SoftwareIdentity";
} // namespace
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
