diff options
| author |   Ray Kinsella <ray.kinsella@intel.com> | 2016-12-04 18:21:16 +0000 |
|---|---|---|
| committer | Ray Kinsella <ray.kinsella@intel.com> | 2017-03-29 17:41:57 +0100 |
| commit | eae889b38209f58f169356cc2229658fbb616bbd (patch) | |
| tree | 7d6e1c55d9113b686e2876b77987ef37e27dd276 /vpp-bootstrap/containers | |
| parent | f71b5f990114c0af2b96700a18b397db4ff26c82 (diff) | |
vpp-bootstrap:
* Updated to VPP 17.01
* Updated README.md
* Reduced image requirements to 2 cores & 2048 megs of ram.
* Fixed VPP Binary on host to have more modest resource requirements.
* XConnect the Containers automagically in VPP on the host.
* Added support for python `pip` packages, updated scapy to 2.3.x for
VXLAN support.
* Using the VPP Binaries from 17.01 stable, instead of head.
* Added gdb package to ctwo, so `make debug` will work.
* Renamed veth backend interfaces on the host to `veth-c[one,two]`.
Change-Id: Ie1a86989733c1eb18041e20a4d268a308ffaebb3
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
Diffstat (limited to 'vpp-bootstrap/containers')
| -rw-r--r-- | vpp-bootstrap/containers/cone.cntr | 3 | ||||
| -rw-r--r-- | vpp-bootstrap/containers/ctwo.cntr | 2 | ||||
| -rwxr-xr-x | vpp-bootstrap/containers/ctwo.provision.sh | 16 |
3 files changed, 10 insertions, 11 deletions
diff --git a/vpp-bootstrap/containers/cone.cntr b/vpp-bootstrap/containers/cone.cntr index 237496c..9c00ec0 100644 --- a/vpp-bootstrap/containers/cone.cntr +++ b/vpp-bootstrap/containers/cone.cntr @@ -1,4 +1,5 @@ DESC: This container is used for vpp testing with scapy. DIST: ubuntu VER: trusty -PACKAGES: python-scapy +PACKAGES: python-pip +PIP: scapy diff --git a/vpp-bootstrap/containers/ctwo.cntr b/vpp-bootstrap/containers/ctwo.cntr index 56a83c8..2a764e2 100644 --- a/vpp-bootstrap/containers/ctwo.cntr +++ b/vpp-bootstrap/containers/ctwo.cntr @@ -1,4 +1,4 @@ DESC: This is the vpp build/test container. DIST: ubuntu VER: trusty -PACKAGES: make gcc autotools-dev autoconf linux-headers-kernver +PACKAGES: make gcc autotools-dev autoconf linux-headers-kernver gdb diff --git a/vpp-bootstrap/containers/ctwo.provision.sh b/vpp-bootstrap/containers/ctwo.provision.sh index 2ba66c6..d8e5796 100755 --- a/vpp-bootstrap/containers/ctwo.provision.sh +++ b/vpp-bootstrap/containers/ctwo.provision.sh @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +VPP_VERSION=v17.01 VPP_DIR=~/vpp VPP_GIT="https://git.fd.io/vpp" -#PLATFORM=vpp_lite -PLATFORM=vpp +PLATFORM=vpp_lite echo Cloning $VPP_GIT git clone $VPP_GIT $VPP_DIR @@ -23,6 +23,7 @@ git clone $VPP_GIT $VPP_DIR # Install dependencies echo Building $VPP_DIR cd $VPP_DIR +git checkout -b $VPP_VERSION $VPP_VERSION make UNATTENDED=yes install-dep make wipe @@ -31,10 +32,7 @@ rm -f build-root/.bootstrap.ok # Build and install packaging make PLATFORM=$PLATFORM bootstrap -make PLATFORM=$PLATFORM pkg-deb - -# Install VPPP -(cd ${VPP_DIR}/build-root/;sudo dpkg -i *.deb) - -sudo sed -i 's/dpdk {/dpdk {\n\tno-pci\n/' /etc/vpp/startup.conf -sudo service vpp start +make PLATFORM=$PLATFORM build +#not sure why this is needed to called explicitly +make PLATFORM=$PLATFORM build-vpp-api +make PLATFORM=$PLATFORM plugins |