Rebase

run_l2.sh

@@ -36,13 +36,13 @@ sed -i '/ModelName/ {n; n; a\
 
 dos2unix /etc/data-model-stb.xml
 
-  echo "RDK_PROFILE=STB" > /etc/device.properties
+echo "RDK_PROFILE=STB" > /etc/device.properties
 
 echo "VERSION=99.99.15.07" >> /version.txt
 echo "Proto|http" >> /opt/fwdnldstatus.txt
 echo "Status|Download In Progress" >> /opt/fwdnldstatus.txt
-echo "DnldFile|ELTE11MWR_E037.000.00.8.1s22_DEV.bin" >> /opt/fwdnldstatus.txt
-echo "DnldURL|https://dac15cdlserver.ae.ccp.xcal.tv/Images" >> /opt/fwdnldstatus.txt
+echo "DnldFile|TESTIMAGE_DEV.bin" >> /opt/fwdnldstatus.txt
+echo "DnldURL|https://mockserver.tv/Images" >> /opt/fwdnldstatus.txt
 echo "FwUpdateState|Download complete" >> /opt/fwdnldstatus.txt
 
 cp ./src/integrationtest/conf/mgrlist.conf /etc/

src/hostif/parodusClient/startParodus/startParodus.cpp

@@ -38,7 +38,7 @@
 
 #define WEBPA_CFG_FILE "/etc/webpa_cfg.json"
 #define WEBPA_CFG_OVERIDE_FILE "/opt/webpa_cfg.json"
-#define CRUD_CONFIG_FILE "/opt/parodus_cfg.json"
+#define CRUD_CONFIG_FILE "/opt/secure/parodus_cfg.json"
 #define SSL_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
 #define JWT_KEY "/etc/ssl/certs/webpa-rs256.pem"
 #define RECORD_JWT_PAYLOAD_FILE "/tmp/xmidt-jwt-payload.json"

src/hostif/parodusClient/waldb/data-model/data-model-generic.xml

@@ -4060,7 +4060,8 @@
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.memcapture." access="readOnly" minEntries="0" maxEntries="1" >
       <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
         <syntax>
-           <boolean/>
+	  <boolean/>
+          <default type="factory" value="false"/>
         </syntax>
       </parameter>
       <parameter base="Duration" access="readWrite" notification="0" maxNotification="2" >

test/functional-tests/features/tr69hostif_bootup_sequence.feature

@@ -25,3 +25,111 @@ Feature: tr69hostif runs as daemon to collect data
     Then the tr69hostif should be running as a daemon
     And  when the tr69hostif is initialized successfully
     Then the tr69hostif validation is done for all instance
+
+  Scenario: json handler thread initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "SERVER: Started server successfully." message
+
+  Scenario: http server thread initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "SERVER: Started server successfully." message
+
+  Scenario: thread creation
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should not log the "pthread_create() failed" message
+
+  Scenario: parodus initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Initiating Connection with PARODUS success.." message
+
+  Scenario: rbus initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should not log the "[rbusdml] Failed to initialized, rbus_checkStatus() returned with status" message
+    And should not log the "consumer: rbus_open failed" message
+    And should log the "[rbusdml]Successfully get the complete parameter list" message
+    And should log the "rbus_regDataElements registered successfully" message
+
+  Scenario: hostif initialize config manager status
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should not log the "Failed to hostIf_initalize_ConfigManger()" message
+
+  Scenario: Successful PwrContInterface thread initialization
+    When a new thread is requested with valid configuration
+    Then the system initializes the thread
+    And should log the "created getPwrContInterface thread.." message
+    And marks the thread as ready for execution
+
+  Scenario: Successful ethernet thread initialization
+    When a new thread is requested with valid configuration                                                                                                                     Then the system initializes the thread
+    And should log the "checkForUpdates] Got lock.." message
+    And marks the thread as ready for execution
+
+  Scenario: Data model merge
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Entering data model merge process" message
+    And should log the "Merged XML files successfully into /tmp/data-model.xml" message
+    And should log the "Successfully merged Data Model" message
+
+  Scenario: Data model initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Successfully initialize Data Model" message
+
+  Scenario: Bootstrap configuration
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Bootstrap Properties File" message
+    And should log the "/opt/secure/RFC/bootstrap.ini" message
+
+  Scenario: device manager initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Device manager Initialized success" message
+    And should log the "break loop" message
+
+  Scenario: webpa process requests
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Starting WEBPA Parodus Connections" message
+
+  Scenario: PowerController initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "start PowerController_Init()" message
+    And should log the "completed PowerController_Init()" message
+    And should log the "Got the powercontroller interface" message
+
+  Scenario: power mode initialization
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And should log the "Registering power mode change callback" message
+    And should log the "Registered power mode change callback" message
+
+
+  Scenario: rfc_defaults_ini file
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And  when the tr69hostif is initialized successfully
+    And the /tmp/rfcdefaults.ini file should exist
+
+

test/functional-tests/features/tr69hostif_handlers_communications.feature

@@ -30,3 +30,11 @@ Feature: tr69hostif runs as daemon to collect data
     Then the tr69hostif validation is done for RFC get/set handlers
     Then the tr69hostif validation is done for Non RFC get/set handlers
     Then the tr69hostif validation is done for Bootstrap get/set handlers
+
+  Scenario: bootstrap files exist
+    Given When the tr69hostif binary is invoked
+    Then the tr69hostif should be running as a daemon
+    And when the tr69hostif is initialized successfully
+    And the /opt/secure/RFC/bootstrap.ini file should exist
+    And the /opt/secure/RFC/bootstrap.journal file should exist
+

test/functional-tests/tests/helper_functions.py

@@ -83,7 +83,7 @@ def get_process_uptime(pid):
 def get_pid(name: str):
     return subprocess.run(f"pidof {name}", shell=True, capture_output=True).stdout.decode('utf-8').strip()
 
-def clear_T2logs():
+def clear_tr69hostiflogs():
     subprocess.run(f"echo '' > {LOG_FILE}", shell=True)
 
 def grep_log_file(search: str, log_file: str):
@@ -97,7 +97,7 @@ def remove_T2bootup_flag():
         except:
             pass
 
-def grep_T2logs(search: str):
+def grep_tr69hostiflogs(search: str):
     search_result = ""
     search_pattern = re.compile(re.escape(search), re.IGNORECASE)
     try:

test/functional-tests/tests/profile_helper_functions.py

@@ -30,8 +30,8 @@
 
     print("Execute L2 Test suit for tr69hostif ")
     print("Clearing T2 logs")
-    clear_T2logs()
+    clear_tr69hostiflogs()
     print("Messages after clearing")
-    response = grep_T2logs(GREP_STRING)
+    response = grep_tr69hostiflogs(GREP_STRING)
     print(response)