Fix bugs in the network reset test cases

Resolves openbmc/openbmc-test-automation#1050

Change-Id: Ic1b736708b24726a822c99da035aedb95d409984
Signed-off-by: Charles Paul Hofer <Charles.Hofer@ibm.com>
diff --git a/extended/code_update/bmc_recoverable_error_test.robot b/extended/code_update/bmc_recoverable_error_test.robot
index 10341b4..5cd08ad 100644
--- a/extended/code_update/bmc_recoverable_error_test.robot
+++ b/extended/code_update/bmc_recoverable_error_test.robot
@@ -19,7 +19,7 @@
     [Documentation]  Disable and re-enable the network while doing a BMC
     ...              code update.
     [Tags]  Reset_Network_During_BMC_Code_Update
-    [Template]  Reset Network During Code Update
+    [Template]  Reset Network Interface During Code Update
 
     # Image File Path   Reboot
     ${IMAGE_FILE_PATH}  ${TRUE}
diff --git a/extended/code_update/host_recoverable_error_test.robot b/extended/code_update/host_recoverable_error_test.robot
index cf63b6d..01f00b9 100644
--- a/extended/code_update/host_recoverable_error_test.robot
+++ b/extended/code_update/host_recoverable_error_test.robot
@@ -19,7 +19,7 @@
     [Documentation]  Disable and re-enable the network while doing a PNOR
     ...              code update.
     [Tags]  Reset_Network_During_Host_Code_Update
-    [Template]  Reset Network During Code Update
+    [Template]  Reset Network Interface During Code Update
 
     # Image File Path   Reboot
     ${IMAGE_FILE_PATH}  ${FALSE}
diff --git a/lib/code_update_utils.robot b/lib/code_update_utils.robot
index 3ab26e6..38fef93 100644
--- a/lib/code_update_utils.robot
+++ b/lib/code_update_utils.robot
@@ -363,7 +363,6 @@
     Execute Command On Serial Console  ifconfig eth0 down
     Sleep  30s
     Execute Command On Serial Console  ifconfig eth0 up
-    Read and Log BMC Serial Console Output
 
 
 Get Least Value Priority Image
diff --git a/lib/oem/ibm/serial_console_client.robot b/lib/oem/ibm/serial_console_client.robot
index e840a73..f2162bd 100644
--- a/lib/oem/ibm/serial_console_client.robot
+++ b/lib/oem/ibm/serial_console_client.robot
@@ -34,7 +34,7 @@
     Telnet.Set Timeout  30 minute 30 seconds
 
 
-Read and Log BMC Serial Console Output
+Read And Log BMC Serial Console Output
     [Documentation]    Reads everything that is currently available
     ...                in the output.
 
@@ -52,11 +52,13 @@
     Open Telnet Connection To BMC Serial Console
     Telnet.Write  \n
     Telnet.Execute Command  ${command_string}
+    Read And Log BMC Serial Console Output
     Close Serial Console Connection
 
 
 Close Serial Console Connection
     [Documentation]  Log out of the BMC and close telnet.
 
-    Execute Command On Serial Console  exit
+    Telnet.Write  \n
+    Telnet.Write  exit
     Telnet.Close Connection
\ No newline at end of file