[VOL-3999] Restarting port-forward after restarting VOLTHA-core
component
 Adding explicit error messages for ONOS App upgrade test

Change-Id: I80a2c56dfd26d88d2494d89c67990eb4697fd55c
(cherry picked from commit 2769d2b958bd84e6c829e8b48a2b174ac29676e5)
diff --git a/libraries/onos.robot b/libraries/onos.robot
index ffc30da..bc1c675 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -706,7 +706,7 @@
     [Arguments]    ${url}    ${app_name}
     [Documentation]    This keyword deactivates and uninstalls the given ONOS App
     ${rc}=    Run And Return Rc    curl --fail -sSL -X DELETE ${url}/onos/v1/applications/${app_name}
-    Should Be Equal As Integers    ${rc}    0
+    Should Be Equal As Integers    ${rc}    0   Can't delete ${app_name} from ONOS
 
 Verify ONOS App Active
     [Arguments]    ${url}    ${app_name}    ${app_version}=${EMPTY}
@@ -719,7 +719,7 @@
     ...    curl --fail -sSL ${url}/onos/v1/applications/${app_name} | jq -r .version
     Run Keyword If    '${app_version}'!='${EMPTY}'
     ...    Run Keywords
-    ...    Should Be Equal As Integers    ${rc1}    0
+    ...    Should Be Equal As Integers    ${rc1}    0   Can't read app ${app_name} status from ONOS
     ...    AND    Should Be Equal    '${output1}'    '${app_version}'
 
 Install And Activate ONOS App
@@ -729,7 +729,7 @@
     ...    curl --fail -sSL -H Content-Type:application/octet-stream -
     ...    X POST ${url}/onos/v1/applications?activate=true --data-binary \@${app_oar_file}
     ${rc}    ${output}    Run And Return Rc And Output    ${cmd}
-    Should Be Equal As Integers    ${rc}    0
+    Should Be Equal As Integers    ${rc}    0   Can't load onos app ${app_oar_file} to ONOS"
     Log    ${output}
 
 Get ONOS App Details
@@ -737,5 +737,5 @@
     [Documentation]    Retrieves ONOS App Details
     ${rc}    ${output}    Run And Return Rc And Output
     ...    curl --fail -sSL ${url}/onos/v1/applications/${app_name}
-    Should Be Equal As Integers    ${rc}    0
+    Should Be Equal As Integers    ${rc}    0   Can't read app ${app_name} details from ONOS
     [Return]    ${output}