Fix: Tests in SONATA jenkins behave strange

[osm/vim-emu.git] / src / emuvim / test / unittests / test_sonata_dummy_gatekeeper.py

diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index 277e75c..ca8c57e 100755 (executable)
--- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@ -56,9 +56,10 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()

+        time.sleep(3)

         # start Mininet network
         self.startNet()
         # start Mininet network
         self.startNet()

-        time.sleep(1)
+        time.sleep(3)

 
         print "starting tests"
         # board package
 
         print "starting tests"
         # board package


@@ -109,12 +110,12 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
             dst_ip = [intf['ip'] for intf in network_list if intf['intf_name'] == intf_dst][0]
             dst_mask = [intf['netmask'] for intf in network_list if intf['intf_name'] == intf_dst][0]
 
             dst_ip = [intf['ip'] for intf in network_list if intf['intf_name'] == intf_dst][0]
             dst_mask = [intf['netmask'] for intf in network_list if intf['intf_name'] == intf_dst][0]
 

-            print "src = {0}:{1} ip={2}/{3} ".format(vnf_src, intf_src, src_ip, src_mask)
-            print "dst = {0}:{1} ip={2}/{3} ".format(vnf_dst, intf_dst, dst_ip, dst_mask)
+            print "src = {0}:{1} ip={2} ".format(vnf_src, intf_src, src_ip, src_mask)
+            print "dst = {0}:{1} ip={2} ".format(vnf_dst, intf_dst, dst_ip, dst_mask)

 
             # check if the E-Line IP's are in the same subnet
 
             # check if the E-Line IP's are in the same subnet

-            ret = ip_network(u'{0}/{1}'.format(src_ip, src_mask), strict=False)\
-                .compare_networks(ip_network(u'{0}/{1}'.format(dst_ip, dst_mask),strict=False))
+            ret = ip_network(u'{0}'.format(src_ip, src_mask), strict=False)\
+                .compare_networks(ip_network(u'{0}'.format(dst_ip, dst_mask),strict=False))

             self.assertTrue(ret == 0)
 
 
             self.assertTrue(ret == 0)
 
 


@@ -138,7 +139,8 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
             test_ip_list = list(ELAN_list)
             test_ip_list.remove(ip_address)
             for ip in test_ip_list:
             test_ip_list = list(ELAN_list)
             test_ip_list.remove(ip_address)
             for ip in test_ip_list:

-                p = self.net.ping([vnf],manualdestip=ip)
+                # only take ip address, without netmask
+                p = self.net.ping([vnf],manualdestip=ip.split('/')[0])

                 print p
                 self.assertTrue(p <= 0.0)
 
                 print p
                 self.assertTrue(p <= 0.0)
 


@@ -160,9 +162,10 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()

+        time.sleep(3)

         # start Mininet network
         self.startNet()
         # start Mininet network
         self.startNet()

-        time.sleep(1)
+        time.sleep(3)

 
         print "starting tests"
         # board package
 
         print "starting tests"
         # board package


@@ -215,9 +218,10 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()
         sdkg1.connectDatacenter(self.dc[1])
         # run the dummy gatekeeper (in another thread, don't block)
         sdkg1.start()

+        time.sleep(3)

         # start Mininet network
         self.startNet()
         # start Mininet network
         self.startNet()

-        time.sleep(1)
+        time.sleep(3)

 
         print "starting tests"
         # board package
 
         print "starting tests"
         # board package