Keep both prefix and subnet decap term for vlan

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
sonic-net · Jul 28, 2024 · 8c07d59 · 8c07d59
1 parent b1b3f22
commit 8c07d59
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/dockers/docker-orchagent/ipinip.json.j2 b/dockers/docker-orchagent/ipinip.json.j2
@@ -52,10 +52,8 @@
         {%- set ipv6_vlan_addresses = ipv6_vlan_addresses.append(prefix) %}
     {%- endif %}
 {% endfor %}
-{% if not subnet_decap.enable %}
-    {%- set ipv4_addresses = ipv4_addresses + ipv4_vlan_addresses %}
-    {%- set ipv6_addresses = ipv6_addresses + ipv6_vlan_addresses %}
-{% endif %}
+{%- set ipv4_addresses = ipv4_addresses + ipv4_vlan_addresses %}
+{%- set ipv6_addresses = ipv6_addresses + ipv6_vlan_addresses %}
 [
 {% if ipv4_loopback_addresses %}
 {% if subnet_decap.enable %}

diff --git a/src/sonic-config-engine/tests/sample_output/py2/ipinip_subnet_decap_enable.json b/src/sonic-config-engine/tests/sample_output/py2/ipinip_subnet_decap_enable.json
@@ -73,6 +73,18 @@
         },
         "OP": "SET"
     },
+    {
+        "TUNNEL_DECAP_TERM_TABLE:IPINIP_TUNNEL:192.168.0.1" : {
+            "term_type":"P2MP"
+        },
+        "OP": "SET"
+    },
+    {
+        "TUNNEL_DECAP_TERM_TABLE:IPINIP_TUNNEL:192.168.200.1" : {
+            "term_type":"P2MP"
+        },
+        "OP": "SET"
+    },
     {
         "TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
             "tunnel_type":"IPINIP",

diff --git a/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json b/src/sonic-config-engine/tests/sample_output/py3/ipinip_subnet_decap_enable.json
@@ -73,6 +73,18 @@
         },
         "OP": "SET"
     },
+    {
+        "TUNNEL_DECAP_TERM_TABLE:IPINIP_TUNNEL:192.168.0.1" : {
+            "term_type":"P2MP"
+        },
+        "OP": "SET"
+    },
+    {
+        "TUNNEL_DECAP_TERM_TABLE:IPINIP_TUNNEL:192.168.200.1" : {
+            "term_type":"P2MP"
+        },
+        "OP": "SET"
+    },
     {
         "TUNNEL_DECAP_TABLE:IPINIP_SUBNET_V6" : {
             "tunnel_type":"IPINIP",