#!/bin/bash
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 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:
fi
DATE=$(date +%Y-%m-%d)
-if [ "$1" == "ubuntu-14.04.4" ]
+if [ "$1" = "ubuntu-14.04.4" ]
then
OS="ubuntu-14.04.4"
VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-14.04.4.yaml"
-elif [ "$1" == "ubuntu-16.04.1" ]
+elif [ "$1" = "ubuntu-16.04.1" ]
then
OS="ubuntu-16.04.1"
VIRL_TOPOLOGY_FILE="listmaker/virl-listmaker-ubuntu-16.04.1.yaml"
# APT packages wanted
APT_WANTLIST_INFRA="nfs-common cloud-init"
-APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan"
-APT_WANTLIST_VPP="dkms bridge-utils"
+APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan socat python-cffi python3-cffi"
+APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake tcpdump"
+APT_WANTLIST_VPP="dkms bridge-utils libmbedcrypto0 libmbedcrypto1 libmbedtls10 libmbedx509-0"
APT_WANTLIST_TREX="zlib1g-dev unzip"
APT_WANTLIST_NESTED="qemu-system-x86"
APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
# For now, let us NOT incude WANTLIST_NESTED in the below. We're installing qemu
# separately from a separate source.
-APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $WANTLIST_TREX"
+APT_WANTLIST="$APT_WANTLIST_INFRA $APT_WANTLIST_CSIT $APT_WANTLIST_VPP $APT_WANTLIST_TREX $APT_WANTLIST_TLDK"
APT_OUTPUTFILE="${OUTPUT_DIR}/apt-packages.txt"
done
echo "IP is $ip"
-sleep 10
+sleep 30
-if ping -w 60 -c 2 $ip > /dev/null
+if ping -w 60 -c 10 $ip > /dev/null
then
echo Host $ip alive
else