1、删除tsg_access_type 变量
2、新增proxy_topo_type，capture_pacakge_type,traffic_addr_type,network_topo_type,traffic_load_type,runtime_env_type 3、删除关于adc，atca的mrzcpd，sapp相关配置文件
This commit is contained in:
fumingwei
@@ -1,57 +0,0 @@
|
||||
[device]
|
||||
device={{ATCA_data_incoming.vf0_name}},{{ ATCA_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=32
|
||||
|
||||
[device:{{ATCA_data_incoming.vf0_name}}]
|
||||
mtu=4096
|
||||
clear_tx_flags=1
|
||||
hw_strip_crc=1
|
||||
in_addr={{ ATCA_VXLAN.keepalive_ip }}
|
||||
in_mask={{ ATCA_VXLAN.keepalive_mask }}
|
||||
#rssmode=3
|
||||
|
||||
[device:{{ ATCA_data_incoming.vf1_name }}]
|
||||
mtu=4096
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-strip=1
|
||||
vlan-id-allow=4095
|
||||
vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
hw_strip_crc=1
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mrzcpd.iocore }}
|
||||
distmode=1
|
||||
hashmode=0
|
||||
idle_threshold=10000
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7f40c4a00000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=0
|
||||
|
||||
[ctrlzone]
|
||||
ctrlzone0=tunnat,64
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=6
|
||||
forward_rule_0=pv,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
|
||||
forward_rule_1=vp,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
|
||||
forward_rule_5=vp,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
|
||||
@@ -1,20 +0,0 @@
|
||||
[tunnat]
|
||||
lcore_id={{ mrtunnat.lcore_id }}
|
||||
appsym=tunnat
|
||||
phydev={{ATCA_data_incoming.vf0_name}}
|
||||
virtdev=vxlan_fwd
|
||||
nr_max_sessions=524280
|
||||
nr_slots=1048576
|
||||
expire_time=60
|
||||
reverse_tunnel=0
|
||||
use_recent_tunnel=0
|
||||
use_link_info_table=1
|
||||
use_tuple4_as_sskey=0
|
||||
ctrlzone_addr_info_type=2
|
||||
idle_threshold=10000
|
||||
|
||||
[vlan_flipping]
|
||||
enable=0
|
||||
c_router_vlan_id_0=1000
|
||||
i_router_vlan_id_0=1001
|
||||
en_mac_flipping_0=0
|
||||
@@ -1,60 +0,0 @@
|
||||
[device]
|
||||
device={{ATCA_data_incoming.vf0_name}},{{ ATCA_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=32
|
||||
|
||||
[device:{{ATCA_data_incoming.vf0_name}}]
|
||||
mtu=4096
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-strip=1
|
||||
vlan-id-allow={{ ATCA_VlanFlipping.vlanID_1 }},{{ ATCA_VlanFlipping.vlanID_2 }},{{ ATCA_VlanFlipping.vlanID_3 }},{{ ATCA_VlanFlipping.vlanID_4 }}
|
||||
vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
hw_strip_crc=1
|
||||
#rssmode=3
|
||||
|
||||
[device:{{ ATCA_data_incoming.vf1_name }}]
|
||||
mtu=4096
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-strip=1
|
||||
vlan-id-allow=4095
|
||||
vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
hw_strip_crc=1
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mrzcpd.iocore }}
|
||||
distmode=1
|
||||
hashmode=0
|
||||
idle_threshold=10000
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7f40c4a00000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=0
|
||||
|
||||
[ctrlzone]
|
||||
ctrlzone0=tunnat,64
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=6
|
||||
forward_rule_0=pv,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
|
||||
forward_rule_1=vp,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
|
||||
forward_rule_5=vp,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
|
||||
@@ -1,23 +0,0 @@
|
||||
[tunnat]
|
||||
lcore_id={{ mrtunnat.lcore_id }}
|
||||
appsym=tunnat
|
||||
phydev={{ATCA_data_incoming.vf0_name}}
|
||||
virtdev=vxlan_fwd
|
||||
nr_max_sessions=524280
|
||||
nr_slots=1048576
|
||||
expire_time=60
|
||||
reverse_tunnel=0
|
||||
use_recent_tunnel=0
|
||||
use_link_info_table=1
|
||||
use_tuple4_as_sskey=0
|
||||
ctrlzone_addr_info_type=2
|
||||
idle_threshold=10000
|
||||
|
||||
[vlan_flipping]
|
||||
enable=1
|
||||
c_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_1 }}
|
||||
i_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_2 }}
|
||||
en_mac_flipping_0=0
|
||||
c_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_3 }}
|
||||
i_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_4 }}
|
||||
en_mac_flipping_1=0
|
||||
@@ -1,67 +0,0 @@
|
||||
[device]
|
||||
device={{nic_data_incoming.name}},{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe2.name}},vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{nic_data_incoming.name}}]
|
||||
in_addr={{inline_device_config.keepalive_ip}}
|
||||
in_mask={{inline_device_config.keepalive_mask}}
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-id-allow=1000,1001,4000,4001
|
||||
|
||||
[device:{{nic_to_tfe.tfe0.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{nic_to_tfe.tfe1.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{nic_to_tfe.tfe2.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mcn0_mrzcpd.iocore }}
|
||||
distmode=2
|
||||
hashmode=0
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7f40c4a00000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=0
|
||||
|
||||
[ctrlzone]
|
||||
ctrlzone0=tunnat,64
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=10
|
||||
forward_rule_0=pv,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
|
||||
forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
|
||||
forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
|
||||
forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
|
||||
forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
|
||||
forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
|
||||
forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
|
||||
@@ -1,21 +0,0 @@
|
||||
[tunnat]
|
||||
lcore_id={{ mrtunnat.lcore_id }}
|
||||
appsym=tunnat
|
||||
phydev={{nic_data_incoming.name}}
|
||||
virtdev=vxlan_fwd
|
||||
nr_max_sessions=524280
|
||||
nr_slots=1048576
|
||||
expire_time=60
|
||||
reverse_tunnel=0
|
||||
use_recent_tunnel=0
|
||||
use_tuple4_as_sskey=1
|
||||
ctrlzone_addr_info_type=2
|
||||
|
||||
[vlan_flipping]
|
||||
enable=1
|
||||
c_router_vlan_id_0=1000
|
||||
i_router_vlan_id_0=1001
|
||||
en_mac_flipping_0=0
|
||||
c_router_vlan_id_1=4000
|
||||
i_router_vlan_id_1=4001
|
||||
en_mac_flipping_1=0
|
||||
@@ -1,68 +0,0 @@
|
||||
[device]
|
||||
device={{nic_data_incoming.name}},{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe2.name}},vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{nic_data_incoming.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-id-allow=1000,1001,2000,2001,4000,4001
|
||||
vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
promisc=1
|
||||
|
||||
[device:{{nic_to_tfe.tfe0.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{nic_to_tfe.tfe1.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:{{nic_to_tfe.tfe2.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mrzcpd.iocore }}
|
||||
distmode=2
|
||||
hashmode=0
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7f40c4a00000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=0
|
||||
|
||||
[ctrlzone]
|
||||
ctrlzone0=tunnat,64
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=10
|
||||
forward_rule_0=pv,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
|
||||
forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
|
||||
forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
|
||||
forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
|
||||
forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
|
||||
forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
|
||||
forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
|
||||
@@ -1,24 +0,0 @@
|
||||
[tunnat]
|
||||
lcore_id={{ mrtunnat.lcore_id }}
|
||||
appsym=tunnat
|
||||
phydev={{nic_data_incoming.name}}
|
||||
virtdev=vxlan_fwd
|
||||
nr_max_sessions=524280
|
||||
nr_slots=1048576
|
||||
expire_time=60
|
||||
reverse_tunnel=0
|
||||
use_recent_tunnel=0
|
||||
use_tuple4_as_sskey=1
|
||||
ctrlzone_addr_info_type=2
|
||||
|
||||
[vlan_flipping]
|
||||
enable=1
|
||||
c_router_vlan_id_0=1000
|
||||
i_router_vlan_id_0=1001
|
||||
en_mac_flipping_0=0
|
||||
c_router_vlan_id_1=2000
|
||||
i_router_vlan_id_1=2001
|
||||
en_mac_flipping_1=0
|
||||
c_router_vlan_id_2=4000
|
||||
i_router_vlan_id_2=4001
|
||||
en_mac_flipping_2=0
|
||||
@@ -1,69 +0,0 @@
|
||||
[device]
|
||||
device=ens1f4,ens1f5,ens1f6,ens1f7,vxlan_user,vxlan_fwd
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:ens1f4]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
vlan-filter=1
|
||||
vlan-id-allow={{ AllotAccess.virturlID_1 }},{{ AllotAccess.virturlID_2 }},{{ AllotAccess.virturlID_3 }},{{ AllotAccess.virturlID_4 }},4000,4001
|
||||
vlan-pvid=0
|
||||
vlan-pvid-mode=2
|
||||
promisc=1
|
||||
|
||||
[device:ens1f5]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:ens1f6]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[device:ens1f7]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[service]
|
||||
# lcore id for i/o service, use comma to split
|
||||
iocore={{ mcn0_mrzcpd.iocore }}
|
||||
distmode=2
|
||||
hashmode=0
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7f40c4a00000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=0
|
||||
|
||||
[ctrlzone]
|
||||
ctrlzone0=tunnat,64
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
|
||||
[forward]
|
||||
nr_forward_rule=10
|
||||
forward_rule_0=pv,ens1f4,ens1f4
|
||||
forward_rule_1=vp,ens1f4,ens1f4
|
||||
forward_rule_2=vv,vxlan_fwd,vxlan_user
|
||||
forward_rule_3=vv,vxlan_user,vxlan_fwd
|
||||
forward_rule_4=pv,ens1f5,ens1f5
|
||||
forward_rule_5=vp,ens1f5,ens1f5
|
||||
forward_rule_6=pv,ens1f6,ens1f6
|
||||
forward_rule_7=vp,ens1f6,ens1f6
|
||||
forward_rule_8=pv,ens1f7,ens1f7
|
||||
forward_rule_9=vp,ens1f7,ens1f7
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
[tunnat]
|
||||
lcore_id={{ mrtunnat.lcore_id }}
|
||||
appsym=tunnat
|
||||
phydev=ens1f4
|
||||
virtdev=vxlan_fwd
|
||||
nr_max_sessions=524280
|
||||
nr_slots=1048576
|
||||
expire_time=60
|
||||
reverse_tunnel=0
|
||||
use_recent_tunnel=0
|
||||
use_tuple4_as_sskey=1
|
||||
ctrlzone_addr_info_type=2
|
||||
|
||||
[vlan_flipping]
|
||||
enable=1
|
||||
c_router_vlan_id_0={{ AllotAccess.virturlID_1 }}
|
||||
i_router_vlan_id_0={{ AllotAccess.virturlID_2 }}
|
||||
en_mac_flipping_0=1
|
||||
c_router_vlan_id_1={{ AllotAccess.virturlID_3 }}
|
||||
i_router_vlan_id_1={{ AllotAccess.virturlID_4 }}
|
||||
en_mac_flipping_1=1
|
||||
c_router_vlan_id_2=4000
|
||||
i_router_vlan_id_2=4001
|
||||
en_mac_flipping_2=0
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
[bpfdump:vxlan_user]
|
||||
enable=1
|
||||
@@ -4,8 +4,10 @@ sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{inline_device_config.data_incoming}}]
|
||||
{% if traffic_attr_type == 0 %}
|
||||
in_addr={{inline_device_config.keepalive_ip}}
|
||||
in_mask={{inline_device_config.keepalive_mask}}
|
||||
{% endif %}
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
[device]
|
||||
device={{nic_traffic_mirror.name}}
|
||||
sz_tunnel=8192
|
||||
sz_buffer=0
|
||||
|
||||
[device:{{nic_traffic_mirror.name}}]
|
||||
jumbo_frame=1
|
||||
max_rx_pkt_len=15360
|
||||
clear_tx_flags=1
|
||||
promisc=1
|
||||
|
||||
[service]
|
||||
iocore={{ mcn123_mrzcpd.iocore }}
|
||||
|
||||
[eal]
|
||||
virtaddr=0x7d0000000000
|
||||
loglevel=7
|
||||
|
||||
[keepalive]
|
||||
check_spinlock=1
|
||||
|
||||
[pool]
|
||||
create_mode=3
|
||||
sz_direct_pktmbuf=4194304
|
||||
sz_indirect_pktmbuf=8192
|
||||
sz_cache=256
|
||||
sz_data=4096
|
||||
Reference in New Issue
Block a user