BUG#: 6893

TITLE: Providers/TestProviders/ClientProvider/ClientProvider.cpp dose not compile if SSL is not enabled

DESCRIPTION: Add PEGAUS_HASSSL and if a test case still use SSL PEGASUS_ASSERT().chksrc compliant.

diff --git a/src/Providers/TestProviders/ClientProvider/ClientProvider.cpp b/src/Providers/TestProviders/ClientProvider/ClientProvider.cpp
index e177c924785a5003b0d80d8968cd50c25f39b20a..4480549aa645cc986a1a691c083989ab729f8f99 100644 (file)
--- a/src/Providers/TestProviders/ClientProvider/ClientProvider.cpp
+++ b/src/Providers/TestProviders/ClientProvider/ClientProvider.cpp
@@ -29,11 +29,6 @@
 //
 //==============================================================================
 //
-// Author: Jenny Yu , Hewlett-Packard Company
-//         (jenny_yu@hp.com)
-//         Sushma Fernandes , Hewlett-Packard Company
-//         (sushma_fernandes@hp.com)
-//
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include "ClientProvider.h"
@@ -68,132 +63,137 @@ static Boolean verifyCertificate(SSLCertificateInfo &certInfo)
 
 
 void ClientProvider::invokeMethod(
-       const OperationContext & context,
-       const CIMObjectPath & objectReference,
-       const CIMName & methodName,
-       const Array<CIMParamValue> & inParameters,
-       MethodResultResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & objectReference,
+    const CIMName & methodName,
+    const Array<CIMParamValue> & inParameters,
+    MethodResultResponseHandler & handler)
 {
-    handler.processing();
-
-    if (objectReference.getClassName().equal ("Sample_ClientProviderClass"))
-    {
-        if (methodName.equal ("DoConnect"))
-        {
-            if( inParameters.size() > 0 )
-           {
-               String          connectType = String::EMPTY;
-                CIMValue       paramVal;
-                CIMClient      client;
-
-               paramVal = inParameters[0].getValue();
-               paramVal.get( connectType );
-
-               if( connectType == "Local" )
-               {
-                   client.connectLocal();
-
-                  // Enumerate Instances.
-                  Array<CIMObjectPath> instanceNames = 
-                          client.enumerateInstanceNames(  
-                              "root/cimv2", 
-                              "CIM_ManagedElement");
-
-                  client.disconnect();
-                  handler.deliver(CIMValue(0));
-                }
-                else if ( connectType == "Remote" )
-                {
-                    String HOST     = "localhost";
-                    Uint32 PORT     = 5989;
-                    String USER     = "guest";
-                    String PASSWORD = "guest";
-                    const char* pegasusHome = getenv("PEGASUS_HOME");
-
-                    String certpath = FileSystem::getAbsolutePath(
-                            pegasusHome, PEGASUS_SSLCLIENT_CERTIFICATEFILE);
-
-                    String randFile = String::EMPTY;
-
-                    randFile = FileSystem::getAbsolutePath(
-                                pegasusHome, PEGASUS_SSLCLIENT_RANDOMFILE);
-
-                    SSLContext sslcontext(
-                                certpath, verifyCertificate, randFile);
-
-                    client.connect( 
-                                   HOST,
-                                   PORT,
-                                   sslcontext,
-                                   USER,
-                                   PASSWORD ); 
-                 }
-                  // Enumerate Instances.
-
-                  Array<CIMObjectPath> instanceNames = client.enumerateInstanceNames( "root/cimv2", "CIM_ManagedElement");
-
-                  client.disconnect();
-                 handler.deliver(CIMValue(0));
-            }
-            else
-            {
-                 handler.deliver(CIMValue(1));
-             }
-       }
-    }
-    handler.complete();
+   handler.processing();
+
+   if (objectReference.getClassName().equal ("Sample_ClientProviderClass"))
+   {
+       if (methodName.equal ("DoConnect"))
+       {
+           if( inParameters.size() > 0 )
+           {
+               String connectType = String::EMPTY;
+               CIMValue paramVal;
+               CIMClient client;
+
+               paramVal = inParameters[0].getValue();
+               paramVal.get( connectType );
+
+               if( connectType == "Local" )
+               {
+                  client.connectLocal();
+
+                 // Enumerate Instances.
+                 Array<CIMObjectPath> instanceNames = 
+                         client.enumerateInstanceNames(  
+                             "root/cimv2", 
+                             "CIM_ManagedElement");
+
+                 client.disconnect();
+                 handler.deliver(CIMValue(0));
+               }
+               else if ( connectType == "Remote" )
+               {
+                   String HOST     = "localhost";
+                   Uint32 PORT     = 5989;
+                   String USER     = "guest";
+                   String PASSWORD = "guest";
+
+#ifdef PEGASUS_HAS_SSL
+
+                   const char* pegasusHome = getenv("PEGASUS_HOME");
+
+                   String certpath = FileSystem::getAbsolutePath(
+                           pegasusHome, PEGASUS_SSLCLIENT_CERTIFICATEFILE);
+
+                   String randFile = String::EMPTY;
+
+#ifdef PEGASUS_SSL_RANDOMFILE
+                   randFile = FileSystem::getAbsolutePath(
+                               pegasusHome, PEGASUS_SSLCLIENT_RANDOMFILE);
+#endif
+
+                   SSLContext sslcontext(
+                               certpath, verifyCertificate, randFile);
+
+                   client.connect( HOST, PORT, sslcontext, USER, PASSWORD );
+#else 
+                   client.connect( HOST, PORT, USER, PASSWORD );
+#endif
+               }
+               // Enumerate Instances.
+
+               Array<CIMObjectPath> instanceNames = 
+                    client.enumerateInstanceNames( 
+                         "root/cimv2", "CIM_ManagedElement");
+
+               client.disconnect();
+               handler.deliver(CIMValue(0));
+           }
+           else
+           {
+                handler.deliver(CIMValue(1));
+           }
+       }
+   }
+   handler.complete();
 }
 
 
 void ClientProvider::getInstance(
-       const OperationContext & context,
-       const CIMObjectPath & instanceReference,
-       const Boolean includeQualifiers,
-       const Boolean includeClassOrigin,
-       const CIMPropertyList & propertyList,
-       InstanceResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & instanceReference,
+    const Boolean includeQualifiers,
+    const Boolean includeClassOrigin,
+    const CIMPropertyList & propertyList,
+    InstanceResponseHandler & handler)
 {
 }
 
 void ClientProvider::enumerateInstances(
-       const OperationContext & context,
-       const CIMObjectPath & classReference,
-       const Boolean includeQualifiers,
-       const Boolean includeClassOrigin,
-       const CIMPropertyList & propertyList,
-       InstanceResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & classReference,
+    const Boolean includeQualifiers,
+    const Boolean includeClassOrigin,
+    const CIMPropertyList & propertyList,
+    InstanceResponseHandler & handler)
 {
 }
 
 void ClientProvider::enumerateInstanceNames(
-       const OperationContext & context,
-       const CIMObjectPath & classReference,
-       ObjectPathResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & classReference,
+    ObjectPathResponseHandler & handler)
 {
 }
 
 void ClientProvider::modifyInstance(
-       const OperationContext & context,
-       const CIMObjectPath & instanceReference,
-       const CIMInstance & instanceObject,
-       const Boolean includeQualifiers,
-       const CIMPropertyList & propertyList,
-       ResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & instanceReference,
+    const CIMInstance & instanceObject,
+    const Boolean includeQualifiers,
+    const CIMPropertyList & propertyList,
+    ResponseHandler & handler)
 {
 }
 
 void ClientProvider::createInstance(
-       const OperationContext & context,
-       const CIMObjectPath & instanceReference,
-       const CIMInstance & instanceObject,
-       ObjectPathResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & instanceReference,
+    const CIMInstance & instanceObject,
+    ObjectPathResponseHandler & handler)
 {
 }
 
 void ClientProvider::deleteInstance(
-       const OperationContext & context,
-       const CIMObjectPath & instanceReference,
-       ResponseHandler & handler)
+    const OperationContext & context,
+    const CIMObjectPath & instanceReference,
+    ResponseHandler & handler)
 {
 }