Return to CIMInstanceRep.cpp CVS log | Up to [Pegasus] / pegasus / src / Pegasus / Common |
File: [Pegasus] / pegasus / src / Pegasus / Common / CIMInstanceRep.cpp
(download)
Revision: 1.74, Tue Jan 16 19:59:48 2007 UTC (17 years, 5 months ago) by kumpf Branch: MAIN CVS Tags: TASK-PEP305_VXWORKS-root, TASK-PEP305_VXWORKS-branch-pre-solaris-port, TASK-PEP305_VXWORKS-branch-post-solaris-port, TASK-PEP305_VXWORKS-branch-beta2, TASK-PEP305_VXWORKS-branch, TASK-PEP305_VXWORKS-2008-10-23, TASK-PEP291_IPV6-root, TASK-PEP291_IPV6-branch, TASK-PEP286_PRIVILEGE_SEPARATION-root, TASK-PEP286_PRIVILEGE_SEPARATION-branch, TASK-PEP274_dacim-root, TASK-PEP274_dacim-merged_out_to_branch, TASK-PEP274_dacim-merged_out_from_trunk, TASK-PEP274_dacim-merged_in_to_trunk, TASK-PEP274_dacim-merged_in_from_branch, TASK-PEP274_dacim-branch, TASK-Bug2102_RCMPIWindows-root, TASK-Bug2102_RCMPIWindows-merged_out_to_branch, TASK-Bug2102_RCMPIWindows-merged_out_from_trunk, TASK-Bug2102_RCMPIWindows-merged_in_to_trunk, TASK-Bug2102_RCMPIWindows-merged_in_from_branch, TASK-Bug2102_RCMPIWindows-branch, TASK-Bug2102Final-root, TASK-Bug2102Final-merged_out_to_branch, TASK-Bug2102Final-merged_out_from_trunk, TASK-Bug2102Final-merged_in_to_trunk, TASK-Bug2102Final-merged_in_from_branch, TASK-Bug2102Final-branch, RELEASE_2_7_3-RC1, RELEASE_2_7_3, RELEASE_2_7_2-RC1, RELEASE_2_7_2, RELEASE_2_7_1-RC1, RELEASE_2_7_1, RELEASE_2_7_0-RC1, RELEASE_2_7_0-BETA, RELEASE_2_7_0, RELEASE_2_7-root, RELEASE_2_7-branch Changes since 1.73: +0 -2 lines BUG#: 5956 TITLE: Propagated attributes are lost when resolving CIMInstances DESCRIPTION: Preserve the propagated attributes on instance properties. The MOF compiler is updated to set the propagated attribute properly. The CIMInstanceRep::resolve method is updated not to reset this attribute. Callers to the CIMRepository are updated to specify the correct localOnly value to retrieve properties based on the propagated attributes. |
//%2006//////////////////////////////////////////////////////////////////////// // // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; // IBM Corp.; EMC Corporation, The Open Group. // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // EMC Corporation; VERITAS Software Corporation; The Open Group. // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; // EMC Corporation; Symantec Corporation; The Open Group. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // //============================================================================== // //%///////////////////////////////////////////////////////////////////////////// #include "CIMInstanceRep.h" #include "CIMInstance.h" #include "CIMClassRep.h" #include "CIMScope.h" #include "DeclContext.h" #include "Resolver.h" #include "Indentor.h" #include "CIMName.h" #include "Constants.h" #include "XmlWriter.h" #include "MofWriter.h" #include "StrLit.h" PEGASUS_USING_STD; PEGASUS_NAMESPACE_BEGIN CIMInstanceRep::CIMInstanceRep(const CIMObjectPath& reference) : CIMObjectRep(reference) { } CIMInstanceRep::~CIMInstanceRep() { } void CIMInstanceRep::resolve( DeclContext* context, const CIMNamespaceName& nameSpace, CIMConstClass& cimClassOut, Boolean propagateQualifiers) { // ATTN: Verify that references are initialized. #if 0 if (_resolved) throw InstanceAlreadyResolved(); #endif if (!context) throw NullPointer(); //---------------------------------------------------------------------- // First obtain the class: //---------------------------------------------------------------------- CIMConstClass cimClass = context->lookupClass(nameSpace, _reference.getClassName()); if (cimClass.isUninitialized()) throw PEGASUS_CIM_EXCEPTION(CIM_ERR_INVALID_CLASS, _reference.getClassName().getString ()); cimClassOut = cimClass; #if 0 if (!cimClass._rep->_resolved) throw ClassNotResolved(_reference.getClassName()); #endif //---------------------------------------------------------------------- // Disallow instantiation of abstract classes. //---------------------------------------------------------------------- if (cimClass.isAbstract()) throw InstantiatedAbstractClass(_reference.getClassName().getString ()); //---------------------------------------------------------------------- // Validate and propagate qualifiers. //---------------------------------------------------------------------- _qualifiers.resolve( context, nameSpace, (cimClass.isAssociation()) ? CIMScope::ASSOCIATION : CIMScope::CLASS, false, cimClass._rep->_qualifiers, propagateQualifiers); //---------------------------------------------------------------------- // First iterate the properties of this instance and verify that // each one is defined in the class and then resolve each one. //---------------------------------------------------------------------- CIMName className = cimClass.getClassName(); for (Uint32 i = 0, n = _properties.size(); i < n; i++) { CIMProperty& property = _properties[i]; Uint32 index = cimClass.findProperty(property.getName()); if (index == PEG_NOT_FOUND) { // // Allow addition of Creator property to Indication Subscription, // Filter and Handler instances // // l10n add language property support if (!(((className.equal (CIMName (PEGASUS_CLASSNAME_INDSUBSCRIPTION))) || (className.equal (CIMName (PEGASUS_CLASSNAME_FORMATTEDINDSUBSCRIPTION))) || (className.equal (CIMName (PEGASUS_CLASSNAME_INDHANDLER_CIMXML))) || (className.equal (CIMName (PEGASUS_CLASSNAME_LSTNRDST_CIMXML))) || (className.equal (CIMName (PEGASUS_CLASSNAME_INDHANDLER_SNMP))) || #ifdef PEGASUS_ENABLE_SYSTEM_LOG_HANDLER (className.equal (CIMName (PEGASUS_CLASSNAME_LSTNRDST_SYSTEM_LOG))) || #endif #ifdef PEGASUS_ENABLE_EMAIL_HANDLER (className.equal (CIMName (PEGASUS_CLASSNAME_LSTNRDST_EMAIL))) || #endif (className.equal (CIMName (PEGASUS_CLASSNAME_INDFILTER)))) && ((property.getName ().equal (CIMName (PEGASUS_PROPERTYNAME_INDSUB_CREATOR))) || (property.getName ().equal (CIMName (PEGASUS_PROPERTYNAME_INDSUB_ACCEPTLANGS))) || (property.getName ().equal (CIMName (PEGASUS_PROPERTYNAME_INDSUB_CONTENTLANGS)))))) { throw NoSuchProperty(property.getName().getString ()); } } else { // resolve the property Resolver::resolveProperty (property, context, nameSpace, true, cimClass.getProperty (index), propagateQualifiers); } } //---------------------------------------------------------------------- // Inject all properties from the class that are not included in the // instance. Copy over the class-origin and set the propagated flag // to true. NOTE: The propagated flag indicates that the property // was not part of the property set input with the create and // was inherited from the default in the class (see cimxml spec sect 3.1.5) //---------------------------------------------------------------------- for (Uint32 i = 0, m = 0, n = cimClass.getPropertyCount(); i < n; i++) { CIMConstProperty property = cimClass.getProperty(i); const CIMName& name = property.getName(); // See if this instance already contains a property with this name: Boolean found = false; for (Uint32 j = m, n = _properties.size(); j < n; j++) { if (name.equal(_properties[j].getName())) { found = true; break; } } if (!found) { CIMProperty p = property.clone(); p.setPropagated(true); _properties.insert(m++, p); } } #if 0 _resolved = true; #endif } CIMInstanceRep::CIMInstanceRep() { } CIMInstanceRep::CIMInstanceRep(const CIMInstanceRep& x) : CIMObjectRep(x) { } void CIMInstanceRep::toXml(Buffer& out) const { // Class opening element: out << STRLIT("<INSTANCE "); out << STRLIT(" CLASSNAME=\"") << _reference.getClassName(); out << STRLIT("\" "); out << STRLIT(">\n"); // Qualifiers: _qualifiers.toXml(out); // Parameters: for (Uint32 i = 0, n = _properties.size(); i < n; i++) XmlWriter::appendPropertyElement(out, _properties[i]); // Class closing element: out << STRLIT("</INSTANCE>\n"); } void CIMInstanceRep::toMof(Buffer& out) const { // Get and format the class qualifiers out << STRLIT("\n//Instance of ") << _reference.getClassName(); if (_qualifiers.getCount()) out.append('\n'); _qualifiers.toMof(out); // Separate qualifiers from Class Name out.append('\n'); // output class statement out << STRLIT("instance of ") << _reference.getClassName(); out << STRLIT("\n{"); // format the Properties: for (Uint32 i = 0, n = _properties.size(); i < n; i++) { // Generate MOF if this property not propagated // Note that the test is required only because // there is an error in getclass that does not // test the localOnly flag. // The false identifies this as value initializer, not // property definition. if (!_properties[i].getPropagated()) MofWriter::appendPropertyElement(false,out, _properties[i]); } // Class closing element: out << STRLIT("\n};\n"); } CIMObjectPath CIMInstanceRep::buildPath( const CIMConstClass& cimClass) const { //-------------------------------------------------------------------------- // Get class name: //-------------------------------------------------------------------------- CIMName className = getClassName(); //-------------------------------------------------------------------------- // Get key names: //-------------------------------------------------------------------------- Array<CIMName> keyNames; cimClass.getKeyNames(keyNames); if (keyNames.size() == 0) return CIMObjectPath("", CIMNamespaceName(), className); //-------------------------------------------------------------------------- // Get type and value for each key (building up key bindings): //-------------------------------------------------------------------------- Array<CIMKeyBinding> keyBindings; for (Uint32 i = 0, n = keyNames.size(); i < n; i++) { const CIMName& keyName = keyNames[i]; Uint32 index = findProperty(keyName); if (index == PEG_NOT_FOUND) { throw NoSuchProperty(keyName.getString()); } CIMConstProperty tmp = getProperty(index); if (keyName.equal(tmp.getName())) { keyBindings.append(CIMKeyBinding(keyName, tmp.getValue())); } } return CIMObjectPath(String(), CIMNamespaceName(), className, keyBindings); } // KS Mar 05 - The following removal functions are very inefficient and should // be optimized to avoid the multiple memory moves. Actually, the remove // qualifiers should be added as a function and optimized that once. void CIMInstanceRep::filter( Boolean includeQualifiers, Boolean includeClassOrigin, const CIMPropertyList& propertyList) { // Filter any qualifiers from this instance. if (!includeQualifiers && _qualifiers.getCount() > 0) { while (_qualifiers.getCount()) { _qualifiers.removeQualifier(0); } } // For each property, remove if not in propertylist for (Uint32 i = 0 ; i < _properties.size(); i++) { CIMConstProperty p = getProperty(i); CIMName name = p.getName(); Array<CIMName> pl = propertyList.getPropertyNameArray(); if (propertyList.isNull() || Contains(pl, name)) { // test ClassOrigin and possibly remove if (!includeClassOrigin) { _properties[i].setClassOrigin(CIMName()); } // remove qualifiers if required. if (!includeQualifiers && _properties[i].getQualifierCount() > 0) { while (_properties[i].getQualifierCount() > 0) { _properties[i].removeQualifier(0); } } } else { _properties.remove(i--); } } return; } PEGASUS_NAMESPACE_END
No CVS admin address has been configured |
Powered by ViewCVS 0.9.2 |