From 5715a2f07c2f5b35f66a89acab407e631df001d6 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 15:36:16 +0000 Subject: [PATCH] ncm-metaconfig: cumulus: Fix wrapping and indentation in pan --- .../main/metaconfig/cumulus/tests/profiles/acl.pan | 8 ++++---- .../main/metaconfig/cumulus/tests/profiles/frr.pan | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/acl.pan b/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/acl.pan index dc4f1c675b..b4fedf76bc 100644 --- a/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/acl.pan +++ b/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/acl.pan @@ -9,7 +9,7 @@ prefix "/software/components/metaconfig/services/{/etc/cumulus/acl/policy.d/50_q 'in-interface', list('swp1'), 'protocol', 'tcp', 'dport', list(80, 90), # range - ); +); "iptables/1" = dict( 'append', 'INPUT', 'jump', 'DROP', @@ -20,10 +20,10 @@ prefix "/software/components/metaconfig/services/{/etc/cumulus/acl/policy.d/50_q 'tcp-flags', dict( # --syn 'mask', list('SYN', 'ACK', 'FIN', 'RST'), 'compare', list('SYN'), - ), + ), 'invert', dict( 'source', true, 'sport', true, 'out-interface', true, - ), - ); + ), +); diff --git a/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/frr.pan b/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/frr.pan index 9c20100b59..8006aee4e1 100644 --- a/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/frr.pan +++ b/ncm-metaconfig/src/main/metaconfig/cumulus/tests/profiles/frr.pan @@ -7,17 +7,17 @@ prefix "/software/components/metaconfig/services/{/etc/frr/frr.conf}/contents/vr "network", "1.2.3.4", "mask", 24, "nexthop", "11.12.13.14", - ); +); "vrf1/1" = dict( "network", "0.0.0.0", "mask", 0, "nexthop", "null0" - ); +); "some/0" = dict( "network", "2.3.4.5", "mask", 20, "nexthop", "12.13.14.15", - ); +); prefix "/software/components/metaconfig/services/{/etc/frr/frr.conf}/contents/bgp"; "vrf1/0" = dict( @@ -25,16 +25,16 @@ prefix "/software/components/metaconfig/services/{/etc/frr/frr.conf}/contents/bg "routerid", "1.2.3.4", "external", "4.5.6.7", "ipv4", list("10.1.0.0/24", "172.20.0.0/16"), - ); +); "vrf1/1" = dict( "asn", 12346, "routerid", "1.2.3.5", "external", "4.5.6.8", "ipv4", list("10.2.0.0/24", "172.21.0.0/16"), - ); +); "vrf2/0" = dict( "asn", 12346, "routerid", "1.2.3.6", "external", "4.5.6.8", "ipv4", list("10.3.0.0/24", "172.22.0.0/16"), - ); +);