Fix few bugs and script issues

Author: shaleman

Godeps/Godeps.json

@@ -431,10 +431,9 @@ def setFabricMode(mode):
       "vlans": "1-4094",
       "vxlans": "1-10000",
      })
-    response = httpPost(postUrl, jdata)
+    response = http.httpPost(postUrl, jdata)
 
     # Check for error
     if response == "Error":
         print response
         errorExit("setFabricMode failed")
-

scripts/python/api/objmodel.py

@@ -33,16 +33,18 @@ def __init__(self, addrList, username='vagrant', password='vagrant', binpath='/o
 
         # Start netplugin on all nodes
         for node in self.nodes:
-            print "Starting netplugin on " + node.addr
+            print "Starting netplugin on " + node.hostname
             node.startNetplugin()
 
         # Wait few seconds before starting netmaster
         time.sleep(3)
 
         # Start netmaster in the end
-        for node in self.nodes:
-            print "Starting netmaster"
-            node.startNetmaster()
+        for nidx, node in enumerate(self.nodes):
+            # Start netmaster only on first three nodes
+            if nidx < 3:
+                print "Starting netmaster on " + node.hostname
+                node.startNetmaster()
 
     # Cleanup a testbed once test is done
     def cleanup(self):

scripts/python/api/tbed.py

@@ -10,6 +10,7 @@
 import testcases.tcPolicy
 import testcases.tcNetwork
 import testcases.tcTrigger
+import testcases.tcAci
 import argparse
 import os
 import exceptions
@@ -59,7 +60,7 @@
     testbed.chekForNetpluginErrors()
 
     # Run single test case
-    testcases.tcTrigger.netpluginDisconnectTest(testbed, numCntr, numIteration, encap="vxlan")
+    testcases.tcTrigger.netmasterSwitchoverTest(testbed, numCntr, numIteration)
 
     # Cleanup testbed
     testbed.cleanup()
@@ -75,7 +76,7 @@
         api.tutils.log("Tests took " + str(elapsedTime) + " seconds")
 
     api.tutils.info("testcase passed")
-    os._exit(1)
+    os._exit(0)
 
 except exceptions.KeyboardInterrupt:
     print "\n\n Keyboard interrupt.... Exiting\n"

scripts/python/runTestCase.py

@@ -109,7 +109,7 @@
         api.tutils.log("Tests took " + str(elapsedTime) + " seconds")
 
     api.tutils.info("Sanity passed")
-    os._exit(1)
+    os._exit(0)
 
 except exceptions.KeyboardInterrupt:
     print "\n\n Keyboard interrupt.... Exiting\n"

scripts/python/sanity.py

@@ -325,6 +325,8 @@ def netmasterSwitchoverTest(testbed, numContainer, numIter, encap="vxlan"):
     tenant = api.objmodel.tenant('default')
     network = tenant.newNetwork('private', pktTag=1001, subnet="10.1.0.0/16", gateway="10.1.1.254", encap=encap)
 
+    # Always run even number of iterations so that mastership comes back to original node
+    numIter = numIter + (numIter % 2)
     for iter in range(numIter):
         # Start the containers
         containers = testbed.runContainers(numContainer)