Release v1.13.0-1

Author: biplamal

clab/rtbh/topo.yml

@@ -11,9 +11,9 @@ topology:
       mgmt-ipv4: 172.100.100.2
       mgmt-ipv6: 2001:172:100:100::2
       binds:
-      - ./pe-router/daemons:/etc/frr/daemons
-      - ./pe-router/frr.conf:/etc/frr/frr.conf
-      - ./pe-router/vtysh.conf:/etc/frr/vtysh.conf
+        - ./pe-router/daemons:/etc/frr/daemons
+        - ./pe-router/frr.conf:/etc/frr/frr.conf
+        - ./pe-router/vtysh.conf:/etc/frr/vtysh.conf
       labels:
         graph-level: 1
     ce-router:
@@ -22,10 +22,10 @@ topology:
       mgmt-ipv4: 172.100.100.3
       mgmt-ipv6: 2001:172:100:100::3
       binds:
-      - ./ce-router/daemons:/etc/frr/daemons
-      - ./ce-router/frr.conf:/etc/frr/frr.conf
-      - ./ce-router/vtysh.conf:/etc/frr/vtysh.conf
-      - ./ce-router/hsflowd.conf:/etc/hsflowd.conf
+        - ./ce-router/daemons:/etc/frr/daemons
+        - ./ce-router/frr.conf:/etc/frr/frr.conf
+        - ./ce-router/vtysh.conf:/etc/frr/vtysh.conf
+        - ./ce-router/hsflowd.conf:/etc/hsflowd.conf
       env:
         COLLECTOR: yes
       exec:
@@ -63,33 +63,8 @@ topology:
       env:
         CLAB_SSH_CONNECTION: ${SSH_CONNECTION}
         RTPROP: >
-          -Dddos_protect.as=64497
-          -Dddos_protect.nexthop=203.0.113.2
-          -Dddos_protect.enable.flowspec=yes
-          -Dddos_protect.router=172.100.100.3
-          -Dddos_protect.group.local=192.0.2.0/24
-          -Dddos_protect.mode=automatic
-          -Dddos_protect.icmp_flood.action=filter
-          -Dddos_protect.icmp_flood.threshold=20000
-          -Dddos_protect.icmp_flood.timeout=1
-          -Dddos_protect.ip_flood.action=drop
-          -Dddos_protect.ip_flood.threshold=8000
-          -Dddos_protect.ip_flood.timeout=1
-          -Dddos_protect.ip_fragmentation.action=filter
-          -Dddos_protect.ip_fragmentation.threshold=20000
-          -Dddos_protect.ip_fragmentation.timeout=1
-          -Dddos_protect.tcp_amplification.action=filter
-          -Dddos_protect.tcp_amplification.threshold=20000
-          -Dddos_protect.tcp_amplification.timeout=1
-          -Dddos_protect.tcp_flood.action=filter
-          -Dddos_protect.tcp_flood.threshold=20000
-          -Dddos_protect.tcp_flood.timeout=1
-          -Dddos_protect.udp_amplification.action=filter
-          -Dddos_protect.udp_amplification.threshold=20000
-          -Dddos_protect.udp_amplification.timeout=1
-          -Dddos_protect.udp_flood.action=filter
-          -Dddos_protect.udp_flood.threshold=20000
-          -Dddos_protect.udp_flood.timeout=1
+          -Dddos_protect.as=64497 -Dddos_protect.nexthop=203.0.113.2 -Dddos_protect.enable.flowspec=yes -Dddos_protect.router=172.100.100.3 -Dddos_protect.group.local=192.0.2.0/24 -Dddos_protect.mode=automatic -Dddos_protect.icmp_flood.action=filter -Dddos_protect.icmp_flood.threshold=20000 -Dddos_protect.icmp_flood.timeout=1 -Dddos_protect.ip_flood.action=drop -Dddos_protect.ip_flood.threshold=8000 -Dddos_protect.ip_flood.timeout=1 -Dddos_protect.ip_fragmentation.action=filter -Dddos_protect.ip_fragmentation.threshold=20000 -Dddos_protect.ip_fragmentation.timeout=1 -Dddos_protect.tcp_amplification.action=filter -Dddos_protect.tcp_amplification.threshold=20000 -Dddos_protect.tcp_amplification.timeout=1 -Dddos_protect.tcp_flood.action=filter -Dddos_protect.tcp_flood.threshold=20000 -Dddos_protect.tcp_flood.timeout=1 -Dddos_protect.udp_amplification.action=filter -Dddos_protect.udp_amplification.threshold=20000 -Dddos_protect.udp_amplification.timeout=1 -Dddos_protect.udp_flood.action=filter -Dddos_protect.udp_flood.threshold=20000 -Dddos_protect.udp_flood.timeout=1
+
       ports:
         - 8008:8008
       binds:
@@ -113,7 +88,9 @@ topology:
         - sh -c 'graphite_motd.sh 8080'
       labels:
         graph-hide: yes
+    ixc:
+      image: ghcr.io/open-traffic-generator/ixia-c-one:1.13.0-1
   links:
-    - endpoints: ["pe-router:eth1","ce-router:eth1"]
-    - endpoints: ["pe-router:eth2","ixia:eth1"]
-    - endpoints: ["ce-router:eth2","ixia:eth2"]
+    - endpoints: ["pe-router:eth1", "ce-router:eth1"]
+    - endpoints: ["pe-router:eth2", "ixia:eth1"]
+    - endpoints: ["ce-router:eth2", "ixia:eth2"]