From 6e495828f08b5391afe2d01c9f8a93dd1e67edc2 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 23 Apr 2021 18:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E5=A2=9E=E5=8A=A0sa?=
 =?UTF-8?q?pp=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/sapp/templates/asymmetric_addr_layer.conf.j2     | 7 +++++++
 roles/sapp/templates/asymmetric_presence_layer.conf.j2 | 8 ++++++++
 roles/sapp/templates/sapp.toml.j2                      | 4 +++-
 roles/sapp/templates/vlan_flipping_map.conf.j2         | 5 +++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 roles/sapp/templates/asymmetric_addr_layer.conf.j2
 create mode 100644 roles/sapp/templates/asymmetric_presence_layer.conf.j2

diff --git a/roles/sapp/templates/asymmetric_addr_layer.conf.j2 b/roles/sapp/templates/asymmetric_addr_layer.conf.j2
new file mode 100644
index 0000000..b8217d7
--- /dev/null
+++ b/roles/sapp/templates/asymmetric_addr_layer.conf.j2
@@ -0,0 +1,7 @@
+#layer name definition:  ipv4, ipv6, ethernet,vlan, arp, gre, mpls, pppoe, tcp, udp, l2tp, ppp, pptp, gtp
+#pattern: asymmetric_layer_name[layer index]
+vlan[*]
+mpls[*]
+gre[*]
+gtp[*]
+
diff --git a/roles/sapp/templates/asymmetric_presence_layer.conf.j2 b/roles/sapp/templates/asymmetric_presence_layer.conf.j2
new file mode 100644
index 0000000..5f2e4b7
--- /dev/null
+++ b/roles/sapp/templates/asymmetric_presence_layer.conf.j2
@@ -0,0 +1,8 @@
+#layer name definition:  ipv4, ipv6, ethernet,vlan, arp, gre, mpls, pppoe, tcp, udp, l2tp, ppp, pptp, gtp
+#pattern: asymmetric_layer_name    under_of_this_asymmetric_layer[layer_index]   upper_of_this_asymmetric_layer[layer_index]
+{% if tsg_access_type == 2 and tsg_running_type == 2 %}
+mpls    ethernet[0]    ipv4[1]
+mpls    ethernet[0]    ipv6[1]
+{% else %}
+#
+{% endif %}
\ No newline at end of file
diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2
index 7b1bfc5..f2ffc9e 100644
--- a/roles/sapp/templates/sapp.toml.j2
+++ b/roles/sapp/templates/sapp.toml.j2
@@ -122,6 +122,8 @@ dictator_enable=0
     treat_vlan_as_mac_in_mac=0
     reverse_ethernet_addr=1
 
+[DUPLICATE_PKT]
+    duplicate_pkt_distinguish=0
 	
 [STREAM]
 ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" 
@@ -207,7 +209,7 @@ dictator_enable=0
         dump_thread_id=[0,1,2,3,4]
    
         [tools.pkt_dump.udp]
-        command_port=12345
+        command_port=9345
 
         [tools.pkt_dump.storage]
 ### note, file path must be double quotation mark extension, for example,  path="/dev/shm/pkt_dump"
diff --git a/roles/sapp/templates/vlan_flipping_map.conf.j2 b/roles/sapp/templates/vlan_flipping_map.conf.j2
index 599e8f8..ebfd593 100644
--- a/roles/sapp/templates/vlan_flipping_map.conf.j2
+++ b/roles/sapp/templates/vlan_flipping_map.conf.j2
@@ -6,6 +6,11 @@
 #配置文件格式, pattern:
 #来自C路由器vlan_id	  	来自I路由器vlan_id   	是否开启mac地址翻转
 #C_router_vlan_id  I_router_vlan_id mac_flipping_enable
+{% if tsg_access_type == 2 and tsg_running_type == 2 %}
 1301	1302	1
 1201	1202	1
 4000	4001	0
+{% else %}
+4000	4001	0
+{% endif %}
+