Chg: update image tag in helm values to v2.7.0-RC5

Fixes for WIFI-10942

build

@@ -1 +1 @@
-22
+23

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owsec:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owsec
-    tag: v2.7.0-RC4
+    tag: v2.7.0-RC5
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

src/framework/MicroService.h

@@ -3075,7 +3075,7 @@ namespace OpenWifi {
 
 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"x-rest",32,128};
+	    Poco::ThreadPool	    Pool_{"x-rest",8,128};
 	    RESTAPI_GenericServer   Server_;
 
         RESTAPI_ExtServer() noexcept:
@@ -3209,7 +3209,7 @@ namespace OpenWifi {
         const Poco::ThreadPool & Pool() { return Pool_; }
 	private:
 	    std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
-	    Poco::ThreadPool	    Pool_{"i-rest",32,96};
+	    Poco::ThreadPool	    Pool_{"i-rest",4,64};
 	    RESTAPI_GenericServer   Server_;
 
         RESTAPI_IntServer() noexcept:
@@ -3406,7 +3406,7 @@ namespace OpenWifi {
         bool                        NoBuiltInCrypto_=false;
         Poco::JWT::Signer	        Signer_;
 		Poco::Logger				&Logger_;
-		Poco::ThreadPool				TimerPool_{"timer:pool",2,16};
+		Poco::ThreadPool				TimerPool_{"timer:pool",2,32};
 		std::unique_ptr<BusEventManager>	BusEventManager_;
     };
 
@@ -3602,14 +3602,14 @@ namespace OpenWifi {
                 FileChannel->setProperty("archive", "timestamp");
                 FileChannel->setProperty("path", LoggingLocation);
                 Poco::AutoPtr<Poco::AsyncChannel> Async_File(new Poco::AsyncChannel(FileChannel));
-				Poco::AutoPtr<Poco::AsyncChannel> Async_Muxer(new Poco::AsyncChannel(LogMuxer()));
+				// Poco::AutoPtr<Poco::AsyncChannel> Async_Muxer(new Poco::AsyncChannel(LogMuxer()));
-                Poco::AutoPtr<Poco::SplitterChannel> Splitter(new Poco::SplitterChannel);
+                // Poco::AutoPtr<Poco::SplitterChannel> Splitter(new Poco::SplitterChannel);
-				Splitter->addChannel(Async_File);
+				// Splitter->addChannel(Async_File);
-				Splitter->addChannel(Async_Muxer);
+				// Splitter->addChannel(Async_Muxer);
 				Poco::AutoPtr<Poco::PatternFormatter> Formatter(new Poco::PatternFormatter);
                 Formatter->setProperty("pattern", LoggingFormat);
                 Poco::AutoPtr<Poco::FormattingChannel> FormattingChannel(
-                        new Poco::FormattingChannel(Formatter, Splitter));
+                        new Poco::FormattingChannel(Formatter, Async_File));
                 Poco::Logger::root().setChannel(FormattingChannel);
             }
             auto Level = Poco::Logger::parseLevel(MicroService::instance().ConfigGetString("logging.level", "debug"));

test_scripts/curl/cli

@@ -179,13 +179,19 @@ getlogo() {
 }
 
 createuser() {
-    payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : true}"
+case $3 in
-    curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/user/0" \
+    root|admin|subscriber|csr|system|installer|noc|accounting)
-        -H "Accept: application/json" \
+        payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : true, \"userRole\" : \"$3\" }"
-        -H "Content-Type: application/json" \
+        curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/user/0" \
-        -H "Authorization: Bearer ${token}" \
+            -H "Accept: application/json" \
-        -d "$payload"  > ${result_file}
+            -H "Content-Type: application/json" \
-    jq < ${result_file}
+            -H "Authorization: Bearer ${token}" \
+            -d "$payload"  > ${result_file}
+        jq < ${result_file} ;;
+    *)
+        echo "Error: userRole has to be one of root|admin|subscriber|csr|system|installer|noc|accounting"
+	exit 1 ;;
+esac
 }
 
 createsub() {
@@ -199,13 +205,19 @@ createsub() {
 }
 
 createuser_v() {
-    payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : true}"
+case $3 in
-    curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/user/0?email_verification=true" \
+    root|admin|subscriber|csr|system|installer|noc|accounting)
-        -H "Accept: application/json" \
+        payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : true, \"userRole\" : \"$3\" }"
-        -H "Content-Type: application/json" \
+        curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/user/0?email_verification=true" \
-        -H "Authorization: Bearer ${token}" \
+            -H "Accept: application/json" \
-        -d "$payload"  > ${result_file}
+            -H "Content-Type: application/json" \
-    jq < ${result_file}
+            -H "Authorization: Bearer ${token}" \
+            -d "$payload"  > ${result_file}
+        jq < ${result_file} ;;
+    *)
+        echo "Error: userRole has to be one of root|admin|subscriber|csr|system|installer|noc|accounting"
+	exit 1 ;;
+esac
 }
 
 deleteuser() {
@@ -447,7 +459,7 @@ test_service() {
 	echo "----------------"
 	echo "Create test user"
 	echo "----------------"
-	createuser testuser@mail.telecominfraproject.com 'Test123!'
+	createuser testuser@mail.telecominfraproject.com 'Test123!' accounting
 	check_response $result_file
 	USER_ID="$(jq -r '.id' < $result_file)"
 
@@ -481,35 +493,35 @@ help() {
     echo
     echo    "Usage: cli <cmd> [args]"
     echo
-    echo    "listendpoints                          Get all the system endpoints."
+    echo    "listendpoints                              Get all the system endpoints."
-    echo    "emailtest                              Generate a forgot Password e-amil to the logged in user."
+    echo    "emailtest                                  Generate a forgot Password e-amil to the logged in user."
-    echo    "me                                     Show information about the logged user."
+    echo    "me                                         Show information about the logged user."
-    echo    "createuser <email> <password>          Create a user with an initial password and force the user to change password."
+    echo    "createuser <email> <password> <userrole>   Create a user with an initial password and force the user to change password."
-    echo    "createuser_v <email> <password>        Same as create user but also force an e-mail verification."
+    echo    "createuser_v <email> <password> <userrole> Same as create user but also force an e-mail verification."
-    echo    "deleteuser <user UUID>                 Delete the user."
+    echo    "deleteuser <user UUID>                     Delete the user."
-    echo    "getuser <user UUID>                    Get the user information."
+    echo    "getuser <user UUID>                        Get the user information."
-    echo    "listusers                              List users."
+    echo    "listusers                                  List users."
-    echo    "policies                               List the login and access policies."
+    echo    "policies                                   List the login and access policies."
-    echo    "setavatar <user UUID> <filename>       Sets the avatar for user to the image in filename."
+    echo    "setavatar <user UUID> <filename>           Sets the avatar for user to the image in filename."
-    echo    "getavatar <user UUID>                  Get the avatar for the user."
+    echo    "getavatar <user UUID>                      Get the avatar for the user."
-    echo    "deleteavatar <user UUID>               Remove the avatar for a user."
+    echo    "deleteavatar <user UUID>                   Remove the avatar for a user."
-    echo    "sendemail <recipient> <from>           Sends a test email to see if the e-mail system is working."
+    echo    "sendemail <recipient> <from>               Sends a test email to see if the e-mail system is working."
-    echo    "setloglevel <subsystem> <loglevel>     Set the log level for s specific subsystem."
+    echo    "setloglevel <subsystem> <loglevel>         Set the log level for s specific subsystem."
-    echo    "getloglevels                           Get the current log levels for all subsystems."
+    echo    "getloglevels                               Get the current log levels for all subsystems."
-    echo    "getloglevelnames                       Get the log level names available."
+    echo    "getloglevelnames                           Get the log level names available."
-    echo    "getsubsystemnames                      Get the list of subsystems."
+    echo    "getsubsystemnames                          Get the list of subsystems."
-    echo    "systeminfo                             Get basic system information."
+    echo    "systeminfo                                 Get basic system information."
-    echo    "reloadsubsystem <subsystem name>       Reload the configuration for a subsystem."
+    echo    "reloadsubsystem <subsystem name>           Reload the configuration for a subsystem."
-    echo    "test_service                           Run a set of CLI commands for testing purposes"
+    echo    "test_service                               Run a set of CLI commands for testing purposes"
     echo
 }
 
 shopt -s nocasematch
 
 case "$1" in
-    "createuser") login; createuser "$2" "$3"; logout;;
+    "createuser") login; createuser "$2" "$3" "$4"; logout;;
     "createsub") login; createsub "$2" "$3"; logout;;
-    "createuser_v") login; createuser_v "$2" "$3"; logout;;
+    "createuser_v") login; createuser_v "$2" "$3" "$4"; logout;;
     "createsub_v") login; createsub_v "$2" "$3"; logout;;
     "deleteuser") login; deleteuser "$2" ; logout;;
     "deletesub") login; deletesub "$2" ; logout;;