update

2 files changed, 21 insertions, 10 deletions

diff --git a/roles/mrzcpd/templates/mrglobal.conf.ATCA_40G.j2 b/roles/mrzcpd/templates/mrglobal.conf.ATCA_40G.j2
index 3f02cb8..995aead 100644
--- a/roles/mrzcpd/templates/mrglobal.conf.ATCA_40G.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.ATCA_40G.j2
@@ -1,17 +1,27 @@
 [device]
-device={{nic_data_incoming.name}},vxlan_user,vxlan_fwd
+device={{nic_data_incoming.vf0_name}},{{ nic_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
 sz_tunnel=8192
 sz_buffer=0
 
-[device:{{nic_data_incoming.name}}]
-jumbo_frame=1
-max_rx_pkt_len=4096
+[device:{{nic_data_incoming.vf0_name}}]
+mtu=4096
 clear_tx_flags=1
 vlan-filter=1
 vlan-strip=1
 vlan-id-allow={{ VlanFlipping.vlanID_1 }},{{ VlanFlipping.vlanID_2 }}
 vlan-pvid=0
 vlan-pvid-mode=2
+hw_strip_crc=1
+
+[device:{{ nic_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
 
 [service]
 # lcore id for i/o service, use comma to split
@@ -37,9 +47,10 @@ sz_cache=256
 sz_data=4096
 
 [forward]
-nr_forward_rule=4
-forward_rule_0=pv,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
-forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
+nr_forward_rule=6
+forward_rule_0=pv,{{nic_data_incoming.vf0_name}},{{nic_data_incoming.vf0_name}}
+forward_rule_1=vp,{{nic_data_incoming.vf0_name}},{{nic_data_incoming.vf0_name}}
 forward_rule_2=vv,vxlan_fwd,vxlan_user
 forward_rule_3=vv,vxlan_user,vxlan_fwd
-
+forward_rule_4=pv,{{ nic_data_incoming.vf1_name }},{{ nic_data_incoming.vf1_name }}
+forward_rule_5=vp,{{ nic_data_incoming.vf1_name }},{{ nic_data_incoming.vf1_name }}
diff --git a/roles/mrzcpd/templates/mrtunnat.conf.ATCA_40G.j2 b/roles/mrzcpd/templates/mrtunnat.conf.ATCA_40G.j2
index 8513cc7..220eb46 100644
--- a/roles/mrzcpd/templates/mrtunnat.conf.ATCA_40G.j2
+++ b/roles/mrzcpd/templates/mrtunnat.conf.ATCA_40G.j2
@@ -1,14 +1,14 @@
 [tunnat]
 lcore_id={{ mrtunnat.lcore_id }}
 appsym=tunnat
-phydev={{nic_data_incoming.name}}
+phydev={{nic_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_tuple4_as_sskey=1
+use_tuple4_as_sskey=0
 ctrlzone_addr_info_type=2
 
 [vlan_flipping]