Skip to content

fix(2-networking): fix NVA routing, Spot default, firewall policy prefix, and peering stagger - #269

Merged
lynn-goog merged 6 commits into
mainfrom
fix/stage-2-fedramp-networking
Sep 28, 2026
Merged

lynn-goog merged 6 commits into
mainfrom
fix/stage-2-fedramp-networking

Conversation

@aghassemlouei

Copy link
Copy Markdown
Member

Description

Fixes four Stage 2 networking deployment and routing issues across 2-networking-a-fedramp and 2-networking-b-il5-ngfw:

  • Flattens local.routing_config landing routes in fast/stages-aw/2-networking-a-fedramp/nva.tf across all tenant subnets in each environment instead of indexing only [0], ensuring additional tenant subnets receive NVA return routes for outbound egress.
  • Defaults the hierarchical firewall policy name (module.firewall-policy-default) to "${var.prefix}-net-default" when factories_config.firewall_policy_name is unset in both 2-networking-a-fedramp and 2-networking-b-il5-ngfw so multiple deployments within the same organization do not collide on net-default.
  • Links each module.peering-envs instance to its corresponding time_sleep.peering_delay[each.key] trigger in branch-net-envs.tf rather than depending on the entire time_sleep.peering_delay resource map, staggering spoke-to-landing VPC peering operations as intended.
  • Introduces var.nva_spot_vms (defaulting to false) in 2-networking-a-fedramp so NVA instances run as standard on-demand VMs with automatic restart by default rather than hardcoded Spot instances.

Fixes #146
Fixes #199
Fixes #254
Fixes #255

Type of Change

  • Bug Fix
  • New Feature
  • Breaking Change
  • Documentation Update
  • Refactoring

Deployment & Compliance Impact

Affected Stages

  • Stage 0: Bootstrap
  • Stage 1: Resource Management
  • Stage 2: Networking (FedRAMP / IL5)
  • Stage 3: Security
  • Blueprints / Modules

Compliance Frameworks

  • FedRAMP Moderate / High
  • DoD IL4 / IL5
  • CMMC
  • Other / None

Checklist

  • My code follows the style guidelines of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation (including running tfdoc if applicable).
  • My changes generate no new warnings or errors (terraform validate / tflint).

Testing Performed

  • Added unit tests in tests/tools/test_stage2_networking.py covering NVA landing route flattening, prefixed hierarchical firewall policy defaults, per-environment VPC peering stagger dependencies, and default on-demand NVA VM scheduling.
  • Ran python3 -m unittest tests/tools/test_stage2_networking.py -v.

@aghassemlouei aghassemlouei added Bug Something isn't working Framework - FedRAMP Moderate FedRAMP Moderate compliance regime and controls Framework - FedRAMP High FedRAMP High compliance regime and controls Framework - IL4 DoD Impact Level 4 (IL4) compliance regime and controls Framework - IL5 DoD Impact Level 5 (IL5) compliance regime and controls Scope - Stage 2 labels Sep 25, 2026
@github-actions github-actions Bot added the Scope - Fast Related to Fabric FAST deployment stages in the fast directory label Sep 25, 2026
@aghassemlouei
aghassemlouei marked this pull request as ready for review September 27, 2026 14:42
@aghassemlouei
aghassemlouei enabled auto-merge (squash) September 27, 2026 14:43

@lynn-goog lynn-goog left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verification & Test Results

  • Stage 2 Unit Tests (tests/tools/test_stage2_networking.py): 4/4 passed
    • test_nva_routing_config_flattens_all_tenant_subnets ... ok
    • test_firewall_policy_name_defaults_to_prefixed_name ... ok
    • test_peering_envs_depends_on_per_instance_sleep ... ok
    • test_nva_defaults_to_standard_on_demand_vms ... ok
  • Full Python Unit Test Suite (tools/run_tests.sh): 38/38 passed
  • Shell Script Syntax & Unit Tests (tests/scripts/run_shell_tests.sh): 46/46 passed (27 syntax checks, 19 unit tests)
  • Terraform Formatting & Validation (terraform fmt -check & terraform validate):
    • fast/stages-aw/2-networking-a-fedramp: Success! The configuration is valid.
    • fast/stages-aw/2-networking-b-il5-ngfw: Success! The configuration is valid.
  • Documentation (tools/tfdoc.py): Regenerated variable tables in fast/stages-aw/2-networking-a-fedramp/README.md and fast/stages-aw/2-networking-b-il5-ngfw/README.md

@lynn-goog
lynn-goog merged commit f43b0a1 into main Sep 28, 2026
19 checks passed
@lynn-goog
lynn-goog deleted the fix/stage-2-fedramp-networking branch September 28, 2026 17:59
Calvin-Cheng1 pushed a commit that referenced this pull request Oct 2, 2026
…fix, and peering stagger (#269)

Co-authored-by: lynn-goog <lnhymon@google.com>
@aghassemlouei aghassemlouei added Priority - Medium Standard features and non-blocking bugs; important for the current milestone but not urgent Level of Effort - Medium Moderate task requiring thought and testing; typically takes a couple of days to a week and removed Framework - IL4 DoD Impact Level 4 (IL4) compliance regime and controls labels Oct 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug Something isn't working Level of Effort - Medium Moderate task requiring thought and testing; typically takes a couple of days to a week Priority - Medium Standard features and non-blocking bugs; important for the current milestone but not urgent Scope - Fast Related to Fabric FAST deployment stages in the fast directory

Projects

None yet

5 participants