From 51b376d2bf2b7c3c1b6f36310d420a126254b365 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 26 Oct 2021 16:32:06 +0300 Subject: [PATCH] robot: Support neofs-cli v0.26.x Latest version of neofs-cli uses `--endpoint` key for control service. Signed-off-by: Alex Vanin --- robot/resources/lib/storage.robot | 2 +- .../integration/network/netmap_control.robot | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/robot/resources/lib/storage.robot b/robot/resources/lib/storage.robot index 841d3d5f..35d10b91 100644 --- a/robot/resources/lib/storage.robot +++ b/robot/resources/lib/storage.robot @@ -9,7 +9,7 @@ Library Process Drop object [Arguments] ${NODE} ${WIF_STORAGE} ${CID} ${OID} - ${DROP_SIMPLE} = Run Process neofs-cli control drop-objects -r ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID} shell=True + ${DROP_SIMPLE} = Run Process neofs-cli control drop-objects --endpoint ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID} shell=True Log Many stdout: ${DROP_SIMPLE.stdout} stderr: ${DROP_SIMPLE.stderr} Should Be Equal As Integers ${DROP_SIMPLE.rc} 0 diff --git a/robot/testsuites/integration/network/netmap_control.robot b/robot/testsuites/integration/network/netmap_control.robot index 1464f566..53fef078 100644 --- a/robot/testsuites/integration/network/netmap_control.robot +++ b/robot/testsuites/integration/network/netmap_control.robot @@ -21,33 +21,33 @@ Control Operations with storage nodes ${NODE_NUM} ${NODE} ${WIF} = Get control endpoint with wif ${empty_list} = Create List - ${SNAPSHOT} = Run Process neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF} shell=True - ${HEALTHCHECK} = Run Process neofs-cli control healthcheck -r ${NODE} --wif ${WIF} shell=True + ${SNAPSHOT} = Run Process neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF} shell=True + ${HEALTHCHECK} = Run Process neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF} shell=True Should Be Equal As Integers ${HEALTHCHECK.rc} 0 - Run Process neofs-cli control set-status -r ${NODE} --wif ${WIF} --status 'offline' shell=True + Run Process neofs-cli control set-status --endpoint ${NODE} --wif ${WIF} --status 'offline' shell=True Sleep ${MAINNET_BLOCK_TIME} Tick Epoch - ${SNAPSHOT_OFFLINE}= Run Process neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF} shell=True + ${SNAPSHOT_OFFLINE}= Run Process neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF} shell=True ${NODE_NUM_OFFLINE}= Get Regexp Matches ${SNAPSHOT_OFFLINE.stdout} ${NODE_NUM} Should Be Equal ${NODE_NUM_OFFLINE} ${empty_list} - ${HEALTHCHECK_OFFLINE} = Run Process neofs-cli control healthcheck -r ${NODE} --wif ${WIF} shell=True + ${HEALTHCHECK_OFFLINE} = Run Process neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF} shell=True Should Be Equal As Integers ${HEALTHCHECK_OFFLINE.rc} 0 Should Not Be Equal ${HEALTHCHECK.stdout} ${HEALTHCHECK_OFFLINE.stdout} - Run Process neofs-cli control set-status -r ${NODE} --wif ${WIF} --status 'online' shell=True + Run Process neofs-cli control set-status --endpoint ${NODE} --wif ${WIF} --status 'online' shell=True Sleep ${MAINNET_BLOCK_TIME} Tick Epoch - ${SNAPSHOT_ONLINE} = Run Process neofs-cli control netmap-snapshot -r ${NODE} --wif ${WIF} shell=True + ${SNAPSHOT_ONLINE} = Run Process neofs-cli control netmap-snapshot --endpoint ${NODE} --wif ${WIF} shell=True ${NODE_NUM_ONLINE} = Get Regexp Matches ${SNAPSHOT_ONLINE.stdout} ${NODE_NUM} Should Be Equal ${NODE_NUM_ONLINE}[0] ${NODE_NUM} - ${HEALTHCHECK_ONLINE} = Run Process neofs-cli control healthcheck -r ${NODE} --wif ${WIF} shell=True + ${HEALTHCHECK_ONLINE} = Run Process neofs-cli control healthcheck --endpoint ${NODE} --wif ${WIF} shell=True Should Be Equal As Integers ${HEALTHCHECK_ONLINE.rc} 0 Should Be Equal ${HEALTHCHECK.stdout} ${HEALTHCHECK_ONLINE.stdout}