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

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropProvider.cpp between version 1.85.2.1 and 1.88.2.1

version 1.85.2.1, 2009/11/18 14:00:33 version 1.88.2.1, 2011/10/11 18:18:16
Line 159 
Line 159 
     // through the PG_ElementConformsToProfile association     // through the PG_ElementConformsToProfile association
     CIMNamespaceName opNamespace = instanceName.getNameSpace();     CIMNamespaceName opNamespace = instanceName.getNameSpace();
     CIMName opClass = instanceName.getClassName();     CIMName opClass = instanceName.getClassName();
     if(opNamespace != PEGASUS_NAMESPACENAME_INTEROP &&      if((opNamespace != PEGASUS_NAMESPACENAME_INTEROP &&
         opClass != PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE          opClass != PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE)
         // Get CIM_IndicationService instance from IndicationService.         // Get CIM_IndicationService instance from IndicationService.
 #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
         || opClass == PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE         || opClass == PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE
Line 272 
Line 272 
         CIMNamespaceName opNamespace = thisTarget.getNameSpace();         CIMNamespaceName opNamespace = thisTarget.getNameSpace();
         CIMName opClass = thisTarget.getClassName();         CIMName opClass = thisTarget.getClassName();
  
         if(opNamespace != PEGASUS_NAMESPACENAME_INTEROP &&          if((opNamespace != PEGASUS_NAMESPACENAME_INTEROP &&
             opClass != PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE              opClass != PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE)
             // Get CIM_IndicationService instance from IndicationService.             // Get CIM_IndicationService instance from IndicationService.
 #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
             || opClass == PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE             || opClass == PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE
Line 453 
Line 453 
         }         }
         case PG_INSTALLEDSOFTWAREIDENTITY:         case PG_INSTALLEDSOFTWAREIDENTITY:
         {         {
             instances = enumInstalledSoftwareIdentityInstances();              instances = enumInstalledSoftwareIdentityInstances(context);
             break;             break;
         }         }
         case PG_COMPUTERSYSTEM:         case PG_COMPUTERSYSTEM:
         {         {
             instances.append(getComputerSystemInstance());              instances.append(getComputerSystemInstance(context));
             break;             break;
         }         }
         case PG_HOSTEDOBJECTMANAGER:         case PG_HOSTEDOBJECTMANAGER:
         {         {
             instances.append(getHostedObjectManagerInstance());              instances.append(getHostedObjectManagerInstance(context));
             break;             break;
         }         }
         case PG_HOSTEDACCESSPOINT:         case PG_HOSTEDACCESSPOINT:
         {         {
             instances = enumHostedAccessPointInstances();              instances = enumHostedAccessPointInstances(context);
             break;             break;
         }         }
         //We don't support enumerate CIM_Namespace instances. PG_Namespace is         //We don't support enumerate CIM_Namespace instances. PG_Namespace is
Line 534 
Line 534 
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::validAssocClassForObject()");         "InteropProvider::validAssocClassForObject()");
     TARGET_CLASS assocClassEnum = translateClassInput(assocClass);     TARGET_CLASS assocClassEnum = translateClassInput(assocClass);
     TARGET_CLASS originClassEnum;      TARGET_CLASS originClassEnum = NOCLASS;
     CIMName originClass = objectName.getClassName();     CIMName originClass = objectName.getClassName();
     // If the association class is PG_ElementConformsToProfile, we'll have to     // If the association class is PG_ElementConformsToProfile, we'll have to
     // do some special processing in case the origin instance for the operation     // do some special processing in case the origin instance for the operation

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