diff --git a/tests/robot/libraries/docker.robot b/tests/robot/libraries/docker.robot index 24761d2594..a4430ba7cc 100644 --- a/tests/robot/libraries/docker.robot +++ b/tests/robot/libraries/docker.robot @@ -32,29 +32,6 @@ Add Agent Node Again ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec ${node} bash -c 'echo $HOSTNAME' Set Suite Variable ${${node}_again_HOSTNAME} ${hostname} -Add Agent Node With Kafka - [Arguments] ${node} - Open SSH Connection ${node} ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Execute On Machine ${node} ${DOCKER_COMMAND} create -e MICROSERVICE_LABEL=${node} --sysctl net.ipv6.conf.all.disable_ipv6=0 -it -p ${${node}_REST_API_HOST_PORT}:${${node}_REST_API_PORT} --name ${node} ${${node}_DOCKER_IMAGE} bash - #Execute On Machine ${node} ${DOCKER_COMMAND} create -e MICROSERVICE_LABEL=${node} -it -p ${${node}_PING_HOST_PORT}:${${node}_PING_PORT} -p ${${node}_REST_API_HOST_PORT}:${${node}_REST_API_PORT} --name ${node} ${${node}_DOCKER_IMAGE} - Write To Machine ${node} ${DOCKER_COMMAND} start ${node} - Append To List ${NODES} ${node} - Create Session ${node} http://${DOCKER_HOST_IP}:${${node}_REST_API_HOST_PORT} - ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec ${node} bash -c 'echo $HOSTNAME' - Set Suite Variable ${${node}_HOSTNAME} ${hostname} - -Add Agent Node With Kafka Again - [Arguments] ${node} - Open SSH Connection ${node}_again ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Execute On Machine ${node}_again ${DOCKER_COMMAND} create -e MICROSERVICE_LABEL=${node} --sysctl net.ipv6.conf.all.disable_ipv6=0 -it -p ${${node}_AGAIN_REST_API_HOST_PORT}:${${node}_AGAIN_REST_API_PORT} --name ${node}_again ${${node}_DOCKER_IMAGE} bash - #Execute On Machine ${node} ${DOCKER_COMMAND} create -e MICROSERVICE_LABEL=${node} -it -p ${${node}_PING_HOST_PORT}:${${node}_PING_PORT} -p ${${node}_REST_API_HOST_PORT}:${${node}_REST_API_PORT} --name ${node} ${${node}_DOCKER_IMAGE} - Write To Machine ${node}_again ${DOCKER_COMMAND} start ${node}_again - Append To List ${NODES} ${node}_again - Create Session ${node}_again http://${DOCKER_HOST_IP}:${${node}_REST_API_HOST_PORT} - ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec ${node} bash -c 'echo $HOSTNAME' - Set Suite Variable ${${node}_again_HOSTNAME} ${hostname} - - Add Agent VPP Node [Arguments] ${node} ${vswitch}=${FALSE} ${add_params}= Set Variable If ${vswitch} --pid=host -v "/var/run/docker.sock:/var/run/docker.sock" ${EMPTY} @@ -92,22 +69,6 @@ Add Agent VPP Node With Own Vpp Config ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec ${node} bash -c 'echo $HOSTNAME' Set Suite Variable ${${node}_HOSTNAME} ${hostname} -Add Agent VPP Node With Kafka - [Arguments] ${node} ${vswitch}=${FALSE} - ${add_params}= Set Variable If ${vswitch} --pid=host -v "/var/run/docker.sock:/var/run/docker.sock" ${EMPTY} - Open SSH Connection ${node} ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Execute On Machine ${node} ${DOCKER_COMMAND} create -e MICROSERVICE_LABEL=${node} -e VPP_STATUS_PUBLISHERS=etcd -e INITIAL_LOGLVL=debug --sysctl net.ipv6.conf.all.disable_ipv6=0 -it --privileged -v "${VPP_AGENT_HOST_MEMIF_SOCKET_FOLDER}:${${node}_MEMIF_SOCKET_FOLDER}" -v "${DOCKER_SOCKET_FOLDER}:${${node}_SOCKET_FOLDER}" -p ${${node}_VPP_HOST_PORT}:${${node}_VPP_PORT} -p ${${node}_REST_API_HOST_PORT}:${${node}_REST_API_PORT} --name ${node} ${add_params} ${${node}_DOCKER_IMAGE} - Write To Machine ${node} ${DOCKER_COMMAND} start ${node} - Append To List ${NODES} ${node} - Open SSH Connection ${node}_term ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Open SSH Connection ${node}_vat ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - vpp_term: Open VPP Terminal ${node} - vat_term: Open VAT Terminal ${node} - Create Session ${node} http://${DOCKER_HOST_IP}:${${node}_REST_API_HOST_PORT} - ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec ${node} bash -c 'echo $HOSTNAME' - Set Suite Variable ${${node}_HOSTNAME} ${hostname} - - Add Agent Libmemif Node [Arguments] ${node} Open SSH Connection ${node} ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} @@ -280,27 +241,6 @@ Update Agent In Dev Container Write To Container Until Prompt dev make Write To Container Until Prompt dev make install -Start Kafka Server - Open SSH Connection kafka ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Execute On Machine kafka ${KAFKA_SERVER_CREATE} - ${out}= Write To Machine Until String kafka ${DOCKER_COMMAND} start -i kafka INFO success: kafka entered RUNNING state - ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec kafka bash -c 'echo $HOSTNAME' - Set Suite Variable ${KAFKA_HOSTNAME} ${hostname} - -Stop Kafka Server - Execute On Machine docker ${KAFKA_SERVER_DESTROY} - -Start VPP Ctl Container - [Arguments] ${command}=bash - Open SSH Connection vpp_agent_ctl ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} - Execute On Machine vpp_agent_ctl ${DOCKER_COMMAND} create -it --name vpp_agent_ctl ${VPP_AGENT_CTL_IMAGE_NAME} ${command} - Write To Machine vpp_agent_ctl ${DOCKER_COMMAND} start -i vpp_agent_ctl - ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec vpp_agent_ctl bash -c 'echo $HOSTNAME' - Set Suite Variable ${VPP_AGENT_CTL_HOSTNAME} ${hostname} - -Stop VPP Ctl Container - Execute On Machine docker ${DOCKER_COMMAND} rm -f vpp_agent_ctl - Start SFC Controller Container With Own Config [Arguments] ${config} Open SSH Connection sfc_controller ${DOCKER_HOST_IP} ${DOCKER_HOST_USER} ${DOCKER_HOST_PSWD} @@ -308,7 +248,6 @@ Start SFC Controller Container With Own Config SSHLibrary.Put_file ${DATA_FOLDER}/${config} /tmp/ Execute On Machine sfc_controller ${DOCKER_COMMAND} cp /tmp/${config} sfc_controller:${SFC_CONTROLLER_CONF_PATH} Write To Machine sfc_controller ${DOCKER_COMMAND} start -i sfc_controller - #Sleep 400s ${hostname}= Execute On Machine docker ${DOCKER_COMMAND} exec sfc_controller sh -c 'echo $HOSTNAME' Set Suite Variable ${SFC_CONTROLLER_HOSTNAME} ${hostname} diff --git a/tests/robot/libraries/setup-teardown.robot b/tests/robot/libraries/setup-teardown.robot index 305eafde63..e94039a86e 100644 --- a/tests/robot/libraries/setup-teardown.robot +++ b/tests/robot/libraries/setup-teardown.robot @@ -25,10 +25,7 @@ Testsuite Setup Enable SSH Logging ${OUTPUTDIR}/ssh.log Open Connection To Docker Host Create Connections For ETCD And Kafka - #Start Kafka Server Start ETCD Server - #Run Keyword If "${CTL_TOOL}"== "vppctl" Start VPP Ctl Container - Start VPP Ctl Container Get Env And SW Version docker Make Datastore Snapshots startup @@ -37,9 +34,6 @@ Testsuite Teardown Make Datastore Snapshots teardown Remove All Nodes Stop ETCD Server - #Run Keyword If "${CTL_TOOL}"== "vppctl" Stop VPP Ctl Container - Stop VPP Ctl Container - #Stop Kafka Server Get Connections Close All Connections Check Agent Logs For Errors @@ -48,17 +42,11 @@ Testsuite Teardown Test Setup Open Connection To Docker Host Create Connections For ETCD And Kafka - #Start Kafka Server Start ETCD Server - #Run Keyword If "${CTL_TOOL}"== "vppctl" Start VPP Ctl Container - Start VPP Ctl Container Make Datastore Snapshots startup Test Teardown Make Datastore Snapshots teardown - #Run Keyword If "${CTL_TOOL}"== "vppctl" Stop VPP Ctl Container - Stop VPP Ctl Container - #Stop Kafka Server Stop ETCD Server Remove All Nodes Get Connections diff --git a/tests/robot/suites/api/BFD/bfd_api.robot b/tests/robot/suites/api/BFD/bfd_api.robot index 0f02109c4b..58089830ce 100644 --- a/tests/robot/suites/api/BFD/bfd_api.robot +++ b/tests/robot/suites/api/BFD/bfd_api.robot @@ -69,7 +69,6 @@ Check Interfaces On VPP2 # Write To Machine agent_vpp_2_term show err # vat_term: Interfaces Dump agent_vpp_1 # vat_term: Interfaces Dump agent_vpp_2 -# Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps # Execute In Container agent_vpp_1 ip a # Execute In Container agent_vpp_2 ip a diff --git a/tests/robot/suites/crudIPv6/linux_ip_route_crudIPv6.robot b/tests/robot/suites/crudIPv6/linux_ip_route_crudIPv6.robot index fb4245d42b..e13976f283 100644 --- a/tests/robot/suites/crudIPv6/linux_ip_route_crudIPv6.robot +++ b/tests/robot/suites/crudIPv6/linux_ip_route_crudIPv6.robot @@ -38,7 +38,6 @@ Configure Environment Show Interfaces Before Setup vpp_term: Show Interfaces agent_vpp_1 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Setup Interfaces etcdctl.Put Veth Interface Via Linux Plugin node=agent_vpp_1 namespace=ns1 name=ns1_veth1 host_if_name=ns1_veth1_linux mac=d2:74:8c:12:67:d2 peer=ns2_veth2 ip=${VETH_IP1} prefix=64 diff --git a/tests/robot/suites/misc/etcd_clear.robot b/tests/robot/suites/misc/etcd_clear.robot index de3da6ee6f..fd68790944 100644 --- a/tests/robot/suites/misc/etcd_clear.robot +++ b/tests/robot/suites/misc/etcd_clear.robot @@ -103,7 +103,6 @@ Show Interfaces And Other Objects After Config Write To Machine agent_vpp_2_term show err vat_term: Interfaces Dump agent_vpp_1 vat_term: Interfaces Dump agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container agent_vpp_2 ip a @@ -234,7 +233,6 @@ Final Sleep After Resync For Manual Checking Sleep ${RESYNC_SLEEP} -*** Keywords *** *** Keywords *** TestSetup Make Datastore Snapshots ${TEST_NAME}_test_setup diff --git a/tests/robot/suites/sfc/east-west/vswitch_2x_vnf_vpp/vswitch_2x_vnf_vpp.robot b/tests/robot/suites/sfc/east-west/vswitch_2x_vnf_vpp/vswitch_2x_vnf_vpp.robot index 214cc15061..8a2c444343 100644 --- a/tests/robot/suites/sfc/east-west/vswitch_2x_vnf_vpp/vswitch_2x_vnf_vpp.robot +++ b/tests/robot/suites/sfc/east-west/vswitch_2x_vnf_vpp/vswitch_2x_vnf_vpp.robot @@ -121,7 +121,6 @@ Show Interfaces And Other Objects After Resync vat_term: Interfaces Dump agent_vpp_1 vat_term: Interfaces Dump agent_vpp_2 vat_term: Interfaces Dump agent_vpp_3 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container agent_vpp_2 ip a Execute In Container agent_vpp_3 ip a diff --git a/tests/robot/suites/traffic/physical_int_traffic/physical_int_traffic.robot b/tests/robot/suites/traffic/physical_int_traffic/physical_int_traffic.robot index 4a784711fb..7a60346bd7 100644 --- a/tests/robot/suites/traffic/physical_int_traffic/physical_int_traffic.robot +++ b/tests/robot/suites/traffic/physical_int_traffic/physical_int_traffic.robot @@ -115,7 +115,6 @@ Show Interfaces And Other Objects After Config Write To Machine agent_vpp_2_term show err vat_term: Interfaces Dump agent_vpp_1 vat_term: Interfaces Dump agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container agent_vpp_2 ip a diff --git a/tests/robot/suites/traffic/tap_int_traffic/tap_int_and_route_config_order_traffic.robot b/tests/robot/suites/traffic/tap_int_traffic/tap_int_and_route_config_order_traffic.robot index 0bc6ef5117..727dbc27c3 100644 --- a/tests/robot/suites/traffic/tap_int_traffic/tap_int_and_route_config_order_traffic.robot +++ b/tests/robot/suites/traffic/tap_int_traffic/tap_int_and_route_config_order_traffic.robot @@ -134,7 +134,6 @@ Configure Environment 2 Show Interfaces Before Setup 2 vpp_term: Show Interfaces agent_vpp_1 vpp_term: Show Interfaces agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Add Static Route From VPP1 Linux To VPP2 2 Put Linux Route node=agent_vpp_1 namespace=${EMPTY} interface=${NAME_VPP1_TAP1} routename=${NAME_VPP1_LINUX_TO_VPP2} ip=${IP_VPP2_TAP1_NETWORK} next_hop=${EMPTY} diff --git a/tests/robot/suites/traffic/tapv2_int_traffic/tapv2_int_and_route_config_order_traffic.robot b/tests/robot/suites/traffic/tapv2_int_traffic/tapv2_int_and_route_config_order_traffic.robot index 20dee70a2c..d33880d963 100644 --- a/tests/robot/suites/traffic/tapv2_int_traffic/tapv2_int_and_route_config_order_traffic.robot +++ b/tests/robot/suites/traffic/tapv2_int_traffic/tapv2_int_and_route_config_order_traffic.robot @@ -130,11 +130,8 @@ Start Containers And Add Nodes Configure Environment 2 [Tags] setup Configure Environment 1 - -Show Interfaces Before Setup 2 vpp_term: Show Interfaces agent_vpp_1 vpp_term: Show Interfaces agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Add Static Route From VPP1 Linux To VPP2 2 Put Linux Route node=agent_vpp_1 namespace=${EMPTY} interface=${NAME_VPP1_TAP1} routename=${NAME_VPP1_LINUX_TO_VPP2} ip=${IP_VPP2_TAP1_NETWORK} next_hop=${EMPTY} diff --git a/tests/robot/suites/traffic/veth_af_packet_traffic/veth_af_packet_traffic.robot b/tests/robot/suites/traffic/veth_af_packet_traffic/veth_af_packet_traffic.robot index 2e7951c401..6e63beba54 100644 --- a/tests/robot/suites/traffic/veth_af_packet_traffic/veth_af_packet_traffic.robot +++ b/tests/robot/suites/traffic/veth_af_packet_traffic/veth_af_packet_traffic.robot @@ -400,7 +400,6 @@ Show Interfaces And Other Objects Write To Machine agent_vpp_1_term show br Write To Machine agent_vpp_1_term show err vat_term: Interfaces Dump agent_vpp_1 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container node_1 ip a Execute In Container node_2 ip a diff --git a/tests/robot/suites/traffic/veth_afpacket_memif_vxlan_traffic/veth_afpacket_memif_vxlan_traffic.robot b/tests/robot/suites/traffic/veth_afpacket_memif_vxlan_traffic/veth_afpacket_memif_vxlan_traffic.robot index 2f18e4cb93..9bef6942a7 100644 --- a/tests/robot/suites/traffic/veth_afpacket_memif_vxlan_traffic/veth_afpacket_memif_vxlan_traffic.robot +++ b/tests/robot/suites/traffic/veth_afpacket_memif_vxlan_traffic/veth_afpacket_memif_vxlan_traffic.robot @@ -115,7 +115,6 @@ Show Interfaces And Other Objects After Config Write To Machine agent_vpp_2_term show err vat_term: Interfaces Dump agent_vpp_1 vat_term: Interfaces Dump agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container agent_vpp_2 ip a diff --git a/tests/robot/suites/trafficIPv6/physical_int_traffic/physical_int_trafficIPv6.robot b/tests/robot/suites/trafficIPv6/physical_int_traffic/physical_int_trafficIPv6.robot index 6c2a6ecbd2..290f698328 100644 --- a/tests/robot/suites/trafficIPv6/physical_int_traffic/physical_int_trafficIPv6.robot +++ b/tests/robot/suites/trafficIPv6/physical_int_traffic/physical_int_trafficIPv6.robot @@ -120,7 +120,6 @@ Show Interfaces And Other Objects After Config Write To Machine agent_vpp_2_term show err vat_term: Interfaces Dump agent_vpp_1 vat_term: Interfaces Dump agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps Execute In Container agent_vpp_1 ip a Execute In Container agent_vpp_2 ip a diff --git a/tests/robot/suites/trafficIPv6/tap_int_traffic/tap_int_and_route_config_order_trafficIPv6.robot b/tests/robot/suites/trafficIPv6/tap_int_traffic/tap_int_and_route_config_order_trafficIPv6.robot index c33883daed..69d7edc71a 100644 --- a/tests/robot/suites/trafficIPv6/tap_int_traffic/tap_int_and_route_config_order_trafficIPv6.robot +++ b/tests/robot/suites/trafficIPv6/tap_int_traffic/tap_int_and_route_config_order_trafficIPv6.robot @@ -129,8 +129,6 @@ Start Containers And Add Nodes Configure Environment 2 [Tags] setup Configure Environment 1 - -Show Interfaces Before Setup 2 vpp_term: Show Interfaces agent_vpp_1 vpp_term: Show Interfaces agent_vpp_2 diff --git a/tests/robot/suites/trafficIPv6/tapv2_int_traffic/tapv2_int_and_route_config_order_trafficIPv6.robot b/tests/robot/suites/trafficIPv6/tapv2_int_traffic/tapv2_int_and_route_config_order_trafficIPv6.robot index 1150acf7ec..196f2a43ed 100644 --- a/tests/robot/suites/trafficIPv6/tapv2_int_traffic/tapv2_int_and_route_config_order_trafficIPv6.robot +++ b/tests/robot/suites/trafficIPv6/tapv2_int_traffic/tapv2_int_and_route_config_order_trafficIPv6.robot @@ -129,11 +129,6 @@ Configure Environment 2 [Tags] setup Configure Environment 1 -Show Interfaces Before Setup 2 - vpp_term: Show Interfaces agent_vpp_1 - vpp_term: Show Interfaces agent_vpp_2 - Write To Machine vpp_agent_ctl vpp-agent-ctl ${AGENT_VPP_ETCD_CONF_PATH} -ps - Add Static Route From VPP1 Linux To VPP2 2 Put Linux Route node=agent_vpp_1 namespace=${EMPTY} interface=${NAME_VPP1_TAP1} routename=${NAME_VPP1_LINUX_TO_VPP2} ip=${IP_VPP2_TAP1_NETWORK} next_hop=${EMPTY} diff --git a/tests/robot/variables/common_variables.robot b/tests/robot/variables/common_variables.robot index c0c5c6b72d..2e2aa51213 100644 --- a/tests/robot/variables/common_variables.robot +++ b/tests/robot/variables/common_variables.robot @@ -24,11 +24,8 @@ ${SFC_CONTROLLER_CONF_PATH} /opt/sfc-controller/dev/sfc.conf # Variables for container with agent and VPP ${AGENT_VPP_IMAGE_NAME} prod_vpp_agent -#${AGENT_VPP_ETCD_CONF_PATH} /opt/vnf-agent/dev/etcd.conf -#${AGENT_VPP_KAFKA_CONF_PATH} /opt/vnf-agent/dev/kafka.conf ${AGENT_VPP_ETCD_CONF_PATH} /opt/vpp-agent/dev/etcd.conf ${AGENT_VPP_KAFKA_CONF_PATH} /opt/vpp-agent/dev/kafka.conf -${VPP_AGENT_CTL_IMAGE_NAME} ${AGENT_VPP_IMAGE_NAME} ${VPP_AGENT_HOST_MEMIF_SOCKET_FOLDER} /run/vpp ${VPP_CONF_PATH} /etc/vpp/vpp.conf diff --git a/tests/robot/variables/obsolete_common_variables.py b/tests/robot/variables/obsolete_common_variables.py index 17db115290..4e36ddad2e 100644 --- a/tests/robot/variables/obsolete_common_variables.py +++ b/tests/robot/variables/obsolete_common_variables.py @@ -10,7 +10,6 @@ KAFKA_SERVER_CREATE = 'sudo docker run -itd -p 2181:2181 -p 9092:9092 --env ADVERTISED_PORT=9092 --name kafka spotify/kafka' KAFKA_SERVER_DESTROY = 'sudo docker rm -f kafka' -VPP_AGENT_CTL_IMAGE_NAME = 'containers.cisco.com/amarcine/prod_vpp_agent_shrink' AGENT_VPP_IMAGE_NAME = 'containers.cisco.com/amarcine/prod_vpp_agent_shrink' AGENT_VPP_ETCD_CONF_PATH = '/opt/vnf-agent/dev/etcd.conf' diff --git a/tests/robot/variables/obsolete_jozo_local_variables.py b/tests/robot/variables/obsolete_jozo_local_variables.py index fe13888fb1..ae5a688cf8 100644 --- a/tests/robot/variables/obsolete_jozo_local_variables.py +++ b/tests/robot/variables/obsolete_jozo_local_variables.py @@ -4,7 +4,6 @@ DOCKER_HOST_USER = 'robot' DOCKER_HOST_PSWD = 'robot' -VPP_AGENT_CTL_IMAGE_NAME = 'prod_vpp_agent' AGENT_VPP_IMAGE_NAME = 'prod_vpp_agent' AGENT_VPP_1_DOCKER_IMAGE = AGENT_VPP_IMAGE_NAME AGENT_VPP_2_DOCKER_IMAGE = AGENT_VPP_IMAGE_NAME diff --git a/tests/robot/variables/obsolete_tricorder_variables.py b/tests/robot/variables/obsolete_tricorder_variables.py index 5de195f1d7..ef017f76de 100644 --- a/tests/robot/variables/obsolete_tricorder_variables.py +++ b/tests/robot/variables/obsolete_tricorder_variables.py @@ -5,7 +5,6 @@ DOCKER_HOST_PSWD = 'rsa_id' DOCKER_COMMAND = 'docker' -VPP_AGENT_CTL_IMAGE_NAME = 'prod_vpp_agent' AGENT_VPP_IMAGE_NAME = 'prod_vpp_agent' AGENT_VPP_1_DOCKER_IMAGE = AGENT_VPP_IMAGE_NAME