commit 2cad9efec52daf51ab0ed731c1b06981b0f5ab91
author Carmelo Cascone <carmelo@opennetworking.org> Tue Aug 01 21:52:07 2017 +0200
committer Andrea Campanella <andrea@opennetworking.org> Thu Aug 03 16:17:58 2017 +0200
tree 69ef8f0db4d6ce0c5af33231f4b10e7c0d0dcd83
parent 0b22d8f9dcfb4d44877e2c0cab3aa06b66de0ec2

Various fixes to get a P4Runtime demo that works

Change-Id: Icab512fceeb6ec0faf1b402c1e325e055cdb2caf

tools/dev/bin/onos-setup-p4-dev

diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index dd8dd3e..a10d0e2 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -148,7 +148,7 @@
     git submodule update --init --recursive
 
     ./autogen.sh
-    ./configure --with-proto --without-cli --without-internal-rpc
+    ./configure --with-proto 'CXXFLAGS=-O0 -ggdb'
     make -j${NUM_CORES}
     sudo make install
     sudo ldconfig
@@ -174,7 +174,7 @@
     sudo rm -rf $tmpdir
 
     ./autogen.sh
-    ./configure --enable-debugger --with-pi
+    ./configure --enable-debugger --with-pi 'CXXFLAGS=-O0 -ggdb'
     make -j${NUM_CORES}
     sudo make install
     sudo ldconfig
@@ -182,7 +182,7 @@
     # Simple_switch_grpc target
     cd targets/simple_switch_grpc
     ./autogen.sh
-    ./configure
+    ./configure 'CXXFLAGS=-O0 -ggdb'
     make -j${NUM_CORES}
     sudo make install
     sudo ldconfig

tools/dev/mininet/bmv2.py

diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index 60ad28c..5071c88 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -72,6 +72,21 @@
             warn("WARN: unable to get device IP address, won't do onos-netcfg")
             return
         onosDeviceId = "bmv2:%s" % self.deviceId
+        portData = {}
+        portId = 1
+        for intfName in self.intfNames():
+            if intfName == 'lo':
+                continue
+            portData[str(portId)] = {
+                "number": portId,
+                "name": intfName,
+                "enabled": True,
+                "removed": False,
+                "type": "copper",
+                "speed": 10000
+            }
+            portId += 1
+
         cfgData = {
             "devices": {
                 "device:%s" % onosDeviceId: {
@@ -88,7 +103,8 @@
                     },
                     "basic": {
                         "driver": "bmv2"
-                    }
+                    },
+                    "ports": portData
                 }
             }
         }