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

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/Namespace.cpp between version 1.2.4.1 and 1.12

version 1.2.4.1, 2007/04/04 11:04:46 version 1.12, 2008/11/12 05:59:04
Line 28 
Line 28 
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 //============================================================================== //==============================================================================
   //
   //%/////////////////////////////////////////////////////////////////////////////
  
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
 //  Interop Provider - This provider services those classes from the //  Interop Provider - This provider services those classes from the
Line 91 
Line 92 
 Array<CIMInstance> InteropProvider::enumNamespaceInstances() Array<CIMInstance> InteropProvider::enumNamespaceInstances()
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::_getInstancesCIMNamespace()");          "InteropProvider::enumNamespaceInstances()");
  
     Array<CIMNamespaceName> namespaceNames = repository->enumerateNameSpaces();     Array<CIMNamespaceName> namespaceNames = repository->enumerateNameSpaces();
     Array<CIMInstance> instanceArray;     Array<CIMInstance> instanceArray;
Line 115 
Line 116 
 Array<CIMInstance> InteropProvider::enumNamespaceInManagerInstances() Array<CIMInstance> InteropProvider::enumNamespaceInManagerInstances()
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::buildInstancesNamespaceInManager");          "InteropProvider::enumNamespaceInManagerInstances()");
  
     Array<CIMInstance> namespaceInstances = enumNamespaceInstances();     Array<CIMInstance> namespaceInstances = enumNamespaceInstances();
  
Line 126 
Line 127 
  
     CIMInstance instanceskel = buildInstanceSkeleton(     CIMInstance instanceskel = buildInstanceSkeleton(
         PEGASUS_NAMESPACENAME_INTEROP,         PEGASUS_NAMESPACENAME_INTEROP,
         PEGASUS_CLASSNAME_PG_NAMESPACEINMANAGER, targetClass);          PEGASUS_CLASSNAME_PG_NAMESPACEINMANAGER, true, targetClass);
     // Build and instance for each namespace instance.     // Build and instance for each namespace instance.
     for (Uint32 i = 0 ; i < namespaceInstances.size() ; i++)     for (Uint32 i = 0 ; i < namespaceInstances.size() ; i++)
     {     {
Line 154 
Line 155 
     const String & nameSpace)     const String & nameSpace)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::buildInstancePGNamespace");          "InteropProvider::buildNamespaceInstance()");
  
     CIMClass targetClass;     CIMClass targetClass;
     CIMInstance instance = buildInstanceSkeleton(     CIMInstance instance = buildInstanceSkeleton(
         PEGASUS_NAMESPACENAME_INTEROP, PEGASUS_CLASSNAME_PGNAMESPACE,         PEGASUS_NAMESPACENAME_INTEROP, PEGASUS_CLASSNAME_PGNAMESPACE,
         targetClass);          true, targetClass);
  
     setCommonKeys(instance);     setCommonKeys(instance);
  
Line 199 
Line 200 
     //     //
     CIMRepository::NameSpaceAttributes attributes;     CIMRepository::NameSpaceAttributes attributes;
     repository->getNameSpaceAttributes(nameSpace, attributes);     repository->getNameSpaceAttributes(nameSpace, attributes);
     String parent = String::EMPTY;      String parent;
     String name = String::EMPTY;      String name;
     Boolean shareable = false;     Boolean shareable = false;
     Boolean updatesAllowed = true;     Boolean updatesAllowed = true;
     for (CIMRepository::NameSpaceAttributes::Iterator i = attributes.start();     for (CIMRepository::NameSpaceAttributes::Iterator i = attributes.start();
Line 238 
Line 239 
         {         {
             parent=value;             parent=value;
         }         }
   #ifdef PEGASUS_ENABLE_REMOTE_CMPI
           else if (String::equalNoCase(key,"remoteInfo"))
           {
               //ATTN: remoteInfo property is not part of PG_Namespace class,
               // add the property to PG_Namespace instance once avilable.
           }
   #endif
         else         else
         {         {
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
Line 278 
Line 286 
     const String & objectManagerName)     const String & objectManagerName)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::buildNamespacePath");          "buildNamespacePath()");
  
     unsigned int propIndex = PEG_NOT_FOUND;     unsigned int propIndex = PEG_NOT_FOUND;
     CIMName propertyName;     CIMName propertyName;
Line 319 
Line 327 
  
     if(propIndex == PEG_NOT_FOUND)     if(propIndex == PEG_NOT_FOUND)
     {     {
         PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,          PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL1,
             "Invalid CIM_Namespace Key Property " +  propertyName.getString());              "Invalid CIM_Namespace Key Property %s",
               (const char*)propertyName.getString().getCString()));
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw CIMInvalidParameterException(         throw CIMInvalidParameterException(
             "Invalid CIM_Namespace key property: " + propertyName.getString());             "Invalid CIM_Namespace key property: " + propertyName.getString());
Line 374 
Line 383 
     const String & objectManagerName)     const String & objectManagerName)
 { {
     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,     PEG_METHOD_ENTER(TRC_CONTROLPROVIDER,
         "InteropProvider::validatePGNamespaceKeys");          "validateNamespaceKeys()");
  
     CIMName propertyName;     CIMName propertyName;
     if(!validateRequiredProperty(     if(!validateRequiredProperty(
Line 427 
Line 436 
     }     }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return CIMNamespaceName(getKeyValue(objectPath, CIM_NAMESPACE_PROPERTY_NAME));      return CIMNamespaceName(
           getKeyValue(objectPath, CIM_NAMESPACE_PROPERTY_NAME));
 } }
  
 void InteropProvider::deleteNamespace( void InteropProvider::deleteNamespace(
Line 448 
Line 458 
  
     repository->deleteNameSpace(deleteNamespaceName);     repository->deleteNameSpace(deleteNamespaceName);
  
     PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,      PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL4,
         "Namespace = " + deleteNamespaceName.getString() +          "Namespace = %s successfully deleted.",
             " successfully deleted.");          (const char*)deleteNamespaceName.getString().getCString()));
   
     Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,  
         "Interop Provider Delete Namespace: $0",  
         deleteNamespaceName.getString());  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 472 
Line 479 
         newInstanceReference, namespaceInstance, objectManagerName);         newInstanceReference, namespaceInstance, objectManagerName);
  
     // Create the new namespace     // Create the new namespace
     try  
     {      PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL4,
         PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,          "Namespace = %s to be created.",
             "Namespace = " + newNamespaceName.getString() +          (const char*)newNamespaceName.getString().getCString()));
                 " to be created.");  
  
         CIMRepository::NameSpaceAttributes attributes;         CIMRepository::NameSpaceAttributes attributes;
  
Line 516 
Line 522 
         //         //
         repository->createNameSpace(newNamespaceName, attributes);         repository->createNameSpace(newNamespaceName, attributes);
  
         PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,      PEG_TRACE((
             "Namespace = " + newNamespaceName.getString() +          TRC_CONTROLPROVIDER,
                 " successfully created.");          Tracer::LEVEL4,
         Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE,          "Namespace %s: Shareable = %s, Updates allowed: %s, Parent: %s"
             "Create Namespace: Shareable = $0, Updates allowed: $1,  Parent: $2",              "  successfully created.",
             newNamespaceName.getString(), shareable?          (const char*) newNamespaceName.getString().getCString(),
                     "true" : "false", shareable? "true" : "false", parent );          shareable? "true" : "false",
           updatesAllowed? "true" : "false",
     }          (const char*) parent.getCString()));
     catch(const CIMException&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
     catch(const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
  
     return newInstanceReference;     return newInstanceReference;
 } }

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