merge

Author: abhi

Makefile

@@ -106,7 +106,7 @@ ubuntu-tests:
 	CONTIV_NODE_OS=ubuntu make clean build unit-test system-test stop
 
 system-test:start
-	godep go test -v -timeout 500m ./systemtests -check.v -check.f TestBgp*
+	godep go test -v -timeout 500m ./systemtests -check.v -check.f godep go test -v -timeout 240m ./systemtests -check.v -check.f "00SSH|Basic|Network|Policy|TestTrigger|ACI" 
 
 l3-test:
 	CONTIV_L3=2 CONTIV_NODES=3 make stop

scripts/python/api/tnode.py

@@ -70,7 +70,7 @@ def runCmd(self, cmd, timeout=None):
     # Start netplugin process on vagrant node
     def startNetplugin(self, args=""):
         ssh_object = self.sshConnect(self.username, self.password)
-        command = "sudo " + self.binpath + "/netplugin -plugin-mode docker -vlan-if eth2 -fwd-mode routing" + args + "> /tmp/netplugin.log 2>&1"
+        command = "sudo " + self.binpath + "/netplugin -plugin-mode docker -vlan-if eth2 " + args + "> /tmp/netplugin.log 2>&1"
         self.npThread = threading.Thread(target=ssh_exec_thread, args=(ssh_object, command))
         # npThread.setDaemon(True)
         self.npThread.start()