tests: Unify directory naming for topotests

Change every `-` to `_` in directory names. This is to avoid mixing _ and -.

Just for consistency and directory sorting properly.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

1 files changed, 0 insertions, 240 deletions

diff --git a/tests/topotests/pim-basic/test_pim.py b/tests/topotests/pim-basic/test_pim.py
deleted file mode 100644
index 4debbeb851..0000000000
--- a/tests/topotests/pim-basic/test_pim.py
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/usr/bin/env python
-
-#
-# test_pim.py
-#
-# Copyright (c) 2018 Cumulus Networks, Inc.
-#                    Donald Sharp
-#
-# Permission to use, copy, modify, and/or distribute this software
-# for any purpose with or without fee is hereby granted, provided
-# that the above copyright notice and this permission notice appear
-# in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND Cumulus Networks DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NETDEF BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-#
-
-"""
-test_pim.py: Test pim
-"""
-
-import os
-import sys
-import pytest
-import json
-from functools import partial
-
-pytestmark = pytest.mark.pimd
-
-CWD = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(CWD, "../"))
-
-# pylint: disable=C0413
-from lib import topotest
-from lib.topogen import Topogen, TopoRouter, get_topogen
-from lib.topolog import logger
-
-from mininet.topo import Topo
-
-pytestmark = [pytest.mark.pimd]
-
-
-class PIMTopo(Topo):
-    def build(self, *_args, **_opts):
-        "Build function"
-        tgen = get_topogen(self)
-
-        for routern in range(1, 4):
-            tgen.add_router("r{}".format(routern))
-
-        tgen.add_router("rp")
-
-        #   rp ------ r1 -------- r2
-        #              \
-        #               --------- r3
-        # r1 -> .1
-        # r2 -> .2
-        # rp -> .3
-        # r3 -> .4
-        # loopback network is 10.254.0.X/32
-        #
-        # r1 <- sw1 -> r2
-        # r1-eth0 <-> r2-eth0
-        # 10.0.20.0/24
-        sw = tgen.add_switch("sw1")
-        sw.add_link(tgen.gears["r1"])
-        sw.add_link(tgen.gears["r2"])
-
-        # r1 <- sw2 -> rp
-        # r1-eth1 <-> rp-eth0
-        # 10.0.30.0/24
-        sw = tgen.add_switch("sw2")
-        sw.add_link(tgen.gears["r1"])
-        sw.add_link(tgen.gears["rp"])
-
-        # 10.0.40.0/24
-        sw = tgen.add_switch("sw3")
-        sw.add_link(tgen.gears["r1"])
-        sw.add_link(tgen.gears["r3"])
-
-
-def setup_module(mod):
-    "Sets up the pytest environment"
-    tgen = Topogen(PIMTopo, mod.__name__)
-    tgen.start_topology()
-
-    # For all registered routers, load the zebra configuration file
-    for rname, router in tgen.routers().items():
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_PIM, os.path.join(CWD, "{}/pimd.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
-
-    # After loading the configurations, this function loads configured daemons.
-    tgen.start_router()
-    # tgen.mininet_cli()
-
-
-def teardown_module(mod):
-    "Teardown the pytest environment"
-    tgen = get_topogen()
-
-    # This function tears down the whole topology.
-    tgen.stop_topology()
-
-
-def test_pim_rp_setup():
-    "Ensure basic routing has come up and the rp has an outgoing interface"
-    # Ensure rp and r1 establish pim neighbor ship and bgp has come up
-    # Finally ensure that the rp has an outgoing interface on r1
-    tgen = get_topogen()
-
-    r1 = tgen.gears["r1"]
-    json_file = "{}/{}/rp-info.json".format(CWD, r1.name)
-    expected = json.loads(open(json_file).read())
-
-    test_func = partial(
-        topotest.router_json_cmp, r1, "show ip pim rp-info json", expected
-    )
-    _, result = topotest.run_and_expect(test_func, None, count=15, wait=5)
-    assertmsg = '"{}" JSON output mismatches'.format(r1.name)
-    assert result is None, assertmsg
-    # tgen.mininet_cli()
-
-
-def test_pim_send_mcast_stream():
-    "Establish a Multicast stream from r2 -> r1 and then ensure S,G is created as appropriate"
-    logger.info("Establish a Mcast stream from r2->r1 and then ensure S,G created")
-
-    tgen = get_topogen()
-
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    rp = tgen.gears["rp"]
-    r3 = tgen.gears["r3"]
-    r2 = tgen.gears["r2"]
-    r1 = tgen.gears["r1"]
-
-    # Let's establish a S,G stream from r2 -> r1
-    CWD = os.path.dirname(os.path.realpath(__file__))
-    r2.run(
-        "{}/mcast-tx.py --ttl 5 --count 5 --interval 10 229.1.1.1 r2-eth0 > /tmp/bar".format(
-            CWD
-        )
-    )
-    # And from r3 -> r1
-    r3.run(
-        "{}/mcast-tx.py --ttl 5 --count 5 --interval 10 229.1.1.1 r3-eth0 > /tmp/bar".format(
-            CWD
-        )
-    )
-
-    # Let's see that it shows up and we have established some basic state
-    out = r1.vtysh_cmd("show ip pim upstream json", isjson=True)
-    expected = {
-        "229.1.1.1": {
-            "10.0.20.2": {
-                "firstHopRouter": 1,
-                "joinState": "NotJoined",
-                "regState": "RegPrune",
-                "inboundInterface": "r1-eth0",
-            }
-        }
-    }
-
-    assert topotest.json_cmp(out, expected) is None, "failed to converge pim"
-    # tgen.mininet_cli()
-
-
-def test_pim_rp_sees_stream():
-    "Ensure that the RP sees the stream and has acted accordingly"
-    tgen = get_topogen()
-
-    rp = tgen.gears["rp"]
-    json_file = "{}/{}/upstream.json".format(CWD, rp.name)
-    expected = json.loads(open(json_file).read())
-
-    test_func = partial(
-        topotest.router_json_cmp, rp, "show ip pim upstream json", expected
-    )
-    _, result = topotest.run_and_expect(test_func, None, count=20, wait=0.5)
-    assertmsg = '"{}" JSON output mismatches'.format(rp.name)
-    assert result is None, assertmsg
-
-
-def test_pim_igmp_report():
-    "Send a igmp report from r2->r1 and ensure that the *,G state is created on r1"
-    logger.info("Send a igmp report from r2-r1 and ensure *,G created")
-
-    tgen = get_topogen()
-
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    r2 = tgen.gears["r2"]
-    r1 = tgen.gears["r1"]
-
-    # Let's send a igmp report from r2->r1
-    CWD = os.path.dirname(os.path.realpath(__file__))
-    r2.run("{}/mcast-rx.py 229.1.1.2 r2-eth0 &".format(CWD))
-
-    out = r1.vtysh_cmd("show ip pim upstream json", isjson=True)
-    expected = {
-        "229.1.1.2": {
-            "*": {
-                "sourceIgmp": 1,
-                "joinState": "Joined",
-                "regState": "RegNoInfo",
-                "sptBit": 0,
-            }
-        }
-    }
-
-    assert topotest.json_cmp(out, expected) is None, "failed to converge pim"
-
-
-def test_memory_leak():
-    "Run the memory leak test and report results."
-    tgen = get_topogen()
-    if not tgen.is_memleak_enabled():
-        pytest.skip("Memory leak test/report is disabled")
-
-    tgen.report_memory_leaks()
-
-
-if __name__ == "__main__":
-    args = ["-s"] + sys.argv[1:]
-    sys.exit(pytest.main(args))