X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fdefault.robot;h=03843c64c66c51002f8bb0f65adb089f87898508;hb=22ff475dae7f9f09e8b3b7c899731803752761c0;hp=b60ebc98a7c3349de15624019f7854ad1f554ca8;hpb=c36ff98841584cf4c80d31d0fb4dc26320d7d493;p=csit.git diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index b60ebc98a7..03843c64c6 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -550,9 +550,8 @@ | | ... | default value: ${1} | | ... | | ... | _NOTE:_ This KW sets following test case variables: -| | ... | - tmp_volume - Docker volume mounted as /tmp directory on DUT1. -| | ... | - dcr_uuid - UUID string (including prefix - underscore character) of -| | ... | DUT1 /tmp volume. +| | ... | - dcr_uuid - Parent container UUID. +| | ... | - dcr_root - Parent container overlay. | | ... | | ... | *Example:* | | ... @@ -565,19 +564,18 @@ | | Import Library | resources.libraries.python.ContainerUtils.ContainerManager | | ... | engine=${container_engine} | WITH NAME | ${container_group} | | ... -| | ${tmp_volume}= | Get Environment Variable | CSIT_DUT1_VOL -| | ${dcr_uuid}= | Remove String | ${tmp_volume} | DUT1_VOL -| | Set Test Variable | ${tmp_volume} +| | ${dcr_uuid}= | Get Environment Variable | CSIT_DUT1_UUID +| | ${dcr_root}= | Run Keyword | Get Docker Mergeddir | ${nodes['DUT1']} +| | ... | ${dcr_uuid} | | Set Test Variable | ${dcr_uuid} +| | Set Test Variable | ${dcr_root} | | ... | | Construct chains of containers on all DUTs | ${chains} | ${nodeness} -| | ... | set_nf_cpus=${False} +| | ... | nested=${True} | | Acquire all '${container_group}' containers | | Create all '${container_group}' containers | | Configure VPP in all '${container_group}' containers -| | Stop VPP service on all DUTs | ${nodes} -| | Install VPP in all '${container_group}' containers -| | Start VPP service on all DUTs | ${nodes} +| | Start VPP in all '${container_group}' containers | | Append To List | ${container_groups} | ${container_group} | Tear down TAP functional test