Merge "Fix condition to add per subnet routes parameter" into stable/train

environments/network-environment-v6.j2.yaml

@@ -73,14 +73,14 @@ parameter_defaults:
   {{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ipv6_subnet']}}
   {{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['ipv6_allocation_pools']}}
   {{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ipv6']}}
-{%-             if network.subnets[subnet][routes_ipv6] %}
+{%-             if network.subnets[subnet]['routes_ipv6'] is defined %}
   {{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes_ipv6']|default([])}}
 {%-             endif %}
 {%-         else %}
   {{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ip_subnet']}}
   {{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['allocation_pools']}}
   {{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ip']}}
-{%-             if network.subnets[subnet][routes] %}
+{%-             if network.subnets[subnet]['routes'] is defined %}
   {{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes']|default([])}}
 {%-             endif %}
 {%-         endif %}

environments/network-environment.j2.yaml

@@ -67,14 +67,14 @@ parameter_defaults:
   {{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ipv6_subnet']}}
   {{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['ipv6_allocation_pools']}}
   {{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ipv6']}}
-{%-             if network.subnets[subnet][routes_ipv6] %}
+{%-             if network.subnets[subnet]['routes_ipv6'] is defined %}
   {{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes_ipv6']|default([])}}
 {%-             endif %}
 {%-         else %}
   {{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ip_subnet']}}
   {{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['allocation_pools']}}
   {{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ip']}}
-{%-             if network.subnets[subnet][routes] %}
+{%-             if network.subnets[subnet]['routes'] is defined %}
   {{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes']|default([])}}
 {%-             endif %}
 {%-         endif %}