Merge RDK-58220 : [RDKE] Migrate Functionality In TR-69Hostif And NTP Scrip…

run_l2.sh

@@ -62,7 +62,7 @@ if [ ! -z "$pid" ]; then
     kill -9 `pidof tr69hostif`
 fi
 
-/usr/local/bin/tr69hostif -c /etc/mgrlist.conf -d /etc/debug.ini -p 10999 -s 11999 | tee /opt/logs/tr69hostIf.log.0 &
+/usr/local/bin/tr69hostif -c /etc/mgrlist.conf -p 10999 -s 11999 | tee /opt/logs/tr69hostIf.log.0 &
 
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/bootup_sequence.json test/functional-tests/tests/test_bootup_sequence.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/handlers_communications.json test/functional-tests/tests/test_handlers_communications.py

src/hostif/src/hostIf_main.cpp

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -220,8 +220,6 @@
     #ifdef WEBPA_RFC_ENABLED
         bool retVal=false;
     #endif
-        const char* debugConfigFile = NULL;
-        const char* webpaNotifyConfigFile = NULL;
         //------------------------------------------------------------------------------
         // Signal handlers:
         //------------------------------------------------------------------------------
@@ -240,8 +238,6 @@
     #ifndef NEW_HTTP_SERVER_DISABLE
                 {"httpserverport",		required_argument, 0, 's'},
     #endif
-                {"debugconfig",     required_argument, 0, 'd'},
-                {"notifyconfig",    required_argument, 0, 'w'},
                 {0, 0, 0, 0}
             };
 
@@ -273,19 +269,6 @@
                 }
                 break;
 
-            case 'd':
-                if(optarg)
-                {
-                    debugConfigFile = optarg;
-                }
-                break;
-            case 'w':
-                if(optarg)
-                {
-                    webpaNotifyConfigFile = optarg;
-                } 
-                break;
-
             case 'p':
                 if(optarg)
                 {
@@ -310,7 +293,7 @@
         }
 
         /* Enable RDK logger.*/
-        if(rdk_logger_init(debugConfigFile) == 0) rdk_logger_enabled = 1;
+        if(rdk_logger_init(0 == access("/opt/debug.ini", R_OK) ? "/opt/debug.ini" : "/etc/debug.ini") == 0) rdk_logger_enabled = 1;
         #ifdef T2_EVENT_ENABLED
          t2_init(const_cast<char*>("tr69hostif"));
         #endif
@@ -381,8 +364,6 @@
             RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"g_thread NOT supported\n");
         } 
     #endif
-        /* Enable RDK logger.*/
-        if(rdk_logger_init(debugConfigFile) == 0) rdk_logger_enabled = 1;
 
         #if defined(USE_WIFI_PROFILE)
             /* Perform the necessary operations to initialise the WiFi device */
@@ -496,7 +477,7 @@
         //------------------------------------------------------------------------------
 
         RDK_LOG(RDK_LOG_DEBUG,LOG_TR69HOSTIF,"Starting WEBPA Parodus Connections\n");
-        libpd_set_notifyConfigFile(webpaNotifyConfigFile);
+        libpd_set_notifyConfigFile(0 == access("/opt/notify_webpa_cfg.json", R_OK) ? "/opt/notify_webpa_cfg.json" : "/etc/notify_webpa_cfg.json");
         if(0 == pthread_create(&parodus_init_tid, NULL, libpd_client_mgr, NULL))
         {
             RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"Initiating Connection with PARODUS success.. \n");

tr69hostif.service

@@ -25,8 +25,7 @@ Type=notify
 SyslogIdentifier="tr69hostif"
 EnvironmentFile=/etc/device.properties
 ExecStartPre=/bin/mkdir -p /opt/tr-181
-ExecStartPre=/bin/sh -c '/lib/rdk/opt-override.sh'
-ExecStart=/usr/bin/tr69hostif -c /etc/mgrlist.conf -p 10999 -s 11999 -d $DEBUGINIFILE -w $WEBPANOTIFYINCFG
+ExecStart=/usr/bin/tr69hostif -c /etc/mgrlist.conf -p 10999 -s 11999
 ExecStop=/bin/kill -15 $MAINPID
 RestartSec=10s
 Restart=always

tr69hostif_no_new_http_server.service

@@ -26,8 +26,7 @@ Type=notify
 SyslogIdentifier="tr69hostif"
 EnvironmentFile=/etc/device.properties
 ExecStartPre=/bin/mkdir -p /opt/tr-181
-ExecStartPre=/bin/sh -c '/lib/rdk/opt-override.sh'
-ExecStart=/usr/bin/tr69hostif -c /etc/mgrlist.conf -p 10999 -d $DEBUGINIFILE -w $WEBPANOTIFYINCFG
+ExecStart=/usr/bin/tr69hostif -c /etc/mgrlist.conf -p 10999
 ExecStop=/bin/kill -15 $MAINPID
 Restart=always