topotests: precise importation folder

the topolog importation folder must be precised. otherwise following
error message appears:

root@dut-vm:~/topotests/bgp_flowspec# python3 test_bgp_flowspec_topo.py
Traceback (most recent call last):
  File "test_bgp_flowspec_topo.py", line 96, in <module>
    from lib.lutil import lUtil
  File "/root/topotests/bgp_flowspec/../lib/lutil.py", line 25, in <module>
    from topolog import logger
ImportError: No module named 'topolog'
root@dut-vm:~/topotests/bgp_flowspec#

The same error occurs with lutil and bgprib which are 2 libraries
located under lib/ folder. Some precisions are added too.

PR=71290
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
index 3f1157ad72a237dafcba5368ce1a5265ed5ef42c..0deb181f3e5c360ee58a4abcc80c6bebbba60d4f 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1", 'vtysh -c "show bgp next"', "99.0.0.. valid", "wait", "See CE static NH"

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py
index ea059c576e0fdee2b5f67c0baf547b1faa88fa8b..789f93b837e2544d5889d1e7541eb17ce322e602 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/adjacencies.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand("ce1", "ping 192.168.1.1 -c 1", " 0. packet loss", "pass", "CE->PE ping")
 luCommand("ce2", "ping 192.168.1.1 -c 1", " 0. packet loss", "pass", "CE->PE ping")

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py
index 96b497826172190f09c899b9e687ac072cbaf020..af39a951b7d741ec431b7a02c7732698c8213f3e 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/check_routes.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "ce1",

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py
index 9f21d999136825b2d206b8853fcd4f6d7163e6e5..38eac14c641b30df3db3967410138d5a611cd548 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/cleanup_all.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1",

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py
index 5c7427763de2c9e48960f9720a7543c2393d67a4..375bca8a633afde3acd598956624e2fbfc842702 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/add_routes.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1", 'vtysh -c "add vrf r1-cust1 prefix 99.0.0.1/32"', ".", "none", "IP Address"

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/adjacencies.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/adjacencies.py
index 53cf353fa04849600b697192cf432473c3665b2b..f5145753a5012de410e1ba4a79f59c23a4346fbe 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/adjacencies.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/adjacencies.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand("ce1", 'vtysh -c "show bgp summary"', " 00:0", "wait", "Adjacencies up", 180)
 luCommand("ce2", 'vtysh -c "show bgp summary"', " 00:0", "wait", "Adjacencies up", 180)

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py
index 20113b1058dd53b24d31fcae6999a3e7d58ec5f0..a5f95f94bf38dadcadced75f93d628417bf9da8b 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_mpls.py
@@ -1,4 +1,4 @@
-from lutil import luCommand, luLast
+from lib.lutil import luCommand, luLast
 from lib import topotest
 
 ret = luCommand(

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_vrf.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_vrf.py
index b552ea04068b27cbce4bae0b752960c26dd8e9e5..7c154ecd1540a37acbc6e4b0eaf8af39e916bab7 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_vrf.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_linux_vrf.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 from customize import l3mdev_accept
 
 l3mdev_rtrs = ["r1", "r3", "r4", "ce4"]

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
index 98d2a3bafc3f2103eb76b20aecd607c4216adb86..d55169a19efceed85c8edf7f38a4b7ba0289c5f5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/check_routes.py
@@ -1,5 +1,5 @@
-from lutil import luCommand
-from bgprib import bgpribRequireVpnRoutes, bgpribRequireUnicastRoutes
+from lib.lutil import luCommand
+from lib.bgprib import bgpribRequireVpnRoutes, bgpribRequireUnicastRoutes
 
 ########################################################################
 # CE routers: contain routes they originate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py
index af77ab01c152a5d030ab152e1961d64287123ce2..a27b1785480a4dbec83970f5734b9c119eafcae4 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/cleanup_all.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1",

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/del_bgp_instances.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/del_bgp_instances.py
index 477578bdbd136d2184cbd874aaae64ad0186d17c..fcbc3df6ef8f914fd79ced37322dfeec8a8301bc 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/del_bgp_instances.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/del_bgp_instances.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1",

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/notification_check.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/notification_check.py
index 2b0a85a91aa81f14b9da625c95c37ee86e6d2998..dd2e24722fa9a87f52e21ab7358781abd654bf14 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/notification_check.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/notification_check.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 rtrs = ["ce1", "ce2", "ce3", "r1", "r2", "r3", "r4"]
 for rtr in rtrs:

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_down.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_down.py
index 7990533f3a4f3ebaa120228168ee52d2501ee738..6ce81baf11dde43da8f3f087e8cf6278436d8952 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_down.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_down.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 ret = luCommand(
     "ce1",

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
index 3c768640a1bf5d488a6fcdca4782cc7ec0927719..04ca03973d5041937f2721d20e2ba448cf365800 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/scripts/scale_up.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 num = 50000
 b = int(num / (256 * 256))

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py
index f4b4da55d216ec492646eeeb5d9a90003c480ca4..bc47dfc85c8eae8a67ff9c980cba9e447e7b9cac 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 holddownFactorSet = luCommand(
     "r1",

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py
index 9fdef84cdfa2c2015c778a2162f1c31f77fac2cd..e68fac86fac6efbb9a76607d6595a5242c7b6dbe 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 holddownFactorSet = luCommand(
     "r1",

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py
index 1caa827ce2c1e01d5253918422bd23e6aa7abfd7..24b3cba96e4704f7f9fa72bb07e1723632876c85 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand("r1", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")
 luCommand("r2", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py
index e68e9e93abf985d2dee44302aa9ef29a9b157d50..f5c2db25ffede2dafb6d364e222aa801e093a4e5 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 holddownFactorSet = luCommand(
     "r1",

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py
index eea977bfaf0bc174bec4f890ef4eb7156c5a59a3..7201ac8111cb13a51e4a37bee0379914a742a47e 100644 (file)
--- a/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py
@@ -1,4 +1,4 @@
-from lutil import luCommand
+from lib.lutil import luCommand
 
 luCommand(
     "r1",

diff --git a/tests/topotests/lib/lutil.py b/tests/topotests/lib/lutil.py
index dcf1d010b10a79d53b889e81c70d426c24d63c14..9cbea67af1183dd612164d5e3e269932ec706846 100644 (file)
--- a/tests/topotests/lib/lutil.py
+++ b/tests/topotests/lib/lutil.py
@@ -23,7 +23,7 @@ import time
 import datetime
 import json
 import math
-from topolog import logger
+from lib.topolog import logger
 from mininet.net import Mininet