Automation fix for SNMP Alerts sub menu

Changes:
    - Modified "Create Error On BMC And Verify Trap On Default Port" keyword
    - Modified "Create Error On BMC And Verify Trap On Non-Default Port" keyword

Tested:
    - Ran successfully test_snmp_alerts_sub_menu.robot

Change-Id: I17bd2ed58d1f56d84096c0b02fae8f2d57721ae6
Signed-off-by: Megha G N <Megha.G.N@ibm.com>
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index 87b81e7..8cfd256 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -336,8 +336,11 @@
 
     Configure SNMP Manager Via GUI  ${SNMP_MGR1_IP}  ${SNMP_DEFAULT_PORT}
 
-    Run Keyword If  ${persistency_check} == ${True}
-    ...  Run Keywords  Reboot BMC via GUI  AND  Navigate To SNMP Alerts Page
+    IF  ${persistency_check} == ${True}
+        Reboot BMC via GUI
+        Navigate To SNMP Alerts Page
+        Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
+    END
 
     Start SNMP Manager
 
@@ -425,9 +428,10 @@
     IF  ${persistency_check} == ${True}
         Reboot BMC via GUI
         Navigate To SNMP Alerts Page
+        Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     END
 
-    Start SNMP Manager
+    Start SNMP Manager On Specific Port  ${SNMP_MGR1_IP}  ${NON_DEFAULT_PORT1}
 
     # Generate error log.
     BMC Execute Command  ${event_log_cmd}