From 6121cd8231d4649719ed560eccd3a8cb02eb5ee2 Mon Sep 17 00:00:00 2001
From: songyanchao <songyanchao@geedgenetworks.com>
Date: Tue, 3 Aug 2021 02:51:31 -0400
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(TSG-9140):=20mrglobal=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0mirr=E7=BD=91=E5=8D=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mrglobal添加mirr网卡配置
---
 .../group_vars/stage_one_9000NPBP01R01.yml     |  5 +++--
 .../mrglobal.conf.j2.j2.9000NPBP01R01          | 18 +++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml
index 3b5abd63..02b2fafa 100644
--- a/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml
+++ b/ansible/install_config/group_vars/stage_one_9000NPBP01R01.yml
@@ -17,7 +17,7 @@ kni:
       tfe_node_count: 1
       manage_eth: eth_vf_ctl
     tfe_node_list:
-      - node_id: 0 
+      - node_id: 0
         dev_eth_symbol: eth_vf_kni
         ip_addr: 127.0.0.1
     tfe_cmsg_receiver:
@@ -30,6 +30,7 @@ mrzcpd:
     device:
       nic_raw: eth_vf_raw
       nic_to_tfe: eth_vf_kni
+      nic_mirr: eth_vf_mirr
     service:
       iocore: 52,53,54,55
   prefix_path: /opt/tsg/mrzcpd
@@ -54,7 +55,7 @@ sapp:
     nic_name: eth_vf_raw
   prefix_path: /opt/tsg/sapp
 
-# “default_vlan_id_for_mac” needs to be modified according to the vlan plan of the device 
+# “default_vlan_id_for_mac” needs to be modified according to the vlan plan of the device
 tfe:
   tfe_env_config:
     TFE_DEVICE_DATA_INCOMING: eth_vf_tfe
diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
index aa122775..5183324a 100644
--- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
+++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.9000NPBP01R01
@@ -1,5 +1,5 @@
 [device]
-device={{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},vxlan_user,vxlan_fwd
+device={{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},{{ mrzcpd.mrglobal_conf.device.nic_mirr }}
 sz_tunnel=8192
 sz_buffer=0
 
@@ -26,6 +26,11 @@ sz_tunnel=8192
 sz_buffer=0
 rssmode=2
 
+[device:{{ mrzcpd.mrglobal_conf.device.nic_mirr }}]
+mtu=2048
+hw_strip_crc=1
+rssmode=2
+
 [service]
 # lcore id for i/o service, use comma to split
 iocore={{ mrzcpd.mrglobal_conf.service.iocore }}
@@ -48,13 +53,4 @@ create_mode=3
 sz_direct_pktmbuf=2097152
 sz_indirect_pktmbuf=8192
 sz_cache=256
-sz_data=4096
-
-[forward]
-nr_forward_rule=6
-forward_rule_0=pv,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_raw }}
-forward_rule_1=vp,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_raw }}
-forward_rule_2=vv,vxlan_fwd,vxlan_user
-forward_rule_3=vv,vxlan_user,vxlan_fwd
-forward_rule_4=pv,{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }}
-forward_rule_5=vp,{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }}
\ No newline at end of file
+sz_data=4096
\ No newline at end of file