In suite 1node.robot: check creation of snapshot with transferred persisted data...

Change-Id: I15e803ff464efa360724a9939c5362762a9f7e9a
Signed-off-by: lbuckuli <lbuckuli@cisco.com>

diff --git a/csit/libraries/SSHKeywords.robot b/csit/libraries/SSHKeywords.robot
index edd72f770f320cfacb0f22546584555ca8946864..7dc93128beec5054553d0c9402d4e4c5420306b1 100644 (file)
--- a/csit/libraries/SSHKeywords.robot
+++ b/csit/libraries/SSHKeywords.robot
@@ -83,7 +83,7 @@ Log_Command_Results
 Execute_Command_Passes
     [Arguments]    ${command}    ${return_success_only}=True    ${log_on_success}=False    ${log_on_failure}=True    ${stderr_must_be_empty}=False
     [Documentation]    Execute command via the active SSH connection. For success, rc has to be zero and optionally stderr has to be empty.
-    ...    Log everything, depending on arguments and success. Retrun either success string or stdout.
+    ...    Log everything, depending on arguments and success. Return either success string or stdout.
     ...    TODO: Do we want to support customizing return values the same way as SSHLibrary.Execute_Command does?
     ${stdout}    ${stderr}    ${rc} =    SSHLibrary.Execute_Command    ${command}    return_stderr=True    return_rc=True
     ${emptiness_status}    ${result} =    BuiltIn.Run_Keyword_And_Ignore_Error    BuiltIn.Should_Be_Empty    ${stderr}

diff --git a/csit/suites/controller/akka_upgrade/1node.robot b/csit/suites/controller/akka_upgrade/1node.robot
index fa7f02b77f55778e709168e0179709441b916388..87c9e2c04f7caf514854e5f5ec259fdef9685e1e 100644 (file)
--- a/csit/suites/controller/akka_upgrade/1node.robot
+++ b/csit/suites/controller/akka_upgrade/1node.robot
@@ -119,7 +119,11 @@ Transfer_Persisted_Data
     [Documentation]    Move snapshots and journal into the original ODL installation.
     # SSHLibrary.Switch_Connection    ${odl_system_ssh_index}
     ${stdout} =    SSHKeywords.Execute_Command_Should_Pass    cp -rv "${alternative_bundlefolder}/snapshots" "${WORKSPACE}/${BUNDLEFOLDER}/" && cp -rv "${alternative_bundlefolder}/journal" "${WORKSPACE}/${BUNDLEFOLDER}/"
-    # TODO: Should we require a snapshot was created?
+    Set_Suite_Variable    ${stdout}
+
+Check_Snapshot_With_Transferred_Persisted_Data
+    [Documentation]    Fail if no snapshot file was created.
+    BuiltIn.Should_Contain    ${stdout}    /snapshots/    msg='Snapshot file was not created.'
 
 Start_Newer_Odl
     [Documentation]    Start the newer ODL on background.