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

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp between version 1.12 and 1.12.6.2

version 1.12, 2009/07/13 06:30:34 version 1.12.6.2, 2013/06/03 22:35:54
Line 267 
Line 267 
                 elementConformsClass));                 elementConformsClass));
  
     }     }
   
   #ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
       // Now add the  association between the Indication profile
       // and IndicationService
       if (opNamespace == PEGASUS_NAMESPACENAME_INTEROP)
       {
           CIMObjectPath serverProfile = buildDependencyReference(
               hostName,
               buildProfileInstanceId(DMTF_NAME, "Indications", DMTF_VER_110),
               PEGASUS_CLASSNAME_PG_REGISTEREDPROFILE);
           // Retrieve the IndicationService instance
           Array<CIMInstance> indService =
               enumIndicationServiceInstances(OperationContext());
   
           instances.append(
               buildElementConformsToProfile(
                   serverProfile,
                   indService[0].getPath(),
                   elementConformsClass));
       }
   #endif
   
     return instances;     return instances;
 } }
  
Line 280 
Line 302 
     Uint32 updateVer)     Uint32 updateVer)
 { {
     static const String SMISProfileName("SMI-S");     static const String SMISProfileName("SMI-S");
     static const String IndicationProfileName("Indication");      static const String SNIAIndicationProfileName("Indication");
       static const String DMTFIndicationProfileName("Indications");
     static const String ServerProfileName("Server");     static const String ServerProfileName("Server");
     static const String SoftwareProfileName("Software");     static const String SoftwareProfileName("Software");
  
Line 290 
Line 313 
     {     {
         String versionNumber;         String versionNumber;
         String profileName;         String profileName;
         Uint16 regOrgNo;          //Can use 0 here as registered organization value of 0 is
           //ruled out(not specified in the CIM Schema
           Uint16 regOrgNo = 0;
  
         Uint32 index = profiles[i].findProperty("RegisteredVersion");         Uint32 index = profiles[i].findProperty("RegisteredVersion");
         if (index != PEG_NOT_FOUND)         if (index != PEG_NOT_FOUND)
Line 320 
Line 345 
             }             }
         }         }
  
         if (regOrg == regOrgNo)          if ( regOrgNo != 0 && regOrg == regOrgNo)
         {         {
             if (profileName == ServerProfileName ||             if (profileName == ServerProfileName ||
                 profileName == IndicationProfileName ||                  (regOrg == SNIA_NUM &&
                       profileName == SNIAIndicationProfileName) ||
                   (regOrg == DMTF_NUM
                       && profileName == DMTFIndicationProfileName) ||
                 profileName == SoftwareProfileName)                 profileName == SoftwareProfileName)
             {             {
                 if (VersionUtil::isVersionGreaterOrEqual(                 if (VersionUtil::isVersionGreaterOrEqual(


Legend:
Removed from v.1.12  
changed lines
  Added in v.1.12.6.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2