Disabled gNMI support in p4vm until it becomes more stable
Change-Id: If2085d5824a2b9d06b249bf8d82d92fd384de5af
diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index 87ed1ba..ad3d248 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -83,7 +83,8 @@
def __init__(self, name, json=None, debugger=False, loglevel="warn",
elogger=False, grpcPort=None, cpuPort=255,
thriftPort=None, netcfg=True, dryrun=False, pipeconfId="",
- pktdump=False, valgrind=False, injectPorts=False, **kwargs):
+ pktdump=False, valgrind=False, withGnmi=False,
+ injectPorts=True, **kwargs):
Switch.__init__(self, name, **kwargs)
self.grpcPort = pickUnusedPort() if not grpcPort else grpcPort
self.thriftPort = pickUnusedPort() if not thriftPort else thriftPort
@@ -108,6 +109,7 @@
self.netcfgfile = '/tmp/bmv2-%d-netcfg.json' % self.deviceId
self.pipeconfId = pipeconfId
self.injectPorts = parseBoolean(injectPorts)
+ self.withGnmi = parseBoolean(withGnmi)
self.longitude = kwargs['longitude'] if 'longitude' in kwargs else None
self.latitude = kwargs['latitude'] if 'latitude' in kwargs else None
self.onosDeviceId = "device:bmv2:%d" % self.deviceId
@@ -147,10 +149,6 @@
"port": self.grpcPort,
"deviceId": self.deviceId,
"deviceKeyId": "p4runtime:%s" % self.onosDeviceId
- },
- "gnmi": {
- "ip": srcIP,
- "port": self.grpcPort
}
},
"piPipeconf": {
@@ -159,7 +157,13 @@
"basic": basicCfg
}
- if(self.injectPorts):
+ if self.withGnmi:
+ cfgData["generalprovider"]["gnmi"] = {
+ "ip": srcIP,
+ "port": self.grpcPort
+ }
+
+ if self.injectPorts:
portData = {}
portId = 1
for intfName in self.intfNames():