(file) Return to Server.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ControlProviders / InteropProvider

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/Server.cpp between version 1.18 and 1.22

version 1.18, 2009/02/19 18:01:07 version 1.22, 2010/02/04 08:53:04
Line 56 
Line 56 
 #include "InteropProvider.h" #include "InteropProvider.h"
 #include "InteropProviderUtils.h" #include "InteropProviderUtils.h"
 #include "InteropConstants.h" #include "InteropConstants.h"
 #include "Guid.h"  
  
 #include <Pegasus/Common/StatisticalData.h> #include <Pegasus/Common/StatisticalData.h>
   #include <Pegasus/General/Guid.h>
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
Line 141 
Line 141 
     profileDescriptions.append("Instance Manipulation");     profileDescriptions.append("Instance Manipulation");
  
     ConfigManager* configManager = ConfigManager::getInstance();     ConfigManager* configManager = ConfigManager::getInstance();
     if (String::equal(configManager->getCurrentValue(      if (ConfigManager::parseBooleanValue(
         "enableAssociationTraversal"), "true"))          configManager->getCurrentValue("enableAssociationTraversal")))
     {     {
         profiles.append(6);         profiles.append(6);
         profileDescriptions.append("Association Traversal");         profileDescriptions.append("Association Traversal");
Line 154 
Line 154 
     profiles.append(8);     profiles.append(8);
     profileDescriptions.append("Qualifier Declaration");     profileDescriptions.append("Qualifier Declaration");
  
     if (String::equal(configManager->getCurrentValue(      if (ConfigManager::parseBooleanValue(
         "enableIndicationService"), "true"))          configManager->getCurrentValue("enableIndicationService")))
     {     {
         profiles.append(9);         profiles.append(9);
         profileDescriptions.append("Indications");         profileDescriptions.append("Indications");
Line 297 
Line 297 
             "InteropProvider::enumCIMXMLCommunicationMechanismInstances");             "InteropProvider::enumCIMXMLCommunicationMechanismInstances");
  
     ConfigManager* configManager = ConfigManager::getInstance();     ConfigManager* configManager = ConfigManager::getInstance();
     Boolean enableHttpConnection = String::equal(      Boolean enableHttpConnection = ConfigManager::parseBooleanValue(
         configManager->getCurrentValue("enableHttpConnection"), "true");          configManager->getCurrentValue("enableHttpConnection"));
     Boolean enableHttpsConnection = String::equal(      Boolean enableHttpsConnection = ConfigManager::parseBooleanValue(
         configManager->getCurrentValue("enableHttpsConnection"), "true");          configManager->getCurrentValue("enableHttpsConnection"));
  
     Array<CIMInstance> instances;     Array<CIMInstance> instances;
     Uint32 namespaceAccessProtocol;     Uint32 namespaceAccessProtocol;
Line 438 
Line 438 
             PEGASUS_CLASSNAME_PG_OBJECTMANAGER.getString());             PEGASUS_CLASSNAME_PG_OBJECTMANAGER.getString());
         setPropertyValue(instance, OM_PROPERTY_NAME,         setPropertyValue(instance, OM_PROPERTY_NAME,
             String(PEGASUS_INSTANCEID_GLOBAL_PREFIX) + ":" + Guid::getGuid());             String(PEGASUS_INSTANCEID_GLOBAL_PREFIX) + ":" + Guid::getGuid());
   #ifdef PEGASUS_FLAVOR
           String elementName(PEGASUS_FLAVOR);
           elementName.append(Char16('-'));
           elementName.append("pegasus");
           setPropertyValue(instance, OM_PROPERTY_ELEMENTNAME, elementName);
   #else
         setPropertyValue(instance, OM_PROPERTY_ELEMENTNAME, String("Pegasus"));         setPropertyValue(instance, OM_PROPERTY_ELEMENTNAME, String("Pegasus"));
   #endif
         Array<Uint16> operationalStatus;         Array<Uint16> operationalStatus;
         operationalStatus.append(2);         operationalStatus.append(2);
         setPropertyValue(instance, OM_PROPERTY_OPERATIONALSTATUS,         setPropertyValue(instance, OM_PROPERTY_OPERATIONALSTATUS,
Line 577 
Line 584 
 // Get an instance of the PG_ComputerSystem class produced by the // Get an instance of the PG_ComputerSystem class produced by the
 // ComputerSystem provider in the root/cimv2 namespace. // ComputerSystem provider in the root/cimv2 namespace.
 // //
 // @param includeQualifiers Boolean  // @param opContext Operation context.
 // @param includeClassOrigin Boolean  
 // @param propertylist CIMPropertyList  
 // //
 // @return CIMInstance of PG_ComputerSystem class. // @return CIMInstance of PG_ComputerSystem class.
 // //
 // @exception ObjectNotFound exception if a ComputerSystem instance cannot // @exception ObjectNotFound exception if a ComputerSystem instance cannot
 //     be retrieved. //     be retrieved.
 // //
 CIMInstance InteropProvider::getComputerSystemInstance()  CIMInstance InteropProvider::getComputerSystemInstance(
       const OperationContext &opContext)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::getComputerSystemInstance");         "InteropProvider::getComputerSystemInstance");
Line 594 
Line 600 
     CIMInstance instance;     CIMInstance instance;
     AutoMutex mut(interopMut);     AutoMutex mut(interopMut);
     Array<CIMInstance> tmpInstances = cimomHandle.enumerateInstances(     Array<CIMInstance> tmpInstances = cimomHandle.enumerateInstances(
         OperationContext(),          opContext,
         PEGASUS_NAMESPACENAME_CIMV2,         PEGASUS_NAMESPACENAME_CIMV2,
         PEGASUS_CLASSNAME_PG_COMPUTERSYSTEM, true, false, false, false,         PEGASUS_CLASSNAME_PG_COMPUTERSYSTEM, true, false, false, false,
         CIMPropertyList());         CIMPropertyList());
Line 624 
Line 630 
 // Returns an instance of the HostedObjectManager association linking the // Returns an instance of the HostedObjectManager association linking the
 // ObjectManager and ComputerSystem instances managed by this provider. // ObjectManager and ComputerSystem instances managed by this provider.
 // //
 CIMInstance InteropProvider::getHostedObjectManagerInstance()  CIMInstance InteropProvider::getHostedObjectManagerInstance(
       const OperationContext &opContext)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::getHostedObjectManagerInstance");         "InteropProvider::getHostedObjectManagerInstance");
Line 633 
Line 640 
     CIMInstance instance;     CIMInstance instance;
     bool found = false;     bool found = false;
  
     CIMObjectPath csPath = getComputerSystemInstance().getPath();      CIMObjectPath csPath = getComputerSystemInstance(opContext).getPath();
     CIMObjectPath omPath = getObjectManagerInstance().getPath();     CIMObjectPath omPath = getObjectManagerInstance().getPath();
     String csPathString = csPath.toString();     String csPathString = csPath.toString();
     String omPathString = omPath.toString();     String omPathString = omPath.toString();
Line 661 
Line 668 
 // instances for this CIMOM. One will be produced for every instance of // instances for this CIMOM. One will be produced for every instance of
 // CIMXMLCommunicatiomMechanism managed by this provider. // CIMXMLCommunicatiomMechanism managed by this provider.
 // //
 Array<CIMInstance> InteropProvider::enumHostedAccessPointInstances()  Array<CIMInstance> InteropProvider::enumHostedAccessPointInstances(
       const OperationContext &opContext)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::enumHostedAccessPointInstance");         "InteropProvider::enumHostedAccessPointInstance");
     Array<CIMInstance> instances;     Array<CIMInstance> instances;
  
     CIMObjectPath csPath = getComputerSystemInstance().getPath();      CIMObjectPath csPath = getComputerSystemInstance(opContext).getPath();
     Array<CIMInstance> commMechs = enumCIMXMLCommunicationMechanismInstances();     Array<CIMInstance> commMechs = enumCIMXMLCommunicationMechanismInstances();
     CIMClass hapClass = repository->getClass(PEGASUS_NAMESPACENAME_INTEROP,     CIMClass hapClass = repository->getClass(PEGASUS_NAMESPACENAME_INTEROP,
         PEGASUS_CLASSNAME_PG_HOSTEDACCESSPOINT, false, true, false);         PEGASUS_CLASSNAME_PG_HOSTEDACCESSPOINT, false, true, false);
Line 789 
Line 797 
     const OperationContext &opContext)     const OperationContext &opContext)
 { {
     Array<CIMInstance> instances;     Array<CIMInstance> instances;
     CIMInstance cInst = getComputerSystemInstance();      CIMInstance cInst = getComputerSystemInstance(opContext);
  
     // Get CIM_IndicationService instance     // Get CIM_IndicationService instance
     Array<CIMObjectPath> servicePaths = cimomHandle.enumerateInstanceNames(     Array<CIMObjectPath> servicePaths = cimomHandle.enumerateInstanceNames(

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.22
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2