1 files changed, 25 insertions, 29 deletions
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/customize.py b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
index 9166c57dfc..3cf53a184d 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity/customize.py
+++ b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
@@ -81,35 +81,31 @@ CWD = os.path.dirname(os.path.realpath(__file__))
 TEST = os.path.basename(CWD)
 
 
-class ThisTestTopo(Topo):
-    "Test topology builder"
-
-    def build(self, *_args, **_opts):
-        "Build function"
-        tgen = get_topogen(self)
-
-        # This function only purpose is to define allocation and relationship
-        # between routers, switches and hosts.
-        #
-        # Create P/PE routers
-        tgen.add_router("r1")
-        for routern in range(2, 5):
-            tgen.add_router("r{}".format(routern))
-        # Create a switch with just one router connected to it to simulate a
-        # empty network.
-        switch = {}
-        switch[0] = tgen.add_switch("sw0")
-        switch[0].add_link(tgen.gears["r1"], nodeif="r1-eth0")
-        switch[0].add_link(tgen.gears["r2"], nodeif="r2-eth0")
-
-        switch[1] = tgen.add_switch("sw1")
-        switch[1].add_link(tgen.gears["r2"], nodeif="r2-eth1")
-        switch[1].add_link(tgen.gears["r3"], nodeif="r3-eth0")
-        switch[1].add_link(tgen.gears["r4"], nodeif="r4-eth0")
-
-        switch[2] = tgen.add_switch("sw2")
-        switch[2].add_link(tgen.gears["r2"], nodeif="r2-eth2")
-        switch[2].add_link(tgen.gears["r3"], nodeif="r3-eth1")
+def build_topo(tgen):
+    "Build function"
+
+    # This function only purpose is to define allocation and relationship
+    # between routers, switches and hosts.
+    #
+    # Create P/PE routers
+    tgen.add_router("r1")
+    for routern in range(2, 5):
+        tgen.add_router("r{}".format(routern))
+    # Create a switch with just one router connected to it to simulate a
+    # empty network.
+    switch = {}
+    switch[0] = tgen.add_switch("sw0")
+    switch[0].add_link(tgen.gears["r1"], nodeif="r1-eth0")
+    switch[0].add_link(tgen.gears["r2"], nodeif="r2-eth0")
+
+    switch[1] = tgen.add_switch("sw1")
+    switch[1].add_link(tgen.gears["r2"], nodeif="r2-eth1")
+    switch[1].add_link(tgen.gears["r3"], nodeif="r3-eth0")
+    switch[1].add_link(tgen.gears["r4"], nodeif="r4-eth0")
+
+    switch[2] = tgen.add_switch("sw2")
+    switch[2].add_link(tgen.gears["r2"], nodeif="r2-eth2")
+    switch[2].add_link(tgen.gears["r3"], nodeif="r3-eth1")
 
 
 def ltemplatePreRouterStartHook():