From decb82a2f2ba0e2313e44a09d376619e3ba1bdc2 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 8 Dec 2021 10:04:43 +0800 Subject: [PATCH] =?UTF-8?q?feature:TSG-8636:=E4=BF=AE=E6=94=B9wannat?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group_vars/stage_one_7400MCN0P01R01.yml | 4 --- .../group_vars/stage_one_9000NPBP01R01.yml | 4 --- .../provision.default.yml.7400MCN0P01R01 | 15 ++++++----- .../provision.default.yml.9000NPBP01R01 | 15 ++++++----- .../provision.yml.sample.7400MCN0P01R01 | 5 ++-- .../provision.yml.sample.9000NPBP01R01 | 5 ++-- .../wannat_wangw/templates/wangw.conf.j2.j2 | 25 +++++++++++++------ .../templates/wire_graft.conf.j2.j2 | 13 ++++++++-- 8 files changed, 50 insertions(+), 36 deletions(-) diff --git a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml index 6b5d6ddb..ee7f0b6b 100644 --- a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml +++ b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml @@ -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 diff --git a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml index 6a4139fb..98cebb45 100644 --- a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml +++ b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml @@ -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 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 index 851082f7..46438e9e 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01 @@ -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 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 index da46917d..2b9f0ad9 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01 @@ -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 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 index 2d1a5be5..a63a439b 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 @@ -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 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 index e1e20466..1574783d 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 @@ -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 diff --git a/ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2 b/ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2 index 39dcf599..167d5ed5 100644 --- a/ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2 +++ b/ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2 @@ -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] diff --git a/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 b/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 index f5eeefda..720a8fc6 100644 --- a/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 +++ b/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 @@ -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 %}