修改和增加sapp的配置文件

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[*]
+

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 %}

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"

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 %}
+