Repository navigation
fix(2-networking): fix NVA routing, Spot default, firewall policy prefix, and peering stagger - #269
Merged
Merged
Conversation
aghassemlouei
marked this pull request as ready for review
September 27, 2026 14:42
aghassemlouei
enabled auto-merge (squash)
September 27, 2026 14:43
lynn-goog
approved these changes
Sep 28, 2026
lynn-goog
left a comment
Collaborator
There was a problem hiding this comment.
Verification & Test Results
- Stage 2 Unit Tests (
tests/tools/test_stage2_networking.py): 4/4 passedtest_nva_routing_config_flattens_all_tenant_subnets... oktest_firewall_policy_name_defaults_to_prefixed_name... oktest_peering_envs_depends_on_per_instance_sleep... oktest_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 infast/stages-aw/2-networking-a-fedramp/README.mdandfast/stages-aw/2-networking-b-il5-ngfw/README.md
Merged
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>
This was referenced Oct 5, 2026
This was referenced Nov 3, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes four Stage 2 networking deployment and routing issues across
2-networking-a-fedrampand2-networking-b-il5-ngfw:local.routing_configlanding routes infast/stages-aw/2-networking-a-fedramp/nva.tfacross all tenant subnets in each environment instead of indexing only[0], ensuring additional tenant subnets receive NVA return routes for outbound egress.module.firewall-policy-default) to"${var.prefix}-net-default"whenfactories_config.firewall_policy_nameis unset in both2-networking-a-fedrampand2-networking-b-il5-ngfwso multiple deployments within the same organization do not collide onnet-default.module.peering-envsinstance to its correspondingtime_sleep.peering_delay[each.key]trigger inbranch-net-envs.tfrather than depending on the entiretime_sleep.peering_delayresource map, staggering spoke-to-landing VPC peering operations as intended.var.nva_spot_vms(defaulting tofalse) in2-networking-a-fedrampso 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
Deployment & Compliance Impact
Affected Stages
Compliance Frameworks
Checklist
tfdocif applicable).terraform validate/tflint).Testing Performed
tests/tools/test_stage2_networking.pycovering NVA landing route flattening, prefixed hierarchical firewall policy defaults, per-environment VPC peering stagger dependencies, and default on-demand NVA VM scheduling.python3 -m unittest tests/tools/test_stage2_networking.py -v.