From e7ad66f3147662973039caaac33015de7e0c6f8c Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 11 Nov 2019 16:14:32 +0000 Subject: HONEYCOMB: Remove Signed-off-by: Peter Mikus Change-Id: I60d80564050cb786c7b1e0a08f31f8292f82197e --- resources/tools/doc_gen/gen_rst.py | 1 - resources/tools/doc_gen/src/index.rst | 1 - resources/tools/doc_gen/src/overview.rst | 1 - .../doc_gen/src/tests.vpp.func.ip4_tunnels.rst | 3 - .../doc_gen/src/tests.vpp.func.ip6_tunnels.rst | 3 - resources/tools/doc_gen/src/tests.vpp.func.rst | 3 - .../tools/doc_gen/src/tests.vpp.func.vm_vhost.rst | 3 - resources/tools/presentation/conf.py | 2 - resources/tools/presentation/doc/pal_lld.rst | 2 - resources/tools/presentation/specification.yaml | 1 - resources/tools/scripts/download_hc_build_pkgs.sh | 175 ----------- resources/tools/scripts/download_hc_pkgs.sh | 113 ------- .../ansible/roles/cleanup/tasks/sut.yaml | 6 - .../virl/topologies/double-ring-nested.trusty.virl | 327 --------------------- .../virl/topologies/double-ring-nested.trusty.yaml | 98 ------ 15 files changed, 739 deletions(-) delete mode 100644 resources/tools/doc_gen/src/tests.vpp.func.ip4_tunnels.rst delete mode 100644 resources/tools/doc_gen/src/tests.vpp.func.ip6_tunnels.rst delete mode 100644 resources/tools/doc_gen/src/tests.vpp.func.rst delete mode 100644 resources/tools/doc_gen/src/tests.vpp.func.vm_vhost.rst delete mode 100755 resources/tools/scripts/download_hc_build_pkgs.sh delete mode 100755 resources/tools/scripts/download_hc_pkgs.sh delete mode 100644 resources/tools/virl/topologies/double-ring-nested.trusty.virl delete mode 100644 resources/tools/virl/topologies/double-ring-nested.trusty.yaml (limited to 'resources/tools') diff --git a/resources/tools/doc_gen/gen_rst.py b/resources/tools/doc_gen/gen_rst.py index 3d04568de2..c6d82817ee 100755 --- a/resources/tools/doc_gen/gen_rst.py +++ b/resources/tools/doc_gen/gen_rst.py @@ -95,7 +95,6 @@ def create_file_name(path, start): """Create the name of rst file. Example: - resources.libraries.python.honeycomb.rst tests.perf.rst :param path: Path to a module to be documented. diff --git a/resources/tools/doc_gen/src/index.rst b/resources/tools/doc_gen/src/index.rst index aa44809174..6ba9a2671b 100644 --- a/resources/tools/doc_gen/src/index.rst +++ b/resources/tools/doc_gen/src/index.rst @@ -13,7 +13,6 @@ Contents tests.dpdk.perf tests.nsh_sfc.func tests.tldk.func - tests.vpp.func tests.vpp.device tests.vpp.perf indices diff --git a/resources/tools/doc_gen/src/overview.rst b/resources/tools/doc_gen/src/overview.rst index f9cc4e4ed4..4b7ab20d87 100644 --- a/resources/tools/doc_gen/src/overview.rst +++ b/resources/tools/doc_gen/src/overview.rst @@ -15,7 +15,6 @@ CSIT Description #. Identified existing FD.io project dependencies and interactions: - vpp - Vector Packet Processing. - - honeycomb - Honeycomb Agent for management plane testing. - ci-management - Management repo for Jenkins Job Builder, script and management related to the Jenkins CI configuration. diff --git a/resources/tools/doc_gen/src/tests.vpp.func.ip4_tunnels.rst b/resources/tools/doc_gen/src/tests.vpp.func.ip4_tunnels.rst deleted file mode 100644 index 1c296e308f..0000000000 --- a/resources/tools/doc_gen/src/tests.vpp.func.ip4_tunnels.rst +++ /dev/null @@ -1,3 +0,0 @@ -IPv4 Tunnels -============ - diff --git a/resources/tools/doc_gen/src/tests.vpp.func.ip6_tunnels.rst b/resources/tools/doc_gen/src/tests.vpp.func.ip6_tunnels.rst deleted file mode 100644 index 40dbbc569b..0000000000 --- a/resources/tools/doc_gen/src/tests.vpp.func.ip6_tunnels.rst +++ /dev/null @@ -1,3 +0,0 @@ -IPv6 Tunnels -============ - diff --git a/resources/tools/doc_gen/src/tests.vpp.func.rst b/resources/tools/doc_gen/src/tests.vpp.func.rst deleted file mode 100644 index c0e02ee2d0..0000000000 --- a/resources/tools/doc_gen/src/tests.vpp.func.rst +++ /dev/null @@ -1,3 +0,0 @@ -VPP Functional Tests -==================== - diff --git a/resources/tools/doc_gen/src/tests.vpp.func.vm_vhost.rst b/resources/tools/doc_gen/src/tests.vpp.func.vm_vhost.rst deleted file mode 100644 index c669b232ea..0000000000 --- a/resources/tools/doc_gen/src/tests.vpp.func.vm_vhost.rst +++ /dev/null @@ -1,3 +0,0 @@ -VM VHOST -======== - diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 49cd975d8e..9b1a8ef33d 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -79,8 +79,6 @@ rst_epilog = """ .. _VIRL ubuntu images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/ubuntu/lists/?h={release} .. _VIRL centos images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/centos/lists/?h={release} .. _VIRL nested: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/nested/?h={release} -.. _CSIT Honeycomb Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.honeycomb.html -.. _CSIT Honeycomb Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.honeycomb.html .. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.dpdk.perf.html .. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.html .. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.html diff --git a/resources/tools/presentation/doc/pal_lld.rst b/resources/tools/presentation/doc/pal_lld.rst index 28cb892067..e3589ae748 100644 --- a/resources/tools/presentation/doc/pal_lld.rst +++ b/resources/tools/presentation/doc/pal_lld.rst @@ -169,9 +169,7 @@ The structure of the section "Environment" is as follows (example): DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results" DIR[DTR,PERF,DPDK]: "{DIR[DTR]}/dpdk_performance_results" DIR[DTR,PERF,VPP]: "{DIR[DTR]}/vpp_performance_results" - DIR[DTR,PERF,HC]: "{DIR[DTR]}/honeycomb_performance_results" DIR[DTR,FUNC,VPP]: "{DIR[DTR]}/vpp_functional_results" - DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results" DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results" DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements" diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index 837dfee1e6..127768d680 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -45,7 +45,6 @@ DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu" DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos" DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu" - DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results" DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results" DIR[DTR,FUNC,DMM]: "{DIR[DTR]}/dmm_functional_results" DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements" diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh deleted file mode 100755 index 6b595a4752..0000000000 --- a/resources/tools/scripts/download_hc_build_pkgs.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2019 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -STREAM=$1 -OS=$2 -jvpp_commit_id=$3 - -# Figure out what system we are running on -if [[ -f /etc/os-release ]];then - source /etc/os-release -else - echo "Cannot determine OS version" - exit 1 -fi -echo "----- OS INFO -----" -echo DISTRIB_ID: ${ID} -echo DISTRIB_RELEASE: ${VERSION_ID} -echo DISTRIB_CODENAME: ${VERSION_CODENAME} -echo DISTRIB_DESCRIPTION: ${PRETTY_NAME} - -VERSION=`../vpp-version` -JVPP_VERSION=`../jvpp-version` - -if [[ -n "${jvpp_commit_id}" ]]; then - # Skipping download of JVPP because it was built from source - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-dev libvppinfra-dev vpp-api-python" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-dev vpp-api-python" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-devel vpp-api-python" -else - VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-java vpp-api-python" - VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" - VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-java vpp-api-python" -fi - -IGNORE_DEPS="" -# Check OS and stream to set correct packages -if [[ "$ID" == "centos" ]]; then - VPP_ARTIFACTS=${VPP_RPM_ARTIFACTS} -elif [[ "$ID" == "ubuntu" ]]; then - if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then - VPP_ARTIFACTS=${VPP_DEB_ARTIFACTS} - IGNORE_DEPS="vpp,vpp-lib,vpp-plugins" - else - VPP_ARTIFACTS=${VPP_DEB_NEW_ARTIFACTS} - IGNORE_DEPS="vpp,libvppinfra,vpp-plugin-core" - fi -fi -VPP_DEB_PACKAGES="" -VPP_RPM_PACKAGES="" -for ART in ${VPP_ARTIFACTS}; do - if [[ "${VERSION}" != 'RELEASE' ]]; then - if [[ "$ART" == "vpp-api-java" ]]; then - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$JVPP_VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$JVPP_VERSION" - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$VERSION" - fi - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART" - fi -done - -echo "----- DOWNLOADING PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then - echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - sudo rm /etc/apt/sources.list.d/99fd.io.list - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash - apt-get download ${VPP_DEB_PACKAGES} || true -elif [[ "$ID" == "centos" ]]; then - if [[ -f /etc/yum.repos.d/fdio-master.repo ]]; then - echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - sudo rm /etc/yum.repos.d/fdio-master.repo - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - sudo yum -y install --downloadonly --downloaddir=./ ${VPP_RPM_PACKAGES} || true -fi -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" - -# If JVPP variable is set, clone and build JVPP from the specified commit -# Otherwise skip this step, hc2vpp will use JVPP snapshots from Nexus -if [[ -n "${jvpp_commit_id}" ]]; then - # first we need to install vpp and deps to be able to build jvpp - if [[ "$ID" == "centos" ]]; then - sudo rpm -i vpp-*.rpm - else - if [[ "$VERSION_CODENAME" == "xenial" ]]; then - sudo dpkg --ignore-depends=libmbedcrypto0,libmbedtls10,libmbedx509-0 -i vpp_*.deb vpp-dev_*.deb vpp-plugin-core_*.deb libvppinfra_*.deb libvppinfra-dev_*.deb - elif [[ "$VERSION_CODENAME" == "bionic" ]]; then - sudo dpkg --ignore-depends=libmbedcrypto1,libmbedtls10,libmbedx509-0 -i vpp_*.deb vpp-dev_*.deb vpp-plugin-core_*.deb libvppinfra_*.deb libvppinfra-dev_*.deb - else - echo "Error: Unsupported UBUNTU version." - exit 1 - fi - fi - # create new dir for custom jvpp build (jvpp directory already exists in hc2vpp, therefore using jvpp_src) - mkdir jvpp_src - cd jvpp_src - git clone https://gerrit.fd.io/r/jvpp - cd jvpp - ref=`git ls-remote -q | grep ${jvpp_commit_id} | awk '{print $2}'` - git fetch origin ${ref} && git checkout FETCH_HEAD - ./clean.sh - if [[ "$ID" == "centos" ]]; then - cmake3 . - else - cmake . - fi - make package - if [[ $? != 0 ]]; then - echo "JVPP build failed." - exit 1 - fi - cp build-root/packages/vpp-api-java* ${WORKSPACE}/csit - cd ${WORKSPACE}/csit - # Clean up when done. - if [[ "$ID" == "centos" ]]; then - sudo yum remove "*vpp*" - else - sudo apt -y remove "*vpp*" - fi - rm -rf jvpp_src -fi - -# install vpp-api-java, this extracts jvpp .jar files into usr/share/java -if [[ "${OS}" == "centos7" ]]; then - sudo rpm --nodeps --install vpp-api-java* -else - sudo dpkg --ignore-depends=${IGNORE_DEPS} --install vpp-api-java* -fi - -# install jvpp jars into maven repo, so that maven picks them up when building hc2vpp -version=`../jvpp/version` - -current_dir=`pwd` -cd /usr/share/java - -for item in jvpp*.jar; do - # Example filename: jvpp-registry-19.04.jar - # ArtifactId = jvpp-registry - # Version = 19.04 or 19.04-SNAPSHOT - basefile=$(basename -s .jar "$item") - artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) - mvn install:install-file -Dfile=${item} -DgroupId=io.fd.jvpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -done - -# vpp-api-package is no longer necessary, breaks the installation of other packages that follow in next steps -if [[ "${OS}" == "centos7" ]]; then - sudo yum remove "*vpp-api-java*" -else - sudo apt -y remove "*vpp-api-java*" -fi - -cd ${current_dir} diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh deleted file mode 100755 index 2f6cdd1451..0000000000 --- a/resources/tools/scripts/download_hc_pkgs.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2019 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -x - -STREAM=$1 -OS=$2 - -# TODO(CSIT-994): reenable NSH -# NSH_GROUP="io.fd.nsh_sfc" -# NSH_ARTIFACTS="vpp-nsh-plugin" -# Figure out what system we are running on -if [[ -f /etc/os-release ]];then - source /etc/os-release -else - echo "Cannot determine OS version" - exit 1 -fi -echo "----- OS INFO -----" -echo DISTRIB_ID: ${ID} -echo DISTRIB_RELEASE: ${VERSION_ID} -echo DISTRIB_CODENAME: ${VERSION_CODENAME} -echo DISTRIB_DESCRIPTION: ${PRETTY_NAME} - -VERSION="RELEASE" -echo "----- DOWNLOADING HONEYCOMB AND JVPP PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - if [[ -f /etc/apt/sources.list.d/99fd.io.list ]];then - echo "Deleting: /etc/apt/sources.list.d/99fd.io.list" - sudo rm /etc/apt/sources.list.d/99fd.io.list - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash - apt-get download honeycomb vpp-api-java || true -elif [[ "$ID" == "centos" ]]; then - if [[ -f /etc/yum.repos.d/fdio-master.repo ]]; then - echo "Deleting: /etc/yum.repos.d/fdio-master.repo" - sudo rm /etc/yum.repos.d/fdio-master.repo - fi - curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash - sudo yum -y install --downloadonly --downloaddir=./ honeycomb vpp-api-java || true -fi - -# TODO(CSIT-994): reenable NSH -# for ART in ${NSH_ARTIFACTS}; do -# for PAC in ${PACKAGE}; do -# curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit -# done -# done - -# determine VPP dependency -# use latest if honeycomb package does not depend on single VPP version, e.g. stable branches since HC2VPP-285 -VERSION="RELEASE" -if [[ "${OS}" == "centos7" ]]; then - HC_VPP_VER=`rpm -qpR honeycomb*.rpm | grep -oP 'vpp = \K.+'` - if [[ "${HC_VPP_VER}" != "" ]]; then - VERSION=${HC_VPP_VER}.x86_64 - fi -else - HC_VPP_VER=`dpkg -I honeycomb*.deb | grep -oP 'vpp \(= \K[^\)]+'` - if [[ "${HC_VPP_VER}" != "" ]]; then - VERSION=${HC_VPP_VER} - fi -fi - -VPP_DEB_NEW_ARTIFACTS="vpp libvppinfra vpp-plugin-core vpp-plugin-dpdk vpp-api-python" -VPP_DEB_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-python" -VPP_RPM_ARTIFACTS="vpp vpp-lib vpp-plugins vpp-api-python" -# Check OS and stream to set correct packages -if [[ "$ID" == "centos" ]]; then - VPP_ARTIFACTS=${VPP_RPM_ARTIFACTS} -elif [[ "$ID" == "ubuntu" ]]; then - if [[ "1807 1810 1901" =~ .*$STREAM.* ]]; then - VPP_ARTIFACTS=${VPP_DEB_ARTIFACTS} - else - VPP_ARTIFACTS=${VPP_DEB_NEW_ARTIFACTS} - fi -fi -VPP_DEB_PACKAGES="" -VPP_RPM_PACKAGES="" -INSTALL_PACKAGES="" -for ART in ${VPP_ARTIFACTS}; do - INSTALL_PACKAGES="$INSTALL_PACKAGES $ART*" - if [[ "${VERSION}" != 'RELEASE' ]]; then - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART=$VERSION" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART-$VERSION" - else - VPP_DEB_PACKAGES="$VPP_DEB_PACKAGES $ART" - VPP_RPM_PACKAGES="$VPP_RPM_PACKAGES $ART" - fi -done - -echo "----- DOWNLOADING VPP PACKAGES -----" -REPO_URL="https://packagecloud.io/fdio/${STREAM}" -echo "REPO_URL: ${REPO_URL}" -if [[ "$ID" == "ubuntu" ]]; then - apt-get download ${VPP_DEB_PACKAGES} || true -elif [[ "$ID" == "centos" ]]; then - sudo yum -y install --downloadonly --downloaddir=./ ${VPP_RPM_PACKAGES} || true -fi diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml index 5083a96a29..45183e3490 100644 --- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml +++ b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/sut.yaml @@ -19,12 +19,6 @@ process: "testpmd" tags: kill-process -- name: Remove file or dir - HoneyComb logs - file: - state: absent - path: "/var/log/honeycomb" - tags: remove-file-dir - - name: Remove file or dir - Core zip file file: state: absent diff --git a/resources/tools/virl/topologies/double-ring-nested.trusty.virl b/resources/tools/virl/topologies/double-ring-nested.trusty.virl deleted file mode 100644 index 4dd5885281..0000000000 --- a/resources/tools/virl/topologies/double-ring-nested.trusty.virl +++ /dev/null @@ -1,327 +0,0 @@ - - - - flat - - - - #cloud-config -bootcmd: -- ln -s -t /etc/rc.d /etc/rc.local -hostname: tg1 -manage_etc_hosts: true -nfs_server_scratch: $$NFS_SERVER_SCRATCH$$ -nfs_server_common: $$NFS_SERVER_COMMON$$ -runcmd: -- start ttyS0 -- systemctl start getty@ttyS0.service -- systemctl start rc-local -- touch /tmp/before-sed -- sed -i 's/^\s*PasswordAuthentication\s\+no/PasswordAuthentication yes/' /etc/ssh/sshd_config -- echo "UseDNS no" >> /etc/ssh/sshd_config -- service ssh restart -- service sshd restart -users: -- default -- gecos: User configured by VIRL Configuration Engine 0.21.4 - lock-passwd: false - name: cisco - plain-text-passwd: cisco - shell: /bin/bash - ssh-authorized-keys: - - VIRL-USER-SSH-PUBLIC-KEY - - VIRL-USER-SSH-PUBLIC-KEY - sudo: ALL=(ALL) NOPASSWD:ALL -write_files: -- path: /etc/init/ttyS0.conf - owner: root:root - content: | - # ttyS0 - getty - # This service maintains a getty on ttyS0 from the point the system is - # started until it is shut down again. - start on stopped rc or RUNLEVEL=[12345] - stop on runlevel [!12345] - respawn - exec /sbin/getty -L 115200 ttyS0 vt102 - permissions: '0644' -- path: /etc/systemd/system/dhclient@.service - content: | - [Unit] - Description=Run dhclient on %i interface - After=network.target - [Service] - Type=oneshot - ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease - RemainAfterExit=yes - owner: root:root - permissions: '0644' -- path: /usr/local/sbin/cloud-instance-name - content: | - #!/usr/bin/python - import pickle - print pickle.loads(open('/var/lib/cloud/instance/obj.pkl').read()).metadata['name'] - owner: root:root - permissions: '0755' -- path: /etc/rc.local - owner: root:root - permissions: '0755' - content: |- - #!/bin/sh - grep -q nfs_server_scratch /var/lib/cloud/instance/user-data.txt || exit 1 - grep -q nfs_server_common /var/lib/cloud/instance/user-data.txt || exit 1 - nfs_server_scratch=$(grep -E '^nfs_server_scratch:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - nfs_server_common=$(grep -E '^nfs_server_common:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - instance_name=$(/usr/local/sbin/cloud-instance-name | cut -f 3 -d '<' | cut -f 1 -d '>') - echo My instance name is $instance_name - - MAXCOUNT=12 - RETRY=5 - - mkdir -p /scratch - mkdir -p /mnt/common - - echo "Mounting NFS directories" - count=0 - while [ $count -lt $MAXCOUNT ] && ! mount -t nfs "${nfs_server_scratch}/${instance_name}" /scratch - do - sleep 5 - count=$[$count+1] - done - - mount -t nfs "${nfs_server_common}" /mnt/common - - mkdir /scratch/$(hostname) - cp /VERSION /scratch/$(hostname)/ - - exit 0 - - false - - - - - - - - - - - #cloud-config -bootcmd: -- ln -s -t /etc/rc.d /etc/rc.local -hostname: sut1 -manage_etc_hosts: true -nfs_server_scratch: $$NFS_SERVER_SCRATCH$$ -nfs_server_common: $$NFS_SERVER_COMMON$$ -runcmd: -- start ttyS0 -- systemctl start getty@ttyS0.service -- systemctl start rc-local -- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config -- echo "UseDNS no" >> /etc/ssh/sshd_config -- service ssh restart -- service sshd restart -- sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf -- sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf -users: -- default -- gecos: User configured by VIRL Configuration Engine 0.21.4 - lock-passwd: false - name: cisco - plain-text-passwd: cisco - shell: /bin/bash - ssh-authorized-keys: - - VIRL-USER-SSH-PUBLIC-KEY - - VIRL-USER-SSH-PUBLIC-KEY - sudo: ALL=(ALL) NOPASSWD:ALL -write_files: -- path: /etc/init/ttyS0.conf - owner: root:root - content: | - # ttyS0 - getty - # This service maintains a getty on ttyS0 from the point the system is - # started until it is shut down again. - start on stopped rc or RUNLEVEL=[12345] - stop on runlevel [!12345] - respawn - exec /sbin/getty -L 115200 ttyS0 vt102 - permissions: '0644' -- path: /etc/systemd/system/dhclient@.service - content: | - [Unit] - Description=Run dhclient on %i interface - After=network.target - [Service] - Type=oneshot - ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease - RemainAfterExit=yes - owner: root:root - permissions: '0644' -- path: /usr/local/sbin/cloud-instance-name - content: | - #!/usr/bin/python - import pickle - print pickle.loads(open('/var/lib/cloud/instance/obj.pkl').read()).metadata['name'] - owner: root:root - permissions: '0755' -- path: /etc/rc.local - owner: root:root - permissions: '0755' - content: |- - #!/bin/sh - grep -q nfs_server_scratch /var/lib/cloud/instance/user-data.txt || exit 1 - grep -q nfs_server_common /var/lib/cloud/instance/user-data.txt || exit 1 - nfs_server_scratch=$(grep -E '^nfs_server_scratch:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - nfs_server_common=$(grep -E '^nfs_server_common:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - instance_name=$(/usr/local/sbin/cloud-instance-name | cut -f 3 -d '<' | cut -f 1 -d '>') - echo My instance name is $instance_name - - MAXCOUNT=12 - RETRY=5 - - mkdir -p /scratch - mkdir -p /mnt/common - - echo "Mounting NFS directories" - count=0 - while [ $count -lt $MAXCOUNT ] && ! mount -t nfs "${nfs_server_scratch}/${instance_name}" /scratch - do - sleep 5 - count=$[$count+1] - done - - mount -t nfs "${nfs_server_common}" /mnt/common - - # Overwrite nested VM image with latest as per NFS - if [ -f /mnt/common/nested-vm-current.img ] - then - rm -f /var/lib/vm/vhost-nested.img - cp /mnt/common/nested-vm-current.img /var/lib/vm/vhost-nested.img - fi - - mkdir /scratch/$(hostname) - cp /VERSION /scratch/$(hostname)/ - cat /var/lib/vm/vhost-nested.img | strings | grep NESTED_VERSION= > /scratch/$(hostname)/NESTED_VERSION - - exit 0 - - - - - - - - - - #cloud-config -bootcmd: -- ln -s -t /etc/rc.d /etc/rc.local -hostname: sut2 -manage_etc_hosts: true -nfs_server_scratch: $$NFS_SERVER_SCRATCH$$ -nfs_server_common: $$NFS_SERVER_COMMON$$ -runcmd: -- start ttyS0 -- systemctl start getty@ttyS0.service -- systemctl start rc-local -- sed -i '/^\s*PasswordAuthentication\s\+no/d' /etc/ssh/sshd_config -- echo "UseDNS no" >> /etc/ssh/sshd_config -- service ssh restart -- service sshd restart -- sed -i 's/no-pci//' /opt/cisco/vpe/etc/qn.conf -- sed -i 's/1024/1024 decimal-interface-names/g' /opt/cisco/vpe/etc/qn.conf -users: -- default -- gecos: User configured by VIRL Configuration Engine 0.21.4 - lock-passwd: false - name: cisco - plain-text-passwd: cisco - shell: /bin/bash - ssh-authorized-keys: - - VIRL-USER-SSH-PUBLIC-KEY - - VIRL-USER-SSH-PUBLIC-KEY - sudo: ALL=(ALL) NOPASSWD:ALL -write_files: -- path: /etc/init/ttyS0.conf - owner: root:root - content: | - # ttyS0 - getty - # This service maintains a getty on ttyS0 from the point the system is - # started until it is shut down again. - start on stopped rc or RUNLEVEL=[12345] - stop on runlevel [!12345] - respawn - exec /sbin/getty -L 115200 ttyS0 vt102 - permissions: '0644' -- path: /etc/systemd/system/dhclient@.service - content: | - [Unit] - Description=Run dhclient on %i interface - After=network.target - [Service] - Type=oneshot - ExecStart=/sbin/dhclient %i -pf /var/run/dhclient.%i.pid -lf /var/lib/dhclient/dhclient.%i.lease - RemainAfterExit=yes - owner: root:root - permissions: '0644' -- path: /usr/local/sbin/cloud-instance-name - content: | - #!/usr/bin/python - import pickle - print pickle.loads(open('/var/lib/cloud/instance/obj.pkl').read()).metadata['name'] - owner: root:root - permissions: '0755' -- path: /etc/rc.local - owner: root:root - permissions: '0755' - content: |- - #!/bin/sh - grep -q nfs_server_scratch /var/lib/cloud/instance/user-data.txt || exit 1 - grep -q nfs_server_common /var/lib/cloud/instance/user-data.txt || exit 1 - nfs_server_scratch=$(grep -E '^nfs_server_scratch:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - nfs_server_common=$(grep -E '^nfs_server_common:' /var/lib/cloud/instance/user-data.txt | awk '{ print $2 }') - instance_name=$(/usr/local/sbin/cloud-instance-name | cut -f 3 -d '<' | cut -f 1 -d '>') - echo My instance name is $instance_name - - MAXCOUNT=12 - RETRY=5 - - mkdir -p /scratch - mkdir -p /mnt/common - - echo "Mounting NFS directories" - count=0 - while [ $count -lt $MAXCOUNT ] && ! mount -t nfs "${nfs_server_scratch}/${instance_name}" /scratch - do - sleep 5 - count=$[$count+1] - done - - mount -t nfs "${nfs_server_common}" /mnt/common - - # Overwrite nested VM image with latest as per NFS - if [ -f /mnt/common/nested-vm-current.img ] - then - rm -f /var/lib/vm/vhost-nested.img - cp /mnt/common/nested-vm-current.img /var/lib/vm/vhost-nested.img - fi - - mkdir /scratch/$(hostname) - cp /VERSION /scratch/$(hostname)/ - cat /var/lib/vm/vhost-nested.img | strings | grep NESTED_VERSION= > /scratch/$(hostname)/NESTED_VERSION - - exit 0 - - - - - - - - - - - - - - diff --git a/resources/tools/virl/topologies/double-ring-nested.trusty.yaml b/resources/tools/virl/topologies/double-ring-nested.trusty.yaml deleted file mode 100644 index d35e24b777..0000000000 --- a/resources/tools/virl/topologies/double-ring-nested.trusty.yaml +++ /dev/null @@ -1,98 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - host: "{topology[tg1][nic-management][ip-addr]}" - arch: x86_64 - port: 22 - username: cisco - priv_key: | -{priv_key} - interfaces: - port3: - mac_address: "{topology[tg1][nic-2][hw-addr]}" - pci_address: "0000:00:06.0" - link: link1 - driver: virtio-pci - port4: - mac_address: "{topology[tg1][nic-3][hw-addr]}" - pci_address: "0000:00:07.0" - link: link4 - driver: virtio-pci - port5: - mac_address: "{topology[tg1][nic-4][hw-addr]}" - pci_address: "0000:00:08.0" - link: link2 - driver: virtio-pci - port6: - mac_address: "{topology[tg1][nic-5][hw-addr]}" - pci_address: "0000:00:09.0" - link: link5 - driver: virtio-pci - DUT1: - type: DUT - host: "{topology[sut1][nic-management][ip-addr]}" - arch: x86_64 - port: 22 - username: cisco - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 - priv_key: | -{priv_key} - interfaces: - port1: - mac_address: "{topology[sut1][nic-0][hw-addr]}" - pci_address: "0000:00:04.0" - link: link1 - port2: - mac_address: "{topology[sut1][nic-1][hw-addr]}" - pci_address: "0000:00:05.0" - link: link4 - port3: - mac_address: "{topology[sut1][nic-2][hw-addr]}" - pci_address: "0000:00:06.0" - link: link3 - port4: - mac_address: "{topology[sut1][nic-3][hw-addr]}" - pci_address: "0000:00:07.0" - link: link6 - DUT2: - type: DUT - host: "{topology[sut2][nic-management][ip-addr]}" - arch: x86_64 - port: 22 - username: cisco - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 - priv_key: | -{priv_key} - interfaces: - port1: - mac_address: "{topology[sut2][nic-0][hw-addr]}" - pci_address: "0000:00:04.0" - link: link2 - port2: - mac_address: "{topology[sut2][nic-1][hw-addr]}" - pci_address: "0000:00:05.0" - link: link5 - port3: - mac_address: "{topology[sut2][nic-2][hw-addr]}" - pci_address: "0000:00:06.0" - link: link3 - port4: - mac_address: "{topology[sut2][nic-3][hw-addr]}" - pci_address: "0000:00:07.0" - link: link6 -- cgit 1.2.3-korg