update

2020-09-10 20:12:17 +08:00
parent 1d210d18c4
commit 1d0943fdb0
27 changed files with 339 additions and 96 deletions
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -21,20 +21,30 @@
  when: nic_traffic_mirror is defined


-#- name: "update mrglobal.conf.tun_mode - tun_server"
-#  template:
-#    src: "{{ role_path }}/templates//mrglobal.conf.tun_mode.j2"
-#    dest: /opt/mrzcpd/etc/mrglobal.conf
-#  when: 
-#    - tsg_access_type == 0
-
- name: "update mrglobal.conf.inline - mcn0"
+- name: "copy mrapp.sapp4.conf to destination server"
  template:
-    src: "{{ role_path }}/templates/inline_device/mrglobal.conf.inline_device.j2"
+    src: "{{ role_path }}/templates/mrapp.sapp4.conf "
+    dest: /opt/mrzcpd/etc/mrapp.sapp4.conf 
+  when: 
+    - tsg_access_type == 4
+
+- name: "update mrglobal.conf.adc_inline"
+  template:
+    src: "{{ role_path }}/templates/adc_inline/mrglobal.conf.adc_inline.j2"
    dest: /opt/mrzcpd/etc/mrglobal.conf
  when: 
    - nic_traffic_mirror is not defined
    - tsg_access_type == 1
+    - tsg_running_type == 2
+
+- name: "update mrglobal.conf.server_inline"
+  template:
+    src: "{{ role_path }}/templates/server_inline/mrglobal.conf.server_inline.j2"
+    dest: /opt/mrzcpd/etc/mrglobal.conf
+  when: 
+    - nic_traffic_mirror is not defined
+    - tsg_access_type == 1
+    - tsg_running_type != 2

 - name: "update mrglobal.conf.allot - mcn0"
  template:
@@ -53,21 +63,39 @@
    - tsg_access_type == 3


- name: "update mrglobal.conf.ATCA_40G - mcn0"
+- name: "update mrglobal.conf.ATCA_Vlan_Flipping"
  template:
-    src: "{{ role_path }}/templates/ATCA_40G/mrglobal.conf.ATCA_40G.j2"
+    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrglobal.conf.ATCA_Vlan_Flipping.j2"
    dest: /opt/mrzcpd/etc/mrglobal.conf
  when: 
    - nic_traffic_mirror is not defined
-    - tsg_access_type == 4   
+    - tsg_access_type == 4

- name: "update mrtunnat.conf.inline - mcn0"
+- name: "update mrglobal.conf.ATCA_VXLAN"
  template:
-    src: "{{ role_path }}/templates/inline_device/mrtunnat.conf.inline_device.j2"
+    src: "{{ role_path }}/templates/ATCA_VXLAN/mrglobal.conf.ATCA_VXLAN.j2"
+    dest: /opt/mrzcpd/etc/mrglobal.conf
+  when:
+    - nic_traffic_mirror is not defined
+    - tsg_access_type == 5
+
+- name: "update mrtunnat.conf.adc_inline"
+  template:
+    src: "{{ role_path }}/templates/adc_inline/mrtunnat.conf.adc_inline.j2"
    dest: /opt/mrzcpd/etc/mrtunnat.conf
  when: 
    - nic_traffic_mirror is not defined
    - tsg_access_type == 1
+    - tsg_running_type == 2 
+
+- name: "update mrtunnat.conf.server_inline"
+  template:
+    src: "{{ role_path }}/templates/server_inline/mrtunnat.conf.server_inline.j2"
+    dest: /opt/mrzcpd/etc/mrtunnat.conf
+  when: 
+    - nic_traffic_mirror is not defined
+    - tsg_access_type == 1
+    - tsg_running_type != 2 

 - name: "update mrtunnat.conf.allot_access - mcn0"
  template:
@@ -85,14 +113,22 @@
    - nic_traffic_mirror is not defined
    - tsg_access_type == 3

- name: "update mrtunnat.conf.ATCA_40G - mcn0"
+- name: "update mrtunnat.conf.ATCA_Vlan_Flipping"
  template:
-    src: "{{ role_path }}/templates/ATCA_40G/mrtunnat.conf.ATCA_40G.j2"
+    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrtunnat.conf.ATCA_Vlan_Flipping.j2"
    dest: /opt/mrzcpd/etc/mrtunnat.conf
  when: 
    - nic_traffic_mirror is not defined
    - tsg_access_type == 4

+- name: "update mrtunnat.conf.ATCA_VXLAN"
+  template:
+    src: "{{ role_path }}/templates/ATCA_VXLAN/mrtunnat.conf.ATCA_VXLAN.j2"
+    dest: /opt/mrzcpd/etc/mrtunnat.conf
+  when:
+    - nic_traffic_mirror is not defined
+    - tsg_access_type == 5
+
 - name: "enable mrenv"
  systemd:
    name: mrenv
@@ -124,3 +160,20 @@
    enabled: no
    daemon_reload: yes
  when: nic_traffic_mirror is defined
+
+
+- name: "mask mrzcpd on server_tun_mode"
+  systemd:
+    name: mrzcpd
+    enabled: no
+    masked: yes
+  when: 
+    - tsg_access_type == 0
+
+- name: "mask mrtunnat on server_tun_mode"
+  systemd:
+    name: mrtunnat
+    enabled: no
+    masked: yes
+  when: 
+    - tsg_access_type == 0
--- a/roles/mrzcpd/templates/ATCA_VXLAN/mrglobal.conf.ATCA_VXLAN.j2
+++ b/roles/mrzcpd/templates/ATCA_VXLAN/mrglobal.conf.ATCA_VXLAN.j2
@@ -0,0 +1,57 @@
+[device]
+device={{ATCA_data_incoming.vf0_name}},{{ ATCA_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
+sz_tunnel=8192
+sz_buffer=32
+
+[device:{{ATCA_data_incoming.vf0_name}}]
+mtu=4096
+clear_tx_flags=1
+hw_strip_crc=1
+in_addr={{ ATCA_VXLAN.keepalive_ip }}
+in_mask={{ ATCA_VXLAN.keepalive_mask }}
+#rssmode=3
+
+[device:{{ ATCA_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
+sz_tunnel=8192
+sz_buffer=0
+
+[service]
+# lcore id for i/o service, use comma to split
+iocore={{ mrzcpd.iocore }}
+distmode=1
+hashmode=0
+idle_threshold=10000
+
+[eal]
+virtaddr=0x7f40c4a00000
+loglevel=7
+
+[keepalive]
+check_spinlock=0
+
+[ctrlzone]
+ctrlzone0=tunnat,64
+
+[pool]
+create_mode=3
+sz_direct_pktmbuf=4194304
+sz_indirect_pktmbuf=8192
+sz_cache=256
+sz_data=4096
+
+[forward]
+nr_forward_rule=6
+forward_rule_0=pv,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
+forward_rule_1=vp,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
+forward_rule_2=vv,vxlan_fwd,vxlan_user
+forward_rule_3=vv,vxlan_user,vxlan_fwd
+forward_rule_4=pv,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
+forward_rule_5=vp,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
--- a/roles/mrzcpd/templates/ATCA_VXLAN/mrtunnat.conf.ATCA_VXLAN.j2
+++ b/roles/mrzcpd/templates/ATCA_VXLAN/mrtunnat.conf.ATCA_VXLAN.j2
@@ -0,0 +1,20 @@
+[tunnat]
+lcore_id={{ mrtunnat.lcore_id }}
+appsym=tunnat
+phydev={{ATCA_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_link_info_table=1
+use_tuple4_as_sskey=0
+ctrlzone_addr_info_type=2
+idle_threshold=10000
+
+[vlan_flipping]
+enable=0
+c_router_vlan_id_0=1000
+i_router_vlan_id_0=1001
+en_mac_flipping_0=0
--- a/roles/mrzcpd/templates/ATCA_Vlan_Flipping/mrglobal.conf.ATCA_Vlan_Flipping.j2
+++ b/roles/mrzcpd/templates/ATCA_Vlan_Flipping/mrglobal.conf.ATCA_Vlan_Flipping.j2
@@ -1,20 +1,20 @@
 [device]
-device={{nic_data_incoming.vf0_name}},{{ nic_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
+device={{ATCA_data_incoming.vf0_name}},{{ ATCA_data_incoming.vf1_name }},vxlan_user,vxlan_fwd
 sz_tunnel=8192
 sz_buffer=32

-[device:{{nic_data_incoming.vf0_name}}]
+[device:{{ATCA_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 }},{{ VlanFlipping.vlanID_3 }},{{ VlanFlipping.vlanID_4 }}
+vlan-id-allow={{ ATCA_VlanFlipping.vlanID_1 }},{{ ATCA_VlanFlipping.vlanID_2 }},{{ ATCA_VlanFlipping.vlanID_3 }},{{ ATCA_VlanFlipping.vlanID_4 }}
 vlan-pvid=0
 vlan-pvid-mode=2
 hw_strip_crc=1
-rssmode=3
+#rssmode=3

-[device:{{ nic_data_incoming.vf1_name }}]
+[device:{{ ATCA_data_incoming.vf1_name }}]
 mtu=4096
 clear_tx_flags=1
 vlan-filter=1
@@ -52,9 +52,9 @@ sz_data=4096

 [forward]
 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_0=pv,{{ATCA_data_incoming.vf0_name}},{{ATCA_data_incoming.vf0_name}}
+forward_rule_1=vp,{{ATCA_data_incoming.vf0_name}},{{ATCA_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 }}
+forward_rule_4=pv,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
+forward_rule_5=vp,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
--- a/roles/mrzcpd/templates/ATCA_Vlan_Flipping/mrtunnat.conf.ATCA_Vlan_Flipping.j2
+++ b/roles/mrzcpd/templates/ATCA_Vlan_Flipping/mrtunnat.conf.ATCA_Vlan_Flipping.j2
@@ -1,7 +1,7 @@
 [tunnat]
 lcore_id={{ mrtunnat.lcore_id }}
 appsym=tunnat
-phydev={{nic_data_incoming.vf0_name}}
+phydev={{ATCA_data_incoming.vf0_name}}
 virtdev=vxlan_fwd
 nr_max_sessions=524280
 nr_slots=1048576
@@ -15,10 +15,9 @@ idle_threshold=10000

 [vlan_flipping]
 enable=1
-c_router_vlan_id_0={{ VlanFlipping.vlanID_1 }}
-i_router_vlan_id_0={{ VlanFlipping.vlanID_2 }}
+c_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_1 }}
+i_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_2 }}
 en_mac_flipping_0=0
-en_mac_flipping_0=0
-c_router_vlan_id_1={{ VlanFlipping.vlanID_3 }}
-i_router_vlan_id_1={{ VlanFlipping.vlanID_4 }}
+c_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_3 }}
+i_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_4 }}
 en_mac_flipping_1=0
--- a/roles/mrzcpd/templates/inline_device/mrglobal.conf.inline_device.j2
+++ b/roles/mrzcpd/templates/inline_device/mrglobal.conf.inline_device.j2
@@ -4,8 +4,8 @@ sz_tunnel=8192
 sz_buffer=0

 [device:{{nic_data_incoming.name}}]
-in_addr={{inline_device_config.ip}}
-in_mask={{inline_device_config.mask}}
+in_addr={{inline_device_config.keepalive_ip}}
+in_mask={{inline_device_config.keepalive_mask}}
 jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
--- a/roles/mrzcpd/templates/inline_device/mrtunnat.conf.inline_device.j2
+++ b/roles/mrzcpd/templates/inline_device/mrtunnat.conf.inline_device.j2
--- a/roles/mrzcpd/templates/mrapp.sapp4.conf
+++ b/roles/mrzcpd/templates/mrapp.sapp4.conf
@@ -0,0 +1,2 @@
+[bpfdump:vxlan_user]
+enable=1
--- a/roles/mrzcpd/templates/server_inline/mrglobal.conf.server_inline.j2
+++ b/roles/mrzcpd/templates/server_inline/mrglobal.conf.server_inline.j2
@@ -0,0 +1,47 @@
+[device]
+device={{inline_device_config.data_incoming}},vxlan_user,vxlan_fwd
+sz_tunnel=8192
+sz_buffer=0
+
+[device:{{inline_device_config.data_incoming}}]
+in_addr={{inline_device_config.keepalive_ip}}
+in_mask={{inline_device_config.keepalive_mask}}
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+
+#[device:]
+#jumbo_frame=1
+#max_rx_pkt_len=15360
+#clear_tx_flags=1
+#promisc=1
+
+[service]
+# lcore id for i/o service, use comma to split
+iocore={{ mrzcpd.iocore }}
+distmode=2
+hashmode=0
+
+[eal]
+virtaddr=0x7f40c4a00000
+loglevel=7
+
+[keepalive]
+check_spinlock=0
+
+[ctrlzone]
+ctrlzone0=tunnat,64
+
+[pool]
+create_mode=3
+sz_direct_pktmbuf=4194304
+sz_indirect_pktmbuf=8192
+sz_cache=256
+sz_data=4096
+
+[forward]
+nr_forward_rule=4
+forward_rule_0=pv,{{inline_device_config.data_incoming}},{{inline_device_config.data_incoming}}
+forward_rule_1=vp,{{inline_device_config.data_incoming}},{{inline_device_config.data_incoming}}
+forward_rule_2=vv,vxlan_fwd,vxlan_user
+forward_rule_3=vv,vxlan_user,vxlan_fwd
--- a/roles/mrzcpd/templates/server_inline/mrtunnat.conf.server_inline.j2
+++ b/roles/mrzcpd/templates/server_inline/mrtunnat.conf.server_inline.j2
@@ -0,0 +1,18 @@
+[tunnat]
+lcore_id={{ mrtunnat.lcore_id }}
+appsym=tunnat
+phydev={{inline_device_config.data_incoming}}
+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
+ctrlzone_addr_info_type=2
+
+[vlan_flipping]
+enable=0
+c_router_vlan_id_0=1000
+i_router_vlan_id_0=1001
+en_mac_flipping_0=0