CASMNET-2240 update ACLs to apply to default vrf (#471)

* update ACLs to apply to default vrf * Replace hardcode with commandline input Honor the value given to `--vrf` passed into the `variables` dictionary when templating. * Capitalize default Aruba switch configs for 1.5 and 1.6 were capitalizing the VRF. --------- Co-authored-by: Russell Bunch <[email protected]> Co-authored-by: Chris Spiller <[email protected]>
Cray-HPE · Jan 8, 2025 · 245dc0b · 245dc0b
1 parent d66e256
commit 245dc0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Add CSM 1.6 templates
 - Fix case sensitivity when reading nodes from SHCD
 - Add Storage node support
+- Update ACLs to apply to default vrf
 
 ## [1.8.0]
 

diff --git a/canu/generate/switch/config/config.py b/canu/generate/switch/config/config.py
@@ -225,7 +225,7 @@
     "--vrf",
     help="Named VRF used for CSM networks",
     required=False,
-    default="csm",
+    default="CSM",
 )
 @click.option(
     "--bond-app-nodes",

diff --git a/network_modeling/configs/templates/1.5/aruba/common/acl.j2 b/network_modeling/configs/templates/1.5/aruba/common/acl.j2
@@ -75,4 +75,5 @@ access-list ip cmn-can
 {%- endif %}
 {% set sequence = sequence+10 %}    {{ sequence }} permit any any any
 apply access-list ip mgmt control-plane vrf default
+apply access-list ip mgmt control-plane vrf {{ variables.VRF }}
 {#- end acl #}
diff --git a/network_modeling/configs/templates/1.6/aruba/common/acl.j2 b/network_modeling/configs/templates/1.6/aruba/common/acl.j2
@@ -75,4 +75,5 @@ access-list ip cmn-can
 {%- endif %}
 {% set sequence = sequence+10 %}    {{ sequence }} permit any any any
 apply access-list ip mgmt control-plane vrf default
+apply access-list ip mgmt control-plane vrf {{ variables.VRF }}
 {#- end acl #}