gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature:TSG-8636:修改wannat相关配置项的名称

Browse Source
This commit is contained in:
fumingwei
2021-12-08 10:04:43 +08:00
parent 4084e27815
commit decb82a2f2
8 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml
View File

@@ -73,8 +73,6 @@ cm_policy_server_port: '{% raw %}{{ cm_policy_server_port }}{% endraw %}'
wannat_wangw:
wangw_conf:
main:
recvfrom_NATGW_bind_first_port: 3545
NAT_GW_tunnel_send_port: 3544
NAT_GW_tunnel_device: eth_ctl
@@ -82,8 +80,6 @@ wire_graft:
wire_graft_conf:
main:
identification_by_which_device: eth_ctl
toroad:
sendto_toroad_enable: 1
framework:
prefix_path: /opt/tsg/framework

4
ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml
View File

@@ -89,16 +89,12 @@ cm_policy_server_port: '{% raw %}{{ cm.policy_server.port }}{% endraw %}'
wannat_wangw:
wangw_conf:
main:
recvfrom_NATGW_bind_first_port: 3545
NAT_GW_tunnel_send_port: 3544
NAT_GW_tunnel_device: eth_vf_ctl
wire_graft:
wire_graft_conf:
main:
identification_by_which_device: eth_vf_ctl
toroad:
sendto_toroad_enable: 1
framework:
prefix_path: /opt/tsg/framework

15
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01
View File

@@ -26,13 +26,16 @@ gtp:
wannat:
enable: 0
natgw_address: "127.0.0.1"
toroad_address: "127.0.0.1"
toroad_port: 8888
nat_gateway_address: "127.0.0.1"
reachability_test_server_address: "127.0.0.1"
reachability_test_server_port: 8888
feedback_linkinfo_interval: 30
NAT_GW_broadcast_session_port: 5671
toroad_broadcast_session_port: 5672
toroad_tunnel_port: 3542
nat_gateway_broadcast_session_port: 5671
reachability_test_server_broadcast_session_port: 5672
reachability_test_server_tunnel_port: 3542
wan_gateway_listen_port_range_left_edge: 3545
nat_gateway_listen_port: 3544
enable_link_info_recording: 1
ddossketch:
enable: 1

15
ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01
View File

@@ -25,13 +25,16 @@ gtp:
wannat:
enable: 0
natgw_address: "127.0.0.1"
toroad_address: "127.0.0.1"
toroad_port: 8888
nat_gateway_address: "127.0.0.1"
reachability_test_server_address: "127.0.0.1"
reachability_test_server_port: 8888
feedback_linkinfo_interval: 30
NAT_GW_broadcast_session_port: 5671
toroad_broadcast_session_port: 5672
toroad_tunnel_port: 3542
nat_gateway_broadcast_session_port: 5671
reachability_test_server_broadcast_session_port: 5672
reachability_test_server_tunnel_port: 3542
wan_gateway_listen_port_range_left_edge: 3545
nat_gateway_listen_port: 3544
enable_link_info_recording: 1
ddossketch:
enable: 1

5
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
View File

@@ -35,9 +35,8 @@ gtp:
wannat:
enable: 0/1
natgw_address: "127.0.0.1"
toroad_address: "127.0.0.1"
toroad_port: 8888
nat_gateway_address: "127.0.0.1"
reachability_test_server_address: "127.0.0.1"
ddossketch:
enable: 0/1

5
ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
View File

@@ -35,9 +35,8 @@ gtp:
wannat:
enable: 0/1
natgw_address: "127.0.0.1"
toroad_address: "127.0.0.1"
toroad_port: 8888
nat_gateway_address: "127.0.0.1"
reachability_test_server_address: "127.0.0.1"
ddossketch:
enable: 0/1

25
ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2
View File

@@ -5,30 +5,39 @@ NAT_GW_io_mode=udp_multi_thread
NAT_GW_tunnel_mode=vxlan
#从起始位置开始, 本地监听sapp->threa_cound个端口, 支持多线程NIO无锁模式
recvfrom_NATGW_bind_first_port={{ wannat_wangw.wangw_conf.main.recvfrom_NATGW_bind_first_port }}
{% raw %}recvfrom_NATGW_bind_first_port={{ wannat.wan_gateway_listen_port_range_left_edge }}
{% endraw %}
#NAT GW的内部互联网卡名称
NAT_GW_tunnel_device={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_device }}
#DNAT首包发送给NATGW时, 对端的监听端口
NAT_GW_tunnel_port={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_send_port }}
{% raw %}NAT_GW_tunnel_port={{ wannat.nat_gateway_listen_port }}
{% endraw %}
#NAT GW的内部互联IP地址, 端口使用vxlan默认值, 要求对方也开放UDP 4789端口
{% raw %}NAT_GW_tunnel_ip={{ wannat.natgw_address }}
{% raw %}{% if wannat.natgw_address is defined %}
NAT_GW_tunnel_ip={{ wannat.natgw_address }}
{% else %}
NAT_GW_tunnel_ip={{ wannat.nat_gateway_address }}
{% endif %}
{% endraw %}
#连接NATGW, 订阅四元组广播消息端口
{% raw %}NAT_GW_broadcast_session_port={{ wannat.NAT_GW_broadcast_session_port }}
{% raw %}NAT_GW_broadcast_session_port={{ wannat.nat_gateway_broadcast_session_port }}
{% endraw %}
{% raw %}toroad_tunnel_ip={{ wannat.toroad_address }}
{% raw %}{% if wannat.toroad_address is defined %}
toroad_tunnel_ip={{ wannat.toroad_address }}
{% else %}
toroad_tunnel_ip={{ wannat.reachability_test_server_address }}
{% endif %}
{% endraw %}
#连接toroad, 订阅四元组广播消息端口
{% raw %}toroad_broadcast_session_port={{ wannat.toroad_broadcast_session_port }}
{% raw %}toroad_broadcast_session_port={{ wannat.reachability_test_server_broadcast_session_port }}
{% endraw %}
#SNAT的应答首包发送给toroad时, 对端的监听端口
{% raw %}toroad_tunnel_port={{ wannat.toroad_tunnel_port }}
{% raw %}toroad_tunnel_port={{ wannat.reachability_test_server_tunnel_port }}
{% endraw %}
[session]

13
ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2
View File

@@ -32,10 +32,19 @@ mirror_linkinfo_port_syntax="mac[10]:0-7"
mirror_linkinfo_dir_syntax="mac[4]:7-7"
[toroad]
sendto_toroad_enable={{ wire_graft.wire_graft_conf.toroad.sendto_toroad_enable }}
{% raw %}sendto_toroad_enable={{ wannat.enable_link_info_recording }}
{% endraw %}
{% raw %}toroad_ip={{ wannat.toroad_address }}
{% raw %}{% if wannat.toroad_address is defined %}
toroad_ip={{ wannat.toroad_address }}
{% else %}
toroad_ip={{ wannat.reachability_test_server_address }}
{% endif %}
{% if wannat.toroad_port is defined %}
toroad_port={{ wannat.toroad_port }}
{% else %}
toroad_port={{ wannat.reachability_test_server_port }}
{% endif %}
sendto_toroad_interval= {{ wannat.feedback_linkinfo_interval }}
{% endraw %}