Release 1.1.1 (#71)

* Bump yamale from 3.0.4 to 3.0.8 (#2) Bumps [yamale](https://github.com/23andMe/Yamale) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/23andMe/Yamale/releases) - [Commits](23andMe/Yamale@3.0.4...3.0.8) --- updated-dependencies: - dependency-name: yamale dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump urllib3 from 1.26.3 to 1.26.5 (#1) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.3 to 1.26.5. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.3...1.26.5) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * CASMNET-834 Ensure mountain device names names are unique. (#4) * Ensure node unique naming and add JSON output. * Fix failing test. * Remove leftover refactoring cruft. * Remove debug output. * Patch a test for vendor assignment. * Version bump. (#6) * CASMNET-872 (#5) * added selective diff output * change tag load method * updated hier-config * made compatable with older hier_config Co-authored-by: batesl <[email protected]> * lint * cache switch vendor on canu init * lint * Update Licensing and Copyright information. (#9) * Update Licensing and Copyright information. * Date bump. * match SLS API * Merge branch 'develop' into feature/dellanox * Fix non-development installs. (#13) * Fix non-development installs. * Add config j2 templates to install. * Add yaml, json and j2 files to pyinstaller. * setup and cache nits. * One last version change - for rpm this time. * CASMNET-904 - add canu user home dir and workdir to container env (#16) Co-authored-by: Dat Le <[email protected]> * CASMNET-879 (#11) * pull out prefix len from SLS and apply to templates * updated tests, fixed acl templates * dynamically pull in VLANs from SLS to apply to CDU port configs * dynamically pull in IP address for CDU switch vlan interfaces * add prefix length * remove pprint, modify tests * fix tests and lint * remove uncessary loop * remove print statements * added ssh to vrf keepalive, allows for backdoor access * update readme Co-authored-by: lukebates123 <[email protected]> * Fix confusing warning and user guidance in config generation. (#18) * Add BMC ports to river compute and add tests. (#17) * CASMNET-885: Convert csi-folder cli to sls-file. (#19) * Convert csi-folder cli to sls-file. * Doc nits. * Feature/dellanox (#14) * lint * update requirements * remove version from hier-config * update readme * add license * lint * Add Dell and Mellanox and running config from file * update test * move running and generated configs to own folders * move cache functions to utils * add canu cache commands * Update readme.md (#21) * CASMNET-914: Move WIP document generation work. (#20) * Move WIP docs generation work. * Carriage return nit. * CASMNET-806 add hsn hardware to architecture (#22) Signed-off-by: Jacob Salmela <[email protected]> Co-authored-by: Jacob Salmela <[email protected]> * CASMNET-806: add PDU to to model/config (#25) * add additional compute node lookup_name to include both cn* and nid* style names both node names are used when generating hmn_connections.json file from csi Signed-off-by: Jacob Salmela <[email protected]> * add slurm lookup_name as a type of uan this allows the node to be presenet when generating hmn_connections.json file from csi Signed-off-by: Jacob Salmela <[email protected]> * Casmnet-908 configuration override/ignore (#23) * added override option * add override config to config file output * format * remove canu.test * added override option * add override config to config file output * format * remove canu.test * define heir config version * canu/generate/network/config/config.py * add override.yaml test * added override option * add override config to config file output * format * remove canu.test * updated tests for config ignore file * fix config output comments * .yaml format, updated readme * fix options.yaml * fix requirements.txt * added override config option to config validate * re-order to fix tests * updated readme * updated readme * change where override file is opened * fix flake8 * updated tests/requirements Co-authored-by: lukebates123 <[email protected]> * Fix many template issues (#27) Co-authored-by: lukebates123 <[email protected]> * Feature/mellanox-bgp (#28) * config bgp mellanox * config bgp tests * update readme * CASMNET-858: Create initial Dell and Mellanox configuration templates - WIP (#12) * dell-mellanox phase 1 * dellanox phase 2 * moving files * remove old files * phase to relocate files, new variables * fixes as per Lukes review * fix build error * fixes roud 2 * dell mellanox config gen first pass * update requirements * update test requirements * rpm build update * lint * update docs for Dell and Mellanox * added extra configs * fixed sw-leaf-bmc config template * dellanox template updates * added dellanox MTN templates * Added dellanox MTN templates Co-authored-by: kosonenj <[email protected]> Co-authored-by: Brooks Vinyard <[email protected]> Co-authored-by: lukebates123 <[email protected]> * change --shasta flag to --csm (#31) * add regex support, closes #35 (#37) new entries added to cray-network-architecture can now contain a 'regex:' key, which is a list of regex patterns to be searched. an example is that pdus can have a name like x3000p1 or pdup1, so this allows the user to search for both. Signed-off-by: Jacob Salmela <[email protected]> * add PDU hardware types, closes #36 (#38) this adds pdus, which requires #35 to work properly. It can find pdus with names like x3000p1 and pdup1. Signed-off-by: Jacob Salmela <[email protected]> * mac-address-table lookup (#30) * dell-mellanox phase 1 * dellanox phase 2 * moving files * remove old files * phase to relocate files, new variables * fixes as per Lukes review * fix build error * fixes roud 2 * dell mellanox config gen first pass * update requirements * update test requirements * rpm build update * lint * update docs for Dell and Mellanox * added extra configs * add mac-address-table and mac lookup * enable mac lookup offline * add mac vendors file to installer * add function to update mac vendors (unused) * fix templates Co-authored-by: kosonenj <[email protected]> * CASMNET-960 Add warning for unknown devices (#32) * change --shasta flag to --csm * add warning for unknown devices * Add PR template (#34) Signed-off-by: Jacob Salmela <[email protected]> * CASMNET-991 - fix pip3 depenancy for container environment (#42) Co-authored-by: Dat Le <[email protected]> * add pdus to network hardware and architecture (#41) Signed-off-by: Jacob Salmela <[email protected]> * Feature/shcd cabling (#46) * dell-mellanox phase 1 * dellanox phase 2 * moving files * remove old files * phase to relocate files, new variables * fixes as per Lukes review * fix build error * fixes roud 2 * dell mellanox config gen first pass * update requirements * update test requirements * rpm build update * lint * update docs for Dell and Mellanox * added extra configs * add mac-address-table and mac lookup * enable mac lookup offline * add mac vendors file to installer * add function to update mac vendors (unused) * fix templates * update shcd-cabling, fix find_mac, and file out * add shcd-cabling tests * updated docs * fix for HMN slot warning always None Co-authored-by: kosonenj <[email protected]> Co-authored-by: Brooks Vinyard <[email protected]> * Casmnet-987 (#43) * Dellanox Template ordering * more templates * add dell/mellanox tests * fix dellanox config generation * dellanox stp updates Co-authored-by: lukebates123 <[email protected]> * CASMNET-1003 added CMN support for dell,mellanox,aruba (#47) * added CMN support for dell,mellanox,aruba * update readme * add mgmt plane ACL and metallb * update readme * removed hard coded variables from aruba templates * add variaibles to dellanox templates * readme * added csm version templates * update templates * updated pyinstaller * added dellanox to canu validate switch config * rollback netmiko setting Co-authored-by: lukebates123 <[email protected]> * add contributing guide (#39) Signed-off-by: Jacob Salmela <[email protected]> Co-authored-by: Sean Lynn <[email protected]> * Feature/subrack (#50) * add sub_location to NodeLocation * add SubRack * readme Co-authored-by: Sean Lynn <[email protected]> * add code of conduct file (#40) Signed-off-by: Jacob Salmela <[email protected]> * Feature/docs (#48) * auto generating docs * update pics * update pic dir * update readme * Casmnet 896 bgp support (#49) * added Aruba BGP support * update aruba tests for BGP * added Mellanox BGP support * update mellanox template/tests * update readme * added support for Computes/HSN-bmcs/VizNodes/LoginNodes/pdu during config generation * update cray-network-architecture.yaml Co-authored-by: lukebates123 <[email protected]> * CASMNET-1031 add subrack to TDS arch (#52) * add subrack to TDS arch * add SubRack to config gen Co-authored-by: lukebates123 <[email protected]> * Paddle (#54) * add sub_location to NodeLocation * add SubRack * readme * addle paddle / CCJ support * paddle docs * add issue templates (#45) Signed-off-by: Jacob Salmela <[email protected]> * CASMNET-1035 (#53) * Fix UAN lag#s, fix bgp template * fix dellanox 1.0 template * remove test print line * fix uan/viz/login code * update config.py * add VRF CAN to aruba BGP templates * CASMNET-929 * update BGP templates Co-authored-by: lukebates123 <[email protected]> Co-authored-by: Sean Lynn <[email protected]> * MTL-1556 print ncn mac addresses for use with 'csi config shcd' (#51) Signed-off-by: Jacob Salmela <[email protected]> * CASMNET-1056 - Include jq in CANU docker image (#56) * CASMNET-1056 - Include jq in CANU docker image * CASMNET-1056 - Include jq in CANU docker image * CANU 1.0.0 Release (#57) * Revert "CANU 1.0.0 Release (#57)" (#58) This reverts commit a745755. * CASMNET-1060 update templates for CMN net (#60) * update templates for CMN net * review changes * fix cdu-spine template Co-authored-by: lukebates123 <[email protected]> * CASMNET-1070: Modify setup.py file globs to use migrated Jinja2 templates (#61) * Modify file globs to use migrated Jinja2 templates * Update changelog. * Casmnet 1071 - Update Dell and Mellanox CMN templates (#63) * update dellanox templates for CMN Co-authored-by: lukebates123 <[email protected]> * Casmnet 1088 (#65) * casmnet-1088 * add more logic to CMN creation * CASMNET-1089 * CASMNET-1090 * add additional error message * format Co-authored-by: lukebates123 <[email protected]> * CASMNET-1092 (#67) * CASMNET-1092 * CASMNET 1077 * CASMNET-966 * CASMNET-1098 * change how config file opens Co-authored-by: lukebates123 <[email protected]> * Casmnet 1099 (#68) * updated PR template, added STP timeout, updated develop version. * Added stp comment Co-authored-by: lukebates123 <[email protected]> Co-authored-by: Sean Lynn <[email protected]> * Update develop version (#70) * Update .version * Update .version * version bump Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sean Lynn <[email protected]> Co-authored-by: batesl <[email protected]> Co-authored-by: Brooks Vinyard <[email protected]> Co-authored-by: Brooks Vinyard <[email protected]> Co-authored-by: dle-hpe <[email protected]> Co-authored-by: Dat Le <[email protected]> Co-authored-by: Jacob Salmela <[email protected]> Co-authored-by: kosonenj <[email protected]> Co-authored-by: Chris Spiller <[email protected]>
Cray-HPE · Jan 7, 2022 · 6acc9cd · 6acc9cd
1 parent bdae8a7
commit 6acc9cd
Show file tree

Hide file tree

Showing 54 changed files with 1,546 additions and 663 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,10 +4,12 @@ Description: What does this change do?  Use examples of new options and output c
 
 PR checklist (you may replace this section):
 - [ ] I have run `nox` locally and all tests, linting, and code coverage pass.
-- [ ] I have updated the appropriate Changelog entries in readme.md
 - [ ] I have added new tests to cover the new code
 - [ ] My code follows the style guidelines of this project
 - [ ] If adding a new file, I have updated pyinstaller.py
+- [ ] I have updated the appropriate Changelog entries in readme.md
+- [ ] I have incremented the version in the readme.md
+- [ ] I have incremented the version in `canu/.version`
 
 ### Issues and Related PRs
 

diff --git a/canu/.version b/canu/.version
@@ -1 +1 @@
-1.0.0
+1.1.1
diff --git a/canu/generate/switch/config/config.py b/canu/generate/switch/config/config.py
@@ -473,20 +473,38 @@ def generate_switch_config(
         "primary" if is_primary else "secondary"
     ]
     template = env.get_template(template_name)
-
     native_vlan = 1
-    leaf_bmc_vlan = groupby_vlan_range(
-        [native_vlan, sls_variables["NMN_VLAN"], sls_variables["HMN_VLAN"]],
-    )
+
+    leaf_bmc_vlan = [
+        native_vlan,
+        sls_variables["NMN_VLAN"],
+        sls_variables["HMN_VLAN"],
+    ]
     spine_leaf_vlan = [
         native_vlan,
         sls_variables["NMN_VLAN"],
         sls_variables["HMN_VLAN"],
         sls_variables["CAN_VLAN"],
     ]
-    if sls_variables["CMN_VLAN"]:
+    if sls_variables["CMN_VLAN"] and float(csm) >= 1.2:
         spine_leaf_vlan.append(sls_variables["CMN_VLAN"])
+        leaf_bmc_vlan.append(sls_variables["CMN_VLAN"])
+    elif sls_variables["CMN_VLAN"] and float(csm) < 1.2:
+        click.secho(
+            "\nCMN network found in SLS, the CSM version required to use this network has to be 1.2 or greater. "
+            + "\nMake sure the --csm flag matches the CSM version you are using.",
+            fg="red",
+        )
+        exit(1)
+    elif sls_variables["CMN_VLAN"] is None and float(csm) >= 1.2:
+        click.secho(
+            "\nCMN network not found in SLS, this is required for csm 1.2 "
+            + "\nHas the CSM 1.2 SLS upgrade procedure been run?",
+            fg="red",
+        )
+        exit(1)
     spine_leaf_vlan = groupby_vlan_range(spine_leaf_vlan)
+    leaf_bmc_vlan = groupby_vlan_range(leaf_bmc_vlan)
 
     variables = {
         "HOSTNAME": switch_name,
@@ -566,6 +584,9 @@ def generate_switch_config(
         click.secho(f"Cannot find {switch_name} in CSI / SLS nodes.", fg="red")
         exit(1)
 
+    cmm_switch_ip = sls_variables.get("CMN_IPs")
+    if cmm_switch_ip:
+        variables["CMN_IP"] = sls_variables["CMN_IPs"][switch_name]
     variables["HMN_IP"] = sls_variables["HMN_IPs"][switch_name]
     variables["MTL_IP"] = sls_variables["MTL_IPs"][switch_name]
     variables["NMN_IP"] = sls_variables["NMN_IPs"][switch_name]
@@ -1097,15 +1118,20 @@ def groupby_vlan_range(vlan_list):
     Returns:
         list of vlans formatted
     """
-    if not len(vlan_list):
+    vlans = []
+    for val in vlan_list:
+        if val is not None:
+            vlans.append(val)
+
+    if not len(vlans):
         return ""
 
     def _group_id(item):
         return item[0] - item[1]
 
     values = []
-    vlan_list.sort()
-    for _group_id, members in groupby(enumerate(vlan_list), key=_group_id):
+    vlans.sort()
+    for _group_id, members in groupby(enumerate(vlans), key=_group_id):
         members = list(members)
         first, last = members[0][1], members[-1][1]
 
@@ -1234,11 +1260,10 @@ def parse_sls_for_config(input_json):
                 if subnets["Name"] == "bootstrap_dhcp":
                     sls_variables["CMN_IP_GATEWAY"] = subnets["Gateway"]
                     sls_variables["CMN_VLAN"] = subnets["VlanID"]
+                if subnets["Name"] == "network_hardware":
                     for ip in subnets["IPReservations"]:
-                        if ip["Name"] == "cmn-switch-1":
-                            sls_variables["CMN_IP_PRIMARY"] = ip["IPAddress"]
-                        elif ip["Name"] == "cmn-switch-2":
-                            sls_variables["CMN_IP_SECONDARY"] = ip["IPAddress"]
+                        if "sw" in ip["Name"]:
+                            sls_variables["CMN_IPs"][ip["Name"]] = ip["IPAddress"]
                 if subnets["Name"] == "bootstrap_dhcp":
                     for ip in subnets["IPReservations"]:
                         if "ncn-w" in ip["Name"]:

diff --git a/canu/validate/shcd/shcd.py b/canu/validate/shcd/shcd.py
@@ -88,6 +88,13 @@
     default="-",
 )
 @click.option("--json", "json_", is_flag=True, help="Output JSON model to a file")
+@click.option(
+    "--out",
+    help="Output results to a file",
+    type=click.File("w"),
+    default="-",
+)
+@click.option("--json", "json_", is_flag=True, help="Output JSON model to a file")
 @click.option(
     "--log",
     "log_",

diff --git a/canu/validate/switch/config/config.py b/canu/validate/switch/config/config.py
@@ -256,15 +256,24 @@ def config(
             )
         try:
             # Load config from file and parse hostname
-            vendor = vendor.lower()
-            if vendor == "dell":
-                host = Host("example.rtr", "dellOS10", dell_options)
-            elif vendor == "mellanox":
-                host = Host("example.rtr", "onyx", mellanox_options)
-            elif vendor == "aruba":
-                host = Host("example.rtr", "aoscx", options)
-            running_config_hier = HConfig(host=host)
-            running_config_hier.load_from_file(running)
+            with open(running, "r") as f:
+                running = f.read()
+                vendor = vendor.lower()
+                if vendor == "dell":
+                    host = Host("example.rtr", "dellOS10", dell_options)
+                elif vendor == "mellanox":
+                    host = Host("example.rtr", "onyx", mellanox_options)
+                    switch_config_list = []
+                    for line in running.splitlines():
+                        if line.startswith("   "):
+                            switch_config_list.append(line.strip())
+                        else:
+                            switch_config_list.append(line)
+                    running = ("\n").join(switch_config_list)
+                elif vendor == "aruba":
+                    host = Host("example.rtr", "aoscx", options)
+                running_config_hier = HConfig(host=host)
+                running_config_hier.load_from_string(running)
         except UnicodeDecodeError:
             click.secho(
                 f"The file {running} is not a valid config file.",
@@ -375,7 +384,7 @@ def config(
         remediation_config_hier.add_tags(tags)
     click.echo(dash, file=out)
     for safe_line in remediation_config_hier.with_tags({"safe"}).all_children():
-        click.echo(safe_line.cisco_style_text())
+        click.echo(safe_line.cisco_style_text(), file=out)
     click.echo(dash, file=out)
 
     click.secho(
@@ -384,7 +393,10 @@ def config(
         + "\n"
         + "These commands may cause disruption to the system and should be done only during a maintenance period."
         + "\n"
-        + "It is recommended to have an out of band connection while running these commands.",
+        + "It is recommended to have an out of band connection while running these commands."
+        + "\n"
+        + "If commands are going to be applied to Aruba switches, it is recommended to utilize Configuration Checkpoints "
+        + "to avoid getting locked out.",
         fg="red",
         file=out,
     )

diff --git a/canu/validate/switch/config/dell_options.yaml b/canu/validate/switch/config/dell_options.yaml
@@ -17,6 +17,9 @@
     #     - no route-map
     #   order: 600
     ordering:
+    - lineage:
+      - startswith: ip vrf
+      order: 4
     - lineage:
       - startswith: ip name-server
       order: 5

diff --git a/canu/validate/switch/config/mellanox_tags.yaml b/canu/validate/switch/config/mellanox_tags.yaml
@@ -119,13 +119,16 @@
       - no ip dns
       - ip dns
       - no ntp
+      - ip name-server
     add_tags: safe
   #manual contains
   - lineage:
     - contains:
       - spanning-tree
       - magp
       - mgmt0
+      - mlag-port-channel
+      - vrf
     add_tags: manual
   #safe contains
   - lineage:

diff --git a/docs/generate_network_config.md b/docs/generate_network_config.md
@@ -69,7 +69,7 @@ canu generate network config [OPTIONS]
 
 
 ### -a(, --architecture( <architecture>)
-CSM architecture
+**Required** CSM architecture
 
 
 * **Options**
@@ -78,12 +78,8 @@ CSM architecture
 
 
 
-### --ccj( <ccj>)
-Paddle CCJ file
-
-
 ### --shcd( <shcd>)
-SHCD file
+**Required** SHCD file
 
 
 ### --tabs( <tabs>)

diff --git a/docs/generate_switch_config.md b/docs/generate_switch_config.md
@@ -78,12 +78,8 @@ canu generate switch config [OPTIONS]
 
 
 
-### --ccj( <ccj>)
-Paddle CCJ file
-
-
 ### --shcd( <shcd>)
-SHCD file
+**Required** SHCD file
 
 
 ### --tabs( <tabs>)

diff --git a/network_modeling/configs/templates/1.0/aruba/full/leaf-to-leaf-bmc.lag.j2 b/network_modeling/configs/templates/1.0/aruba/full/leaf-to-leaf-bmc.lag.j2
@@ -1,4 +1,4 @@
-{#- leaf-to-leaf-bmc #}
+{#- spine-to-leaf-bmc #}
 {%- for node in cabling.nodes if node.subtype == "leaf-bmc" %}
 interface lag {{ node.config.LAG_NUMBER }} multi-chassis
     no shutdown
@@ -15,4 +15,4 @@ interface 1/1/{{ node.config.PORT }}
     lag {{ node.config.LAG_NUMBER }}
 
 {%- endfor %}
-{#- end leaf-to-leaf-bmc #}
+{#- end spine-to-leaf-bmc #}
diff --git a/network_modeling/configs/templates/1.0/aruba/tds/leaf-bmc-to-spine.lag.j2 b/network_modeling/configs/templates/1.0/aruba/tds/leaf-bmc-to-spine.lag.j2
@@ -7,8 +7,8 @@ interface lag 255
     no shutdown
     description leaf_bmc_to_spine_lag
     no routing
-    vlan trunk native 1
-    vlan trunk allowed 1-2,4
+    vlan trunk native {{ variables.NATIVE_VLAN }}
+    vlan trunk allowed {{ variables.LEAF_BMC_VLANS }}
     lacp mode active
 {%- endif %}
 {%- endfor %}

diff --git a/network_modeling/configs/templates/1.0/aruba/tds/spine-to-leaf-bmc.lag.j2 b/network_modeling/configs/templates/1.0/aruba/tds/spine-to-leaf-bmc.lag.j2
@@ -4,8 +4,8 @@ interface lag {{ node.config.LAG_NUMBER }} multi-chassis
     no shutdown
     description {{ node.config.DESCRIPTION }}
     no routing
-    vlan trunk native 1
-    vlan trunk allowed 1-2,4
+    vlan trunk native {{ variables.NATIVE_VLAN }}
+    vlan trunk allowed {{ variables.LEAF_BMC_VLANS }}
     lacp mode active
 
 interface 1/1/{{ node.config.PORT }}

diff --git a/network_modeling/configs/templates/1.2/aruba/common/bgp.primary.j2 b/network_modeling/configs/templates/1.2/aruba/common/bgp.primary.j2
@@ -21,16 +21,21 @@ router bgp 65533
         {%- endfor %}
     exit-address-family
     vrf Customer
+        bgp router-id {{ variables.LOOPBACK_IP }}
         maximum-paths 8
         timers bgp 1 3
         distance bgp 20 70
-        neighbor {{ variables.CMN_IP_SECONDARY }} remote-as 65533
+        {%- for name, ip in variables.CMN_IPs.items() if "sw-spine-002" in name %}
+        neighbor {{ ip }} remote-as 65533
+        {%- endfor %}
         {%- for name, ip in variables.CMN_IPs.items() if "ncn-w" in name %}
         neighbor {{ ip }} remote-as 65536
         neighbor {{ ip }} passive
         {%- endfor %}
         address-family ipv4 unicast
-            neighbor {{ variables.CMN_IP_SECONDARY }} activate
+            {%- for name, ip in variables.CMN_IPs.items() if "sw-spine-002" in name %}
+            neighbor {{ ip }} activate
+            {%- endfor %}
             {%- for name, ip in variables.CMN_IPs.items() if "ncn-w" in name %}
             neighbor {{ ip }} activate
             {%- endfor %}

diff --git a/network_modeling/configs/templates/1.2/aruba/common/bgp.secondary.j2 b/network_modeling/configs/templates/1.2/aruba/common/bgp.secondary.j2
@@ -21,16 +21,21 @@ router bgp 65533
         {%- endfor %}
     exit-address-family
     vrf Customer
+        bgp router-id {{ variables.LOOPBACK_IP }}
         maximum-paths 8
         timers bgp 1 3
         distance bgp 20 70
-        neighbor {{ variables.CMN_IP_PRIMARY }} remote-as 65533
+        {%- for name, ip in variables.CMN_IPs.items() if "sw-spine-001" in name %}
+        neighbor {{ ip }} remote-as 65533
+        {%- endfor %}
         {%- for name, ip in variables.CMN_IPs.items() if "ncn-w" in name %}
         neighbor {{ ip }} remote-as 65536
         neighbor {{ ip }} passive
         {%- endfor %}
         address-family ipv4 unicast
-            neighbor {{ variables.CMN_IP_PRIMARY }} activate
+            {%- for name, ip in variables.CMN_IPs.items() if "sw-spine-001" in name %}
+            neighbor {{ ip }} activate
+            {%- endfor %}
             {%- for name, ip in variables.CMN_IPs.items() if "ncn-w" in name %}
             neighbor {{ ip }} activate
             {%- endfor %}

diff --git a/network_modeling/configs/templates/1.2/aruba/common/sw-cdu.primary.j2 b/network_modeling/configs/templates/1.2/aruba/common/sw-cdu.primary.j2
@@ -3,13 +3,15 @@
 hostname {{ variables.HOSTNAME }}
 no ip icmp redirect
 vrf keepalive
+vrf Customer
 ntp server {{ variables.NCN_W001 }}
 ntp server {{ variables.NCN_W002 }}
 ntp server {{ variables.NCN_W003 }}
 ntp enable
 
 
 
+ssh server vrf Customer
 ssh server vrf default
 ssh server vrf keepalive
 ssh server vrf mgmt
@@ -24,7 +26,11 @@ vlan {{ variables.HMN_VLAN }}
     name HMN
     apply access-list ip nmn-hmn in
     apply access-list ip nmn-hmn out
+vlan {{ variables.CMN_VLAN }}
+    name CMN
 spanning-tree
+{#- forward delay added to help with pxe boots. CASMNET-1099 + CASMTRIAGE-2793 #}
+spanning-tree forward-delay 4
 spanning-tree config-name MST0
 spanning-tree config-revision 1
 interface mgmt
@@ -78,6 +84,12 @@ interface vlan {{ variables.HMN_VLAN }}
     ip mtu 9198
     ip address {{ variables.HMN_IP }}/{{variables.HMN_PREFIX_LEN}}
     ip ospf 1 area 0.0.0.0
+interface vlan {{ variables.CMN_VLAN }}
+    vrf attach Customer
+    description CMN
+    ip mtu 9198
+    ip address {{ variables.CMN_IP }}/{{variables.CMN_PREFIX_LEN}}
+    ip ospf 1 area 0.0.0.0
 
 {%- include '1.2/aruba/common/mtn_hmn_vlan.j2' %}
 {%- include '1.2/aruba/common/mtn_nmn_vlan.j2' %}
@@ -90,12 +102,16 @@ vsx
     linkup-delay-timer 600
     vsx-sync vsx-global
 
+router ospf 1 vrf Customer
+    router-id {{ variables.LOOPBACK_IP }}
+    area 0.0.0.0
 router ospf 1
     router-id {{ variables.LOOPBACK_IP }}
     area 0.0.0.0
 router ospfv3 1
     router-id {{ variables.LOOPBACK_IP }}
     area 0.0.0.0
+https-server vrf Customer
 https-server vrf default
 https-server vrf mgmt
 {# end sw-cdu.primary #}