(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.88 and 1.88.2.2

version 1.88, 2010/06/06 17:04:16 version 1.88.2.2, 2012/02/15 17:47:09
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 499 
Line 499 
             instances = enumServiceAffectsElementInstances(context);             instances = enumServiceAffectsElementInstances(context);
             break;             break;
         }         }
           case CIM_INDICATIONSERVICE:
           {
               instances = enumIndicationServiceInstances(context);
               break;
           }
 #endif #endif
         default:         default:
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
Line 545 
Line 550 
         // that has implemented a registered profile.         // that has implemented a registered profile.
         if(opNamespace != PEGASUS_NAMESPACENAME_INTEROP ||         if(opNamespace != PEGASUS_NAMESPACENAME_INTEROP ||
             (originClass != PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE &&             (originClass != PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE &&
   #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
                originClass != PEGASUS_CLASSNAME_CIM_INDICATIONSERVICE &&
   #endif
              originClass != PEGASUS_CLASSNAME_PG_OBJECTMANAGER ))              originClass != PEGASUS_CLASSNAME_PG_OBJECTMANAGER ))
         {         {
             //             //
Line 813 
Line 821 
               expectedTargetRole = PROPERTY_DEPENDENT;               expectedTargetRole = PROPERTY_DEPENDENT;
               expectedOriginRole = PROPERTY_ANTECEDENT;               expectedOriginRole = PROPERTY_ANTECEDENT;
           }           }
             else if (originClassEnum == CIM_INDICATIONSERVICE)
             {
                 expectedTargetRole = PROPERTY_ANTECEDENT;
                 expectedOriginRole = PROPERTY_DEPENDENT;
             }
           break;           break;
 #endif #endif
       default:       default:

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