X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fdisk-image-builder%2Fubuntu%2Frun-listmaker.sh;h=8fcf04cfb6ed521ede5fc734d36a79fae8dec264;hb=0468b650fea801756004c78e08f71ba9ccae0e8f;hp=129e2d49fce535232c3834b1c834e3a45db18f6f;hpb=909f20348b5aac1207678d1c0af8bbfa50f716c6;p=csit.git

diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
index 129e2d49fc..8fcf04cfb6 100755
--- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
@@ -1,6 +1,6 @@
 #!/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:
@@ -38,11 +38,11 @@ then
 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"
@@ -62,8 +62,14 @@ echo "Storing data in ${OUTPUT_DIR}/."
 # 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 python-minimal python-dev python-pip python-virtualenv
+ python2.7 python2.7-minimal git strongswan socat python-cffi python3-cffi
+ python3 python3-cffi python3-cffi-backend python3-ply python3-pycparser
+ python-cffi-backend"
+APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake tcpdump"
+APT_WANTLIST_VPP="dkms bridge-utils libmbedcrypto0 libmbedtls10 libmbedx509-0
+ libpython2.7-minimal libpython-stdlib libpython2.7-stdlib libc6
+ python-pycparser python-ply libssl1.0"
 APT_WANTLIST_TREX="zlib1g-dev unzip"
 APT_WANTLIST_NESTED="qemu-system-x86"
 APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
@@ -72,7 +78,7 @@ 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"
 
@@ -129,9 +135,9 @@ do
 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