From 897ab39991d8d1ba8b24ea76a2914f3a6e2e40be Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 12 Jul 2021 14:56:43 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9sapp=E7=9A=84send=5Fra?= =?UTF-8?q?w=5Fpkt.conf=E7=9A=84=E9=85=8D=E7=BD=AE=E7=BD=91=E5=8D=A1?= =?UTF-8?q?=E5=9C=A89140=E7=8E=AF=E5=A2=83=E4=B8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../install_config/group_vars/stage_one_7400MCN0P01R01.yml | 2 ++ ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml | 2 ++ ansible/roles/sapp/templates/send_raw_pkt.conf.j2 | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml index 6b840e8c..b05968af 100644 --- a/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml +++ b/ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml @@ -57,6 +57,8 @@ sapp: name: eth_raw overlay_tunnel_definition: overlay_mode: '{% raw %}{{ sapp_overlay_mode }}{% endraw %}' + send_raw_pkt_conf: + nic_name: eth_raw tsg_diagnose: docker_compose_yml: diff --git a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml index bdd23752..98ad1eef 100644 --- a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml +++ b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml @@ -49,6 +49,8 @@ sapp: name: eth_vf_raw overlay_tunnel_definition: overlay_mode: vxlan + send_raw_pkt_conf: + nic_name: eth_vf_raw tfe: tfe_env_config: diff --git a/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 b/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 index 32c83d1a..14b1e0ca 100644 --- a/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 +++ b/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 @@ -2,8 +2,8 @@ ##(11:ipfile, 12:marsio4, 13:agent_smith, 14:dpdk_vxlan, 15:marsio_vxlan, 16:pag_marsio #target_id -0 pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 eth_raw smith dpdk dpdk pag -1 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 eth_raw smith dpdk dpdk pag +0 pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ sapp.send_raw_pkt_conf.nic_name }} smith dpdk dpdk pag +1 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 {{ sapp.send_raw_pkt_conf.nic_name }} smith dpdk dpdk pag #2 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p1 smith dpdk dpdk pag #3 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag #4 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag \ No newline at end of file