From 0a6ade6848af6569cb5372a664bf5104d806039c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eder=20Le=C3=A3o=20Fernandes?= <ederleaofernandes@gmail.com>
Date: Mon, 10 Jul 2017 23:45:55 +0100
Subject: [PATCH] Modify installation of CPqD switch

This commit installs the CPqD, i.e the userspace
switch for OpenFlow 1.3, using the install script
included in the switch's repository.

It removes the need to handle dependencies
of the switch on the installation script of
Mininet.
---
 util/install.sh | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index b51610ba..c7f61a28 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -204,45 +204,18 @@ function of {
 function of13 {
     echo "Installing OpenFlow 1.3 soft switch implementation..."
     cd $BUILD_DIR/
-    $install  git-core autoconf automake autotools-dev pkg-config \
-        make gcc g++ libtool libc6-dev cmake libpcap-dev libxerces-c2-dev  \
-        unzip libpcre3-dev flex bison libboost-dev
+    $install git-core 
 
     if [ ! -d "ofsoftswitch13" ]; then
         git clone https://github.com/CPqD/ofsoftswitch13.git
         if [[ -n "$OF13_SWITCH_REV" ]]; then
             cd ofsoftswitch13
             git checkout ${OF13_SWITCH_REV}
-            cd ..
         fi
     fi
 
-    # Install netbee
-    if [ "$DIST" = "Ubuntu" ] && version_ge $RELEASE 14.04; then
-        NBEESRC="nbeesrc-feb-24-2015"
-        NBEEDIR="netbee"
-    else
-        NBEESRC="nbeesrc-jan-10-2013"
-        NBEEDIR="nbeesrc-jan-10-2013"
-    fi
-
-    NBEEURL=${NBEEURL:-http://www.nbee.org/download/}
-    wget -nc ${NBEEURL}${NBEESRC}.zip
-    unzip ${NBEESRC}.zip
-    cd ${NBEEDIR}/src
-    cmake .
-    make
-    cd $BUILD_DIR/
-    sudo cp ${NBEEDIR}/bin/libn*.so /usr/local/lib
-    sudo ldconfig
-    sudo cp -R ${NBEEDIR}/include/ /usr/
+    $BUILD_DIR/ofsoftswitch13/install.sh
 
-    # Resume the install:
-    cd $BUILD_DIR/ofsoftswitch13
-    ./boot.sh
-    ./configure
-    make
-    sudo make install
     cd $BUILD_DIR
 }