aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-11-13 13:30:48 +0000
committerPeter Mikus <pmikus@cisco.com>2019-11-13 13:33:53 +0000
commit7de465c09018b1cf739a28992fe198ccd5f5699d (patch)
treee8c02828cf39619e73d0d927012a3aa0a79b598b /resources/libraries
parent3a42930d52dca48f4df64f9d7816dfc95c286a16 (diff)
LIGATO: Remove
Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: I0c9b8b07ed3a113e24a38faaddd5ed06fae67768
Diffstat (limited to 'resources/libraries')
-rw-r--r--resources/libraries/bash/function/gather.sh134
-rw-r--r--resources/libraries/robot/shared/default.robot67
-rw-r--r--resources/libraries/robot/shared/test_setup.robot16
-rw-r--r--resources/libraries/robot/shared/test_teardown.robot10
4 files changed, 1 insertions, 226 deletions
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh
index 1fc2d3e604..429a2cc91f 100644
--- a/resources/libraries/bash/function/gather.sh
+++ b/resources/libraries/bash/function/gather.sh
@@ -34,7 +34,7 @@ function gather_build () {
# Functions called:
# - die - Print to stderr and exit, defined in common.sh
# - gather_os - Parse os parameter for OS/distro name.
- # - gather_dpdk, gather_vpp, gather_ligato - See their definitions.
+ # - gather_dpdk, gather_vpp - See their definitions.
# Multiple other side effects are possible,
# see functions called from here for their current description.
@@ -53,10 +53,6 @@ function gather_build () {
DUT="vpp"
gather_vpp || die "The function should have died on error."
;;
- *"ligato"*)
- DUT="kubernetes"
- gather_ligato || die "The function should have died on error."
- ;;
*"dpdk"*)
DUT="dpdk"
gather_dpdk || die "The function should have died on error."
@@ -115,133 +111,6 @@ function gather_dpdk () {
}
-function gather_ligato () {
-
- # Build docker image (with vpp, ligato and vpp-agent),
- # and put it to ${DOWNLOAD_DIR}/.
- #
- # Access rights needed for:
- # - "wget", "git clone", "dpdk -x", "cd" above ${CSIT_DIR}.
- # - "sudo" without password.
- # - With sudo:
- # - "dpdk -i" is allowed.
- # - "docker" commands have everything they needs.
- # Variables read:
- # - DOWNLOAD_DIR - Path to directory pybot takes the build to test from.
- # - CSIT_DIR - Path to existing root of local CSIT git repository.
- # Files read:
- # - ${CSIT_DIR}/VPP_AGENT_STABLE_VER - Vpp agent version to use.
- # Directories updated:
- # - ${DOWNLOAD_DIR} - Docker image stored, VPP *.deb stored and deleted.
- # - /tmp/vpp - VPP is unpacked there, not cleaned afterwards.
- # - ${CSIT_DIR}/vpp-agent - Created, vpp-agent git repo si cloned there.
- # - Also, various temporary files are stored there.
- # System consequences:
- # - Docker package is installed.
- # - Presumably dockerd process is started.
- # - The ligato/dev-vpp-agent docker image is downloaded.
- # - Results of subsequent image manipulation are probably left lingering.
- # Other hardcoded values:
- # - Docker .deb file name to download and install.
- # Functions called:
- # - die - Print to stderr and exit, defined in common_functions.sh
- # - gather_vpp - See eponymous fragment file assumend to be sourced already.
- # TODO: What is the best order of description items?
-
- # TODO: Many of the following comments act as abstraction.
- # But the abstracted blocks are mostly one-liners (plus "|| die"),
- # so maybe it is not worth introducing fragments/functions for the blocks.
- # TODO: This fragment is too long anyway, split it up.
-
- set -exuo pipefail
-
- gather_vpp || die "The function should have died on error."
-
- mkdir -p /tmp/vpp && rm -f /tmp/vpp/* || {
- die "Failed to create temporary directory!"
- }
- dpkg -x "${DOWNLOAD_DIR}/vpp_"*".deb" "/tmp/vpp" || {
- die "Failed to extract VPP packages for kubernetes!"
- }
-
- ligato_repo_url="https://github.com/ligato/"
- vpp_agent_stable_ver="$(< "${CSIT_DIR}/VPP_AGENT_STABLE_VER")" || {
- die "Failed to read vpp-agent stable version!"
- }
-
- # Clone & checkout stable vpp-agent.
- cd "${CSIT_DIR}" || die "Change directory failed!"
- git clone -b master --single-branch \
- "${ligato_repo_url}/vpp-agent" "vpp-agent" || {
- die "Failed to run: git clone ${ligato_repo_url}/vpp-agent!"
- }
- cd "vpp-agent" || die "Change directory failed!"
-
- # Install Docker.
- curl -fsSL https://get.docker.com | sudo bash || {
- die "Failed to install Docker package!"
- }
-
- # Pull ligato/dev_vpp_agent docker image and re-tag as local.
- sudo docker pull "ligato/dev-vpp-agent:${vpp_agent_stable_ver}" || {
- die "Failed to pull Docker image!"
- }
- params=(ligato/dev-vpp-agent:${vpp_agent_stable_ver} dev_vpp_agent:latest)
- sudo docker tag "${params[@]}" || {
- die "Failed to tag Docker image!"
- }
-
- # Start dev_vpp_agent container as daemon.
- sudo docker run --rm -itd --name "agentcnt" "dev_vpp_agent" bash || {
- die "Failed to run Docker image!"
- }
-
- # Copy latest vpp api into running container.
- sudo docker exec agentcnt rm -rf "agentcnt:/usr/share/vpp/api" || {
- die "Failed to remove previous API!"
- }
- sudo docker cp "/tmp/vpp/usr/share/vpp/api" "agentcnt:/usr/share/vpp" || {
- die "Failed to copy files Docker image!"
- }
-
- # Recompile vpp-agent.
- script_arg=". ~/.bashrc; cd /go/src/github.com/ligato/vpp-agent"
- script_arg+=" && make generate && make install"
- sudo docker exec -i agentcnt script -qec "${script_arg}" || {
- die "Failed to recompile vpp-agent in Docker image!"
- }
- # Make sure .deb files of other version are not present.
- rm_cmd="rm -vf /opt/vpp-agent/dev/vpp/build-root/vpp*.deb /opt/vpp/*.deb"
- sudo docker exec agentcnt bash -c "${rm_cmd}" || {
- die "Failed to remove VPP debian packages!"
- }
- for f in "${DOWNLOAD_DIR}"/*; do
- sudo docker cp "$f" "agentcnt:/opt/vpp-agent/dev/vpp/build-root"/ || {
- die "Failed to copy files to Docker image!"
- }
- done
- # Save container state.
- sudo docker commit "$(sudo docker ps -q)" "dev_vpp_agent:latest" || {
- die "Failed to commit state of Docker image!"
- }
-
- # Build prod_vpp_agent docker image.
- cd "docker/prod" || die "Change directory failed."
- sudo docker build --tag "prod_vpp_agent" --no-cache "." || {
- die "Failed to build Docker image!"
- }
- # Export Docker image.
- sudo docker save "prod_vpp_agent" | gzip > "prod_vpp_agent.tar.gz" || {
- die "Failed to save Docker image!"
- }
- docker_image="$(readlink -e "prod_vpp_agent.tar.gz")" || {
- die "Failed to get Docker image path!"
- }
- rm -r "${DOWNLOAD_DIR}/vpp"* || die "Failed to remove VPP packages!"
- mv "${docker_image}" "${DOWNLOAD_DIR}"/ || die "Failed to move image!"
-}
-
-
function gather_vpp () {
# Variables read:
@@ -269,7 +138,6 @@ function gather_vpp () {
set -exuo pipefail
case "${TEST_CODE}" in
- # Not csit-vpp as this code is re-used by ligato gathering.
"csit-"*)
# Use downloaded packages with specific version.
if [[ "${TEST_CODE}" == *"daily"* ]] || \
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 8bad73d70e..c0b61fcea9 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -369,70 +369,3 @@
| | Vpp Show Errors On All DUTs | ${nodes}
| | Verify VPP PID in Teardown
| | Clean Sockets On All Nodes | ${nodes}
-
-# TODO: Cleanup when ligato is gone.
-| Create Kubernetes VSWITCH startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${jumbo} - Jumbo packet. Type: boolean
-| | ... | - ${phy_cores} - Physical cores. Type: integer
-| | ... | - ${rxq} - RX queues. Type: integer
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${True} \
-| | ... | \| ${1} \| ${1}
-| | ...
-| | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo}=${False}
-| | ...
-| | ${cpu_count_int} | Convert to Integer | ${phy_cores}
-| | ${thr_count_int} | Convert to Integer | ${phy_cores}
-| | :FOR | ${dut} | IN | @{duts}
-| | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']}
-| | | ... | ${${dut}_if1} | ${${dut}_if2}
-| | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']}
-| | | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1}
-| | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2}
-| | | ${thr_count_int}= | Run keyword if | ${smt_used}
-| | | ... | Evaluate | int(${cpu_count_int}*2)
-| | | ... | ELSE | Set variable | ${thr_count_int}
-| | | ${rxq_count_int}= | Run keyword if | ${rx_queues}
-| | | ... | Set variable | ${rx_queues}
-| | | ... | ELSE | Evaluate | int(${thr_count_int}/2)
-| | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0
-| | | ... | Set variable | ${1}
-| | | ... | ELSE | Set variable | ${rxq_count_int}
-| | | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config
-| | | ... | node=${nodes['${dut}']} | phy_cores=${phy_cores}
-| | | ... | cpu_node=${numa} | jumbo=${jumbo} | rxq_count_int=${rxq_count_int}
-| | | ... | buffers_per_numa=${215040}
-| | | ... | filename=/tmp/vswitch.conf | if1=${if1_pci} | if2=${if2_pci}
-| | | Run keyword if | ${thr_count_int} > 1
-| | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD
-| | | Set Tags | ${thr_count_int}T${cpu_count_int}C
-| | Set Test Variable | ${smt_used}
-| | Set Test Variable | ${thr_count_int}
-| | Set Test Variable | ${cpu_count_int}
-| | Set Test Variable | ${rxq_count_int}
-
-# TODO: Cleanup when ligato is gone.
-| Create Kubernetes VNF'${i}' startup config on all DUTs
-| | [Documentation] | Create base startup configuration of VNF in Kubernetes
-| | ... | deploy to all DUTs.
-| | ...
-| | ${i_int}= | Convert To Integer | ${i}
-| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut1} | phy_cores=${vnf_cpus} | cpu_node=${dut1_numa}
-| | ... | cpu_skip=${cpu_skip} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
-| | ${config}= | Run keyword | Create Kubernetes VNF startup config
-| | ... | node=${dut2} | phy_cores=${vnf_cpus} | cpu_node=${dut2_numa}
-| | ... | cpu_skip=${cpu_skip} | filename=/tmp/vnf${i}.conf
-| | ... | i=${i_int}
diff --git a/resources/libraries/robot/shared/test_setup.robot b/resources/libraries/robot/shared/test_setup.robot
index 17e9e6c459..c90ed68a79 100644
--- a/resources/libraries/robot/shared/test_setup.robot
+++ b/resources/libraries/robot/shared/test_setup.robot
@@ -39,19 +39,3 @@
| | ...
| | :FOR | ${dut} | IN | @{duts}
| | | Clean Up Namespaces | ${nodes['${dut}']}
-
-| Additional Test Setup Action For ligato
-| | [Documentation]
-| | ... | Additional Setup for tests which uses Ligato Kubernetes.
-| | ...
-| | Apply Kubernetes resource on all duts | ${nodes} | namespaces/csit.yaml
-| | Apply Kubernetes resource on all duts | ${nodes} | pods/kafka.yaml
-| | Apply Kubernetes resource on all duts | ${nodes} | pods/etcdv3.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | configmaps/vswitch-agent-cfg.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | configmaps/vnf-agent-cfg.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | pods/contiv-sfc-controller.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | pods/contiv-vswitch.yaml
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index 0beeff4484..336cff5dad 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -129,13 +129,3 @@
| | ... | Show SR Steering Policies on all DUTs | ${nodes}
| | Run Keyword If Test Failed
| | ... | Show SR LocalSIDs on all DUTs | ${nodes}
-
-| Additional Test Tear Down Action For ligato
-| | [Documentation]
-| | ... | Additional teardown for performance tests with Ligato.
-| | ...
-| | Run Keyword If Test Failed
-| | ... | Get Kubernetes logs on all DUTs | ${nodes} | csit
-| | Run Keyword If Test Failed
-| | ... | Describe Kubernetes resource on all DUTs | ${nodes} | csit
-| | Delete Kubernetes resource on all DUTs | ${nodes} | csit