commit 317a94ca81f0ef7273f5561b5e77b64649375e8f
author Andrea Campanella <andrea@opennetworking.org> Fri Nov 13 10:38:19 2020 +0100
committer Andrea Campanella <andrea@opennetworking.org> Fri Nov 13 12:00:55 2020 +0100
tree e65bab1d1b62e832867eab7931bbdaa56ec5c181
parent 5899be1e4d8f92e458902200fd91da1f5d64f03d

[VOL-3641] Fix for None olt_device_id and of_id in multi-olt test

Change-Id: Ib4aa5381ef6d84115351ef31038fe14875b6706d

libraries/utils.robot

diff --git a/libraries/utils.robot b/libraries/utils.robot
index ebdeb6e..892d457 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -569,7 +569,8 @@
     [Arguments]      ${serial_number}
     FOR    ${I}    IN RANGE    0    ${olt_count}
         ${sn}=    Get From Dictionary    ${olt_ids}[${I}]    sn
-        ${of_id}=    Run Keyword IF    "${serial_number}"=="${sn}"    Get From Dictionary    ${olt_ids}[${I}]    of_id
+        ${of_id}=    Run Keyword IF    "${serial_number}"=="${sn}"
+        ...    Get From Dictionary    ${olt_ids}[${I}]    of_id    ELSE    Set Variable    ${of_id}
     END
     [Return]    ${of_id}
 
@@ -578,7 +579,8 @@
     [Arguments]      ${serial_number}
     FOR    ${I}    IN RANGE    0    ${olt_count}
         ${sn}=    Get From Dictionary    ${olt_ids}[${I}]    sn
-        ${olt_device_id}=    Run Keyword IF    "${serial_number}"=="${sn}"    Get From Dictionary    ${olt_ids}[${I}]    device_id
+        ${olt_device_id}=    Run Keyword IF    "${serial_number}"=="${sn}"
+        ...    Get From Dictionary    ${olt_ids}[${I}]    device_id    ELSE    Set Variable    ${olt_device_id}
     END
     [Return]    ${olt_device_id}