tests: Convert pim_basic to use integrated configuration

Since I am in this test, modifying it let's just convert
it to a integrated configuration.

Signed-off-by: Donald Sharp <donaldsharp72@gmail.com>

tests/topotests/pim_basic/r1/bgpd.conf

@@ -1,5 +0,0 @@
-router bgp 65001
-  no bgp ebgp-requires-policy
-  neighbor 10.0.30.3 remote-as external
-  neighbor 10.0.30.3 timers 3 10
-  redistribute connected

tests/topotests/pim_basic/r1/frr.conf

@@ -0,0 +1,32 @@
+hostname r1
+!
+service integrated-vtysh-config
+!
+interface r1-eth0
+ ip address 10.0.20.1/24
+ ip igmp
+ ip pim
+!
+interface r1-eth1
+ ip address 10.0.30.1/24
+ ip pim
+!
+interface r1-eth2
+ ip address 10.0.40.1/24
+ ip igmp
+ ip pim
+!
+interface lo
+ ip address 10.254.0.1/32
+ ip pim
+!
+router bgp 65001
+ no bgp ebgp-requires-policy
+ neighbor 10.0.30.3 remote-as external
+ neighbor 10.0.30.3 timers 3 10
+ redistribute connected
+!
+router pim
+ rp 10.254.0.3
+ join-prune-interval 5
+!

tests/topotests/pim_basic/r1/pimd.conf

@@ -1,18 +0,0 @@
-hostname r1
-!
-interface r1-eth0
-  ip igmp
-  ip pim
-!
-interface r1-eth1
-  ip pim
-!
-interface r1-eth2
-  ip igmp
-  ip pim
-!
-interface lo
-  ip pim
-!
-ip pim rp 10.254.0.3
-ip pim join-prune-interval 5

tests/topotests/pim_basic/r1/zebra.conf

@@ -1,14 +0,0 @@
-hostname r1
-!
-interface r1-eth0
- ip address 10.0.20.1/24
-!
-interface r1-eth1
- ip address 10.0.30.1/24
-!
-interface r1-eth2
- ip address 10.0.40.1/24
-!
-interface lo
- ip address 10.254.0.1/32
-!

tests/topotests/pim_basic/r2/frr.conf

@@ -1,8 +1,15 @@
 hostname r2
 !
+frr version 8.4
+frr defaults traditional
+!
+service integrated-vtysh-config
+!
 interface r2-eth0
  ip address 10.0.20.2/24
 !
 interface lo
  ip address 10.254.0.2/32
 !
+line vty
+! 

tests/topotests/pim_basic/r2/pimd.conf

@@ -1 +0,0 @@
-hostname r2

tests/topotests/pim_basic/r3/frr.conf

@@ -1,5 +1,8 @@
 hostname r3
 !
+!
+service integrated-vtysh-config
+!
 interface r3-eth0
  ip address 10.0.40.4/24
 !

tests/topotests/pim_basic/r3/pimd.conf

@@ -1 +0,0 @@
-hostname r3

tests/topotests/pim_basic/rp/bgpd.conf

@@ -1,5 +0,0 @@
-router bgp 65003
-   no bgp ebgp-requires-policy
-   neighbor 10.0.30.1 remote-as external
-   neighbor 10.0.30.1 timers 3 10
-   redistribute connected

tests/topotests/pim_basic/rp/frr.conf

@@ -0,0 +1,26 @@
+hostname rp
+!
+!
+service integrated-vtysh-config
+!
+interface rp-eth0
+ ip address 10.0.30.3/24
+ ip pim
+!
+interface lo
+ ip address 10.254.0.3/32
+ ip pim
+!
+router bgp 65003
+ no bgp ebgp-requires-policy
+ neighbor 10.0.30.1 remote-as external
+ neighbor 10.0.30.1 timers 3 10
+ redistribute connected
+!
+router pim
+ join-prune-interval 5
+ rp 10.254.0.3
+ register-accept-list ACCEPT
+!
+ip prefix-list ACCEPT seq 5 permit 10.0.20.0/24 le 32
+!

tests/topotests/pim_basic/rp/pimd.conf

@@ -1,13 +0,0 @@
-hostname rp
-!
-interface rp-eth0
-  ip pim
-!
-interface lo
-  ip pim
-!
-ip pim join-prune-interval 5
-ip pim rp 10.254.0.3
-ip pim register-accept-list ACCEPT
-
-ip prefix-list ACCEPT seq 5 permit 10.0.20.0/24 le 32

tests/topotests/pim_basic/rp/zebra.conf

@@ -1,8 +0,0 @@
-hostname rp
-!
-interface rp-eth0
- ip address 10.0.30.3/24
-!
-interface lo
- ip address 10.254.0.3/32
-!

tests/topotests/pim_basic/test_pim.py

@@ -71,16 +71,15 @@ def setup_module(mod):
     tgen = Topogen(build_topo, mod.__name__)
     tgen.start_topology()
 
-    # For all registered routers, load the zebra configuration file
+    # For all registered routers, load the integrated configuration file
     for rname, router in tgen.routers().items():
-        router.load_config(
+        router.load_frr_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
+            os.path.join(CWD, "{}/frr.conf".format(rname)),
-        )
+            [
-        router.load_config(
+                (TopoRouter.RD_ZEBRA, None),
-            TopoRouter.RD_PIM, os.path.join(CWD, "{}/pimd.conf".format(rname))
+                (TopoRouter.RD_PIM, None),
-        )
+                (TopoRouter.RD_BGP, None),
-        router.load_config(
+            ],
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
         )
 
     # After loading the configurations, this function loads configured daemons.