update new 20.08

deploy.yml

@@ -1,11 +1,15 @@
-- hosts: Functional_Host
+- hosts: adc_mxn
   roles:
-    - framework
+#    - tsg-env-mxn
-    - kernel-ml
 
-- hosts: blade-00
+- hosts: adc_mcn0
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+    - install_config/group_vars/adc_mcn0.yml
   roles:
 #    - tsg-env-mcn0
+    - framework
+    - kernel-ml
     - mrzcpd
     - sapp
     - tsg_master
@@ -17,29 +21,42 @@
     - cert-redis
     - telegraf_statistic
 
-- hosts: blade-01
+- hosts: adc_mcn1
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+    - install_config/group_vars/adc_mcn1.yml
   roles:
 #    - tsg-env-mcn1
+    - framework
+    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: blade-02
+- hosts: adc_mcn2
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+    - install_config/group_vars/adc_mcn2.yml
   roles:
 #    - tsg-env-mcn2
+    - framework
+    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: blade-03
+- hosts: adc_mcn3
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+    - install_config/group_vars/adc_mcn3.yml
   roles:
 #    - tsg-env-mcn3
+    - framework
+    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: blade-mxn
+- hosts: server-as-tun-mode
-  roles:
+  vars_files:
-#    - tsg-env-mxn
+    - install_config/group_vars/server_as_tun_mode.yml
-
-- hosts: pc-as-tun-mode
   roles:
     - kernel-ml
     - framework

install_config/group_vars/adc_global.yml

@@ -0,0 +1,88 @@
+#########################################
+#####1: Inline_device;  2: Allot;  3: ADC_Tun_mode;
+tsg_access_type: 2
+#####2: ADC;
+tsg_running_type: 2
+
+########################################
+#IP Config
+maat_redis_server:
+  address: "192.168.40.168"
+  port: 7002
+  db: 0
+
+dynamic_maat_redis_server:
+  address: "192.168.40.168"
+  port: 7002
+  db: 0
+
+cert_store_server:
+  address: "192.168.100.1"
+  port: 9991
+
+log_kafkabrokers:
+  address: "1.1.1.1:9092,2.2.2.2:9092"
+
+log_minio:
+  address: "192.168.40.168;"
+  port: 9090
+
+#########################################
+#Log Level Config
+#日志等级 10:DEBUG 20:INFO 30:FATAL
+fw_ftp_log_level: 10
+fw_mail_log_level: 10
+fw_http_log_level: 10
+fw_dns_log_level: 10
+fw_quic_log_level: 10
+capture_packet_log_level: 10
+tsg_log_level: 10
+tsg_master_log_level: 10
+kni_log_level: 10
+tfe_log_level: 10
+tfe_http_log_level: 10
+pangu_log_level: 10
+doh_log_level: 10
+certstore_log_level: 10
+
+#######################################
+#Sapp Performance Config
+#Sapp工作在ADC计算板0时，建议使用如下30+8的配置，以保证更高的处理性能
+sapp:
+  worker_threads: 30
+  send_only_threads_max: 8
+  bind_mask: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37
+  inbound_route_dir: 1
+
+########################################
+#Kni Config
+kni:
+  global:
+    tfe_node_count: 3
+  watch_dog:
+    switch: 1
+  maat:
+    readconf_mode: 2
+  send_logger:
+    switch: 1
+  tfe_nodes:
+    tfe0_enabled: 1
+    tfe1_enabled: 1
+    tfe2_enabled: 1
+
+########################################
+#Tfe Config
+tfe:
+  nr_threads: 32
+  mc_cache_eth: lo 
+  keykeeper:
+    no_cache: 0
+
+########################################
+#Marsio Config
+#marsio工作在ADC计算板时，建议使用如下配置，以保证更高的处理性能
+mrzcpd:
+  iocore: 44,45,46,47
+
+mrtunnat:
+  lcore_id: 40,41,42,43

install_config/group_vars/adc_mcn0.yml

@@ -0,0 +1,37 @@
+#########################################
+#Mcn0管理口网卡名
+nic_mgr:
+  name: enp6s0
+
+#########################################
+#Mcn0流量接入网卡，固定配置
+nic_data_incoming:
+  name: ens1f4
+
+#########################################
+#Mcn0其他数据口网卡名配置，固定配置
+nic_inner_ctrl:
+  name: ens1.100
+nic_to_tfe:
+  tfe0:
+      name: ens1f5
+  tfe1:
+      name: ens1f6
+  tfe2:
+      name: ens1f7
+
+#########################################
+#串联设备接入相关配置
+inline_device_config:
+  ip: 192.168.1.30
+  mask: 255.255.255.252
+
+#########################################
+#Allot接入相关配置
+AllotAccess:
+  virturlInterface_1: ens1f2.103
+  virturlInterface_2: ens1f2.104
+  virturlID_1: 103
+  virturlID_2: 104
+  vvipv4_mask: 24
+  vvipv6_mask: 64

install_config/group_vars/adc_mcn1.yml

@@ -0,0 +1,17 @@
+#########################################
+#Mcn1管理口网卡名
+nic_mgr:
+  name: enp6s0
+
+#########################################
+#Mcn1流量接入网卡，固定配置
+nic_data_incoming:
+  name: ens1f1
+
+#########################################
+#Mcn1其他数据口网卡名配置，固定配置
+nic_inner_ctrl:
+  name: ens1.100
+nic_traffic_mirror:
+  name: ens1f2
+  use_mrzcpd: 1

install_config/group_vars/adc_mcn2.yml

@@ -0,0 +1,17 @@
+#########################################
+#Mcn2管理口网卡名
+nic_mgr:
+  name: enp6s0
+
+#########################################
+#Mcn2流量接入网卡，固定配置
+nic_data_incoming:
+  name: ens8f1
+
+#########################################
+#Mcn2其他数据口网卡名配置，固定配置
+nic_inner_ctrl:
+  name: ens8.100
+nic_traffic_mirror:
+  name: ens8f2
+  use_mrzcpd: 1

install_config/group_vars/adc_mcn3.yml

@@ -0,0 +1,17 @@
+#########################################
+#Mcn3管理口网卡名
+nic_mgr:
+  name: enp6s0
+
+#########################################
+#Mcn3流量接入网卡，固定配置
+nic_data_incoming:
+  name: ens8f1
+
+#########################################
+#Mcn3其他数据口网卡名配置，固定配置
+nic_inner_ctrl:
+  name: ens8.100
+nic_traffic_mirror:
+  name: ens8f2
+  use_mrzcpd: 1

install_config/group_vars/all.yml

@@ -1,101 +0,0 @@
-#########################################
-#####0: Pcap; 1: Inline_device;  2: Allot;  3: ADC_Tun_mode;  4: ATCA;
-tsg_access_type: 4
-
-#####0: Tun_mode;  1: normal; 2: ADC;
-tsg_running_type: 1 
-
-#Common combination mode:
-#1:Server or PC tun mode:      0 + 0
-#2:Server with Inline device:  1 + 1
-#3:ADC with Inline device:     1 + 2
-#4:ADC with Allot:             2 + 2
-#5:ADC tun mode:               3 + 1
-#6:ATCA:                       4 + 1
-
-########################################
-maat_redis_server:
-  address: "192.168.40.168"
-  port: 7002
-  db: 0
-
-dynamic_maat_redis_server:
-  address: "192.168.40.168"
-  port: 7002
-  db: 0
-
-cert_store_server:
-  address: "192.168.100.1"
-  port: 9991
-
-log_kafkabrokers:
-  address: "1.1.1.1:9092,2.2.2.2:9092"
-
-log_minio:
-  address: "192.168.40.168;"
-  port: 9090
-
-fs_remote:
-  switch: 1
-  address: "192.168.100.1"
-  port: 58125
-  
-########################################
-sapp:
-  worker_threads: 16
-  send_only_threads_max: 8
-  bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
-  inbound_route_dir: 1
-
-########################################
-kni:
-  global:
-    log_level: 30
-    tfe_node_count: 3
-  watch_dog:
-    switch: 1
-  maat:
-    readconf_mode: 2
-  send_logger:
-    switch: 1
-  tfe_nodes:
-    tfe0_enabled: 1
-    tfe1_enabled: 1
-    tfe2_enabled: 1
-
-########################################
-tfe:
-  nr_threads: 32
-  mc_cache_eth: lo 
-  keykeeper:
-    no_cache: 0
-
-########################################
-mrzcpd:
-  iocore: 39
-
-mrtunnat:
-  lcore_id: 38
-
-#############ATCA config################
-nic_data_incoming:
-  ethname: enp1s0
-  vf0_name: enp1s2
-  vf1_name: enp1s2f1
-  vf2_name: enp1s2f2
-
-VlanFlipping:
-  vlanID_1: 100
-  vlanID_2: 101
-  vlanID_3: 103
-  vlanID_4: 104
-
-#############Server or PC tun mode######
-server:
-  ethname: eth0
-  tun_name: eth0.100
-  internal_interface: "eth2"
-  external_interface: "eth3"
-
-
-

install_config/group_vars/blade-00.yml

@@ -1,23 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f4
-    ip: 192.168.1.30
-    mask: 255.255.255.252
-nic_inner_ctrl:
-    name: ens1.100
-nic_to_tfe:
-    tfe0:
-        name: ens1f5
-    tfe1:
-        name: ens1f6
-    tfe2:
-        name: ens1f7
-
-AllotAccess:
-    virturlInterface_1: ens1f2.103
-    virturlInterface_2: ens1f2.104
-    virturlID_1: 103
-    virturlID_2: 104
-    vvipv4_mask: 24
-    vvipv6_mask: 64

install_config/group_vars/blade-01.yml

@@ -1,11 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens1f1
-    mac: AA:BB:CC:DD:EE:FF
-    address: 127.0.0.1
-nic_inner_ctrl:
-    name: ens1.100
-nic_traffic_mirror:
-    name: ens1f2
-    use_mrzcpd: 1

install_config/group_vars/blade-02.yml

@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1

install_config/group_vars/blade-03.yml

@@ -1,10 +0,0 @@
-nic_mgr:
-    name: enp6s0
-nic_data_incoming:
-    name: ens8f1
-    mac: AA:BB:CC:DD:EE:FF
-nic_inner_ctrl:
-    name: ens8.100
-nic_traffic_mirror:
-    name: ens8f2
-    use_mrzcpd: 1

install_config/group_vars/server_as_tun_mode.yml

@@ -0,0 +1,123 @@
+#########################################
+#####0: Pcap;  1: Inline_device;  4: ATCA;
+tsg_access_type: 0
+#####0: Tun_mode;  1: normal;
+tsg_running_type: 0
+
+########################################
+#Server Basic Config
+nic_mgr:
+  name: eth0
+
+nic_inner_ctrl:
+  name: eth0.100
+
+#########################################
+#IP Config
+maat_redis_server:
+  address: "192.168.40.168"
+  port: 7002
+  db: 0
+
+dynamic_maat_redis_server:
+  address: "192.168.40.168"
+  port: 7002
+  db: 0
+
+cert_store_server:
+  address: "192.168.100.1"
+  port: 9991
+
+log_kafkabrokers:
+  address: "1.1.1.1:9092,2.2.2.2:9092"
+
+log_minio:
+  address: "192.168.40.168;"
+  port: 9090
+
+#########################################
+#Log Level Config
+#日志等级 10:DEBUG 20:INFO 30:FATAL
+fw_ftp_log_level: 10
+fw_mail_log_level: 10
+fw_http_log_level: 10
+fw_dns_log_level: 10
+fw_quic_log_level: 10
+capture_packet_log_level: 10
+tsg_log_level: 10
+tsg_master_log_level: 10
+kni_log_level: 10
+tfe_log_level: 10
+tfe_http_log_level: 10
+pangu_log_level: 10
+doh_log_level: 10
+certstore_log_level: 10
+
+#########################################
+#Sapp Performance Config
+#如果tsg_access_type=0，sapp跑在pcap模式，则以下配置可忽略
+sapp:
+  worker_threads: 16
+  send_only_threads_max: 8
+  bind_mask: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+  inbound_route_dir: 1
+
+#########################################
+#Sapp Double-Arm Config
+packet_io:
+  internal_interface: eth2
+  external_interface: eth3
+
+
+#########################################
+#Kni Config
+kni:
+  global:
+    tfe_node_count: 1
+  watch_dog:
+    switch: 1
+  maat:
+    readconf_mode: 2
+  send_logger:
+    switch: 1
+  tfe_nodes:
+    tfe0_enabled: 1
+    tfe1_enabled: 0
+    tfe2_enabled: 0
+
+#########################################
+#Tfe Config
+tfe:
+  nr_threads: 32
+  mc_cache_eth: lo 
+  keykeeper:
+    no_cache: 0
+
+#########################################
+#Marsio Config
+mrzcpd:
+  iocore: 39
+
+mrtunnat:
+  lcore_id: 38
+
+#########################################
+#ATCA Config
+#下列配置只在tsg_access_type=4时生效
+nic_data_incoming:
+  ethname: enp1s0
+  vf0_name: enp1s2
+  vf1_name: enp1s2f1
+  vf2_name: enp1s2f2
+
+VlanFlipping:
+  vlanID_1: 100
+  vlanID_2: 101
+  vlanID_3: 103
+  vlanID_4: 104
+
+#########################################
+#Inline Device Config
+inline_device_config:
+  ip: 192.168.1.30
+  mask: 255.255.255.252

install_config/hosts

@@ -2,25 +2,16 @@
 ansible_user=root
 package_source=local
 
-[pc-as-tun-mode]
+[server-as-tun-mode]
 
-[blade-mxn]
+[adc_mxn]
-1.1.1.1 device_id=1
 
-[blade-00]
+[adc_mcn0]
-1.1.1.1 device_id=1 vvipv4_1= vvipv4_2= vvipv6_1= vvipv6_2=
 
-[blade-01]
+[adc_mcn1]
-1.1.1.1 device_id=1
 
-[blade-02]
+[adc_mcn2]
-1.1.1.1 device_id=1
+
+[adc_mcn3]
 
-[blade-03]
-1.1.1.1 device_id=1
 
-[Functional_Host:children]
-blade-00
-blade-01
-blade-02
-blade-03

roles/certstore/templates/cert_store.ini.j2

@@ -2,7 +2,7 @@
 #1:print on screen, 0:don't
 DEBUG_SWITCH = 1
 #10:DEBUG, 20:INFO, 30:FATAL
-RUN_LOG_LEVEL = 10
+RUN_LOG_LEVEL = {{ certstore_log_level }}
 RUN_LOG_PATH = ./logs
 [CONFIG]
 #Number of running threads

roles/clotho/templates/clotho.conf.j2

@@ -2,10 +2,6 @@
 BROKER_LIST={{ log_kafkabrokers.address }}
 
 [SYSTEM]
-{% if tsg_running_type == 0 or 1 %}
-NIC_NAME={{ server.ethname }}
-{% else %}
 NIC_NAME={{ nic_mgr.name }}
-{% endif %}
 LOG_LEVEL=10
 LOG_PATH=log/clotho

roles/firewall/templates/capture_packet_plug.conf.j2

@@ -15,15 +15,11 @@ INC_CFG_DIR=capture_packet_rule/inc/index/
 FULL_CFG_DIR=capture_packet_rule/full/index/
 
 [LOG]
-{% if tsg_running_type == 0 or 1 %}
-NIC_NAME={{ server.ethname }}
-{% else %}
 NIC_NAME={{ nic_mgr.name }}
-{% endif %}
 BROKER_LIST={{ log_kafkabrokers.address }}
 FIELD_FILE=conf/capture_packet_log_field.conf
 
 [SYSTEM]
-LOG_LEVEL=10
+LOG_LEVEL={{ capture_packet_log_level }}
 LOG_PATH=./tsglog/capture_packet_plug/capture_packet
 

roles/firewall/templates/main.conf.j2

@@ -1,20 +1,24 @@
 [FTP_PLUG]
 LOG_PATH=./tsglog/fw_ftp_plug/fw_ftp_plug
-LOG_LEVEL=10
+LOG_LEVEL={{ fw_ftp_log_level }}
 TIMEOUT=600
 
 [MAIL_PLUG]
 LOG_PATH=./tsglog/fw_mail_plug/fw_mail_plug
-LOG_LEVEL=10
+LOG_LEVEL={{ fw_mail_log_level }}
 TIMEOUT=600
 
 [HTTP_PLUG]
 LOG_PATH=./tsglog/fw_http_plug/fw_http_plug
-LOG_LEVEL=10
+LOG_LEVEL={{ fw_http_log_level }}
 
 [DNS_PLUG]
 LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug
-LOG_LEVEL=10
+LOG_LEVEL={{ fw_dns_log_level }}
+
+[QUIC_PLUG]
+LOG_PATH=./tsglog/fw_quic_plug/fw_quic_plug
+LOG_LEVEL={{ fw_quic_log_level }}
 
 [MAAT]
 PROFILE=./tsgconf/maat.conf
@@ -24,32 +28,28 @@ IP_ADDR_TABLE=TSG_SECURITY_ADDR
 
 [TSG_LOG]
 MODE=1
-{% if tsg_running_type == 0 or 1 %}
-NIC_NAME={{ server.ethname }}
-{% else %}
 NIC_NAME={{ nic_mgr.name }}
-{% endif %}
 MAX_SERVICE=1
-LOG_LEVEL=10
+LOG_LEVEL={{ tsg_log_level }}
 LOG_PATH=./tsglog/tsglog
 BROKER_LIST={{ log_kafkabrokers.address }}
 COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf
 
 [STATISTIC]
-CYCLE=1
+CYCLE=5
 TELEGRAF_PORT=8100
 TELEGRAF_IP=127.0.0.1
 OUTPUT_PATH=./tsg_statistic.log
 APP_NAME=statistic
 
 [FIELD_STAT]
-CYCLE=3
+CYCLE=5
-TELEGRAF_PORT=8125
+TELEGRAF_PORT=8100
 TELEGRAF_IP=127.0.0.1
 OUTPUT_PATH=./tsg_stat.log
 APP_NAME=tsg_master
 
 [SYSTEM]
-LOG_LEVEL=10
+LOG_LEVEL={{ tsg_master_log_level }}
 LOG_PATH=./tsglog/tsg_master
 POLICY_PRIORITY_LABEL=POLICY_PRIORITY

roles/kernel-ml/tasks/main.yml

@@ -7,6 +7,9 @@
 - name: "install kernels-ml"
   yum:
     name:
+      - /tmp/ansible_deploy/pkgconfig-0.27.1-4.el7.x86_64.rpm
+      - /tmp/ansible_deploy/zlib-devel-1.2.7-17.el7.x86_64.rpm
+      - /tmp/ansible_deploy/elfutils-libelf-devel-0.168-8.el7.x86_64.rpm
       - /tmp/ansible_deploy/kernel/kernel-ml-5.1.8-1.el7.elrepo.x86_64.rpm
       - /tmp/ansible_deploy/kernel/kernel-ml-devel-5.1.8-1.el7.elrepo.x86_64.rpm
       - /tmp/ansible_deploy/dkms-2.7.1-1.el7.noarch.rpm

roles/kni/templates/kni.conf.j2

@@ -1,12 +1,8 @@
 [global]
 log_path = ./log/kni/kni.log
-log_level = {{ kni.global.log_level }}
+log_level = {{ kni_log_level }}
 tfe_node_count = {{ kni.global.tfe_node_count }}
-{% if tsg_running_type == 0 or 1 %}
-manage_eth = {{ server.ethname }}
-{% else %}
 manage_eth = {{ nic_mgr.name }}
-{% endif %}
 {% if tsg_running_type == 0 %}
 deploy_mode = tun
 {% else %}
@@ -38,20 +34,12 @@ ip_addr = 192.168.100.4
 {% endif %}
 
 [tfe_cmsg_receiver]
-{% if tsg_running_type == 0 or 1%}
-listen_eth = {{ server.tun_name }}
-{% else %}
 listen_eth = {{ nic_inner_ctrl.name }}
-{% endif %}
 listen_port = 2475
 
 [watch_dog]
 switch = {{ kni.watch_dog.switch }}
-{% if tsg_running_type == 0 or 1 %}
-listen_eth = {{ server.tun_name }}
-{% else %}
 listen_eth = {{ nic_inner_ctrl.name }}
-{% endif %}
 listen_port = 2476
 keepalive_idle = 2
 keepalive_intvl = 1
@@ -87,9 +75,9 @@ mho_expire_time = 0
 mho_eliminate_type = LRU
 
 [field_stat]
-remote_switch = {{ fs_remote.switch }}
+remote_switch = 1
-remote_ip = {{ fs_remote.address }}
+remote_ip = 127.0.0.1
-remote_port = {{ fs_remote.port }}
+remote_port = 8100
 local_path = ./fs2_kni.status
 stat_cycle = 1
 print_mode = 1

roles/mrzcpd/tasks/main.yml

@@ -14,80 +14,80 @@
     src: "{{ role_path }}/templates/mrzcpd.j2"
     dest: /etc/sysconfig/mrzcpd
 
-- name: "update mrglobal.conf - slave blade"
+- name: "update mrglobal.conf - traffic_mirror"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2"
+    src: "{{ role_path }}/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: nic_traffic_mirror is defined
 
 
-- name: "update mrglobal.conf.tun_mode - tun_server"
+#- name: "update mrglobal.conf.tun_mode - tun_server"
-  template:
+#  template:
-    src: "{{ role_path }}/templates/mrglobal.conf.tun_mode.j2"
+#    src: "{{ role_path }}/templates//mrglobal.conf.tun_mode.j2"
-    dest: /opt/mrzcpd/etc/mrglobal.conf
+#    dest: /opt/mrzcpd/etc/mrglobal.conf
-  when: 
+#  when: 
-    - tsg_access_type == 0
+#    - tsg_access_type == 0
 
-- name: "update mrglobal.conf.inline - blade00"
+- name: "update mrglobal.conf.inline - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.inline.j2"
+    src: "{{ role_path }}/templates/inline_device/mrglobal.conf.inline_device.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 1
 
-- name: "update mrglobal.conf.allot - blade00"
+- name: "update mrglobal.conf.allot - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.allot_access.j2"
+    src: "{{ role_path }}/templates/allot_access/mrglobal.conf.allot_access.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 2
 
-- name: "update mrglobal.conf.allot - blade00"
+- name: "update mrglobal.conf.adc_tun_mode - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.adc_tun_mode.j2"
+    src: "{{ role_path }}/templates/adc_tun_mode/mrglobal.conf.adc_tun_mode.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 3
 
 
-- name: "update mrglobal.conf.ATCA_40G - blade00"
+- name: "update mrglobal.conf.ATCA_40G - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrglobal.conf.ATCA_40G.j2"
+    src: "{{ role_path }}/templates/ATCA_40G/mrglobal.conf.ATCA_40G.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 4   
 
-- name: "update mrtunnat.conf.inline - blade00"
+- name: "update mrtunnat.conf.inline - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrtunnat.conf.inline.j2"
+    src: "{{ role_path }}/templates/inline_device/mrtunnat.conf.inline_device.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 1
 
-- name: "update mrtunnat.conf.allot_access - blade00"
+- name: "update mrtunnat.conf.allot_access - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrtunnat.conf.allot_access.j2"
+    src: "{{ role_path }}/templates/allot_access/mrtunnat.conf.allot_access.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 2
 
-- name: "update mrtunnat.conf.allot_access - blade00"
+- name: "update mrtunnat.conf.adc_tun_mode - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrtunnat.conf.adc_tun_mode.j2"
+    src: "{{ role_path }}/templates/adc_tun_mode/mrtunnat.conf.adc_tun_mode.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined
     - tsg_access_type == 3
 
-- name: "update mrtunnat.conf.ATCA_40G - blade00"
+- name: "update mrtunnat.conf.ATCA_40G - mcn0"
   template:
-    src: "{{ role_path }}/templates/mrtunnat.conf.ATCA_40G.j2"
+    src: "{{ role_path }}/templates/ATCA_40G/mrtunnat.conf.ATCA_40G.j2"
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined

roles/mrzcpd/templates/ATCA_40G/mrglobal.conf.ATCA_40G.j2

@@ -12,6 +12,7 @@ vlan-id-allow={{ VlanFlipping.vlanID_1 }},{{ VlanFlipping.vlanID_2 }},{{ VlanFli
 vlan-pvid=0
 vlan-pvid-mode=2
 hw_strip_crc=1
+rssmode=3
 
 [device:{{ nic_data_incoming.vf1_name }}]
 mtu=4096
@@ -28,7 +29,7 @@ sz_buffer=0
 [service]
 # lcore id for i/o service, use comma to split
 iocore={{ mrzcpd.iocore }}
-distmode=2
+distmode=1
 hashmode=0
 idle_threshold=10000
 

roles/mrzcpd/templates/adc_tun_mode/mrglobal.conf.adc_tun_mode.j2

@@ -8,9 +8,10 @@ jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
 vlan-filter=1
-vlan-id-allow=1000,1001,2000,2001,4000,4001
+vlan-id-allow=1000,1001,2000,2001
-#vlan-pvid=0
+vlan-pvid=0
-#vlan-pvid-mode=0
+vlan-pvid-mode=2
+promisc=1
 
 [device:{{nic_to_tfe.tfe0.name}}]
 jumbo_frame=1

roles/mrzcpd/templates/adc_tun_mode/mrtunnat.conf.adc_tun_mode.j2

@@ -13,12 +13,9 @@ ctrlzone_addr_info_type=2
 
 [vlan_flipping]
 enable=1
-c_router_vlan_id_0=4000
+c_router_vlan_id_0=1000
-i_router_vlan_id_0=4001
+i_router_vlan_id_0=1001
 en_mac_flipping_0=0
-c_router_vlan_id_1=1000
+c_router_vlan_id_1=2000
-i_router_vlan_id_1=1001
+i_router_vlan_id_1=2001
 en_mac_flipping_1=0
-c_router_vlan_id_2=2000
-i_router_vlan_id_2=2001
-en_mac_flipping_2=0

roles/mrzcpd/templates/allot_access/mrglobal.conf.allot_access.j2

@@ -11,6 +11,7 @@ vlan-filter=1
 vlan-id-allow={{ AllotAccess.virturlID_1 }},{{ AllotAccess.virturlID_2 }}
 vlan-pvid=0
 vlan-pvid-mode=2
+promisc=1
 
 [device:ens1f5]
 jumbo_frame=1

roles/mrzcpd/templates/inline_device/mrglobal.conf.inline_device.j2

@@ -4,16 +4,13 @@ sz_tunnel=8192
 sz_buffer=0
 
 [device:{{nic_data_incoming.name}}]
-in_addr={{nic_data_incoming.ip}}
+in_addr={{inline_device_config.ip}}
-in_mask={{nic_data_incoming.mask}}
+in_mask={{inline_device_config.mask}}
-gateway={{nic_data_incoming.gw}}
 jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
-#vlan-filter=1
+vlan-filter=1
-#vlan-id-allow=1301,1302,2301,2302,1501,1502,2501,2502,1601,1602,2601,2602,1701,1702,2701,2702,1801,1802,2801,2802,1901,1902,2901,2902
+vlan-id-allow=1000,1001
-#vlan-pvid=0
-#vlan-pvid-mode=0
 
 [device:{{nic_to_tfe.tfe0.name}}]
 jumbo_frame=1

roles/mrzcpd/templates/inline_device/mrtunnat.conf.inline_device.j2

@@ -0,0 +1,18 @@
+[tunnat]
+lcore_id={{ mrtunnat.lcore_id }}
+appsym=tunnat
+phydev={{nic_data_incoming.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
+ctrlzone_addr_info_type=2
+
+[vlan_flipping]
+enable=1
+c_router_vlan_id_0=1000
+i_router_vlan_id_0=1001
+en_mac_flipping_0=0

roles/mrzcpd/templates/mrglobal.conf.server_inline.j2

@@ -1,70 +0,0 @@
-[device]
-device={{nic_data_incoming.name}},{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe2.name}},vxlan_user,vxlan_fwd
-sz_tunnel=8192
-sz_buffer=0
-
-[device:{{nic_data_incoming.name}}]
-in_addr={{nic_data_incoming.ip}}
-in_mask={{nic_data_incoming.mask}}
-gateway={{nic_data_incoming.gw}}
-jumbo_frame=1
-max_rx_pkt_len=15360
-clear_tx_flags=1
-#vlan-filter=1
-#vlan-id-allow=1301,1302,2301,2302,1501,1502,2501,2502,1601,1602,2601,2602,1701,1702,2701,2702,1801,1802,2801,2802,1901,1902,2901,2902
-#vlan-pvid=0
-#vlan-pvid-mode=0
-
-[device:{{nic_to_tfe.tfe0.name}}]
-jumbo_frame=1
-max_rx_pkt_len=15360
-clear_tx_flags=1
-promisc=1
-
-[device:{{nic_to_tfe.tfe1.name}}]
-jumbo_frame=1
-max_rx_pkt_len=15360
-clear_tx_flags=1
-promisc=1
-
-[device:{{nic_to_tfe.tfe2.name}}]
-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=10
-forward_rule_0=pv,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
-forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
-forward_rule_2=vv,vxlan_fwd,vxlan_user
-forward_rule_3=vv,vxlan_user,vxlan_fwd
-forward_rule_4=pv,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
-forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
-forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
-forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
-forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
-forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}

roles/mrzcpd/templates/mrglobal.conf.tun_mode.j2

@@ -1,28 +0,0 @@
-[device]
-device=fake
-sz_tunnel=8192
-sz_buffer=0
-
-[device:lo]
-jumbo_frame=1
-max_rx_pkt_len=15360
-clear_tx_flags=1
-promisc=1
-
-[service]
-iocore={{ mrzcpd.iocore }}
-
-[eal]
-virtaddr=0x7d0000000000
-loglevel=7
-
-[keepalive]
-check_spinlock=1
-
-[pool]
-create_mode=3
-sz_direct_pktmbuf=4194304
-sz_indirect_pktmbuf=8192
-sz_cache=256
-sz_data=4096
-

roles/mrzcpd/templates/mrtunnat.conf.inline.j2

@@ -1,31 +0,0 @@
-[tunnat]
-lcore_id={{ mrtunnat.lcore_id }}
-appsym=tunnat
-phydev={{nic_data_incoming.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
-ctrlzone_addr_info_type=2
-
-[vlan_flipping]
-enable=1
-c_router_vlan_id_0=3811
-i_router_vlan_id_0=3812
-c_router_vlan_id_1=3813
-i_router_vlan_id_1=3814
-c_router_vlan_id_2=3821
-i_router_vlan_id_2=3822
-c_router_vlan_id_3=3823
-i_router_vlan_id_3=3824
-c_router_vlan_id_4=3831
-i_router_vlan_id_4=3832
-c_router_vlan_id_5=3833
-i_router_vlan_id_5=3834
-c_router_vlan_id_6=3841
-i_router_vlan_id_6=3842
-c_router_vlan_id_7=3843
-i_router_vlan_id_7=3844

roles/sapp/templates/gdev.conf.j2

@@ -1,5 +1,5 @@
 [Module]
 pcapdevice={{ nic_data_incoming.name }}
 sendto_gdev_card={{ nic_data_incoming.name }}
-sendto_gdev_ip={{ nic_data_incoming.ip }}
+sendto_gdev_ip={{ inline_device_config.ip }}
 gdev_status_switch=1

roles/sapp/templates/sapp.toml.j2

@@ -47,7 +47,7 @@ BSD_packet_filter=""
     [packet_io.internal.interface]
     {% if tsg_access_type == 0 %}
     type=pcap
-    name={{server.internal_interface}}
+    name={{packet_io.internal_interface}}
     {% else %}
     type=marsio
     name=vxlan_user
@@ -56,7 +56,7 @@ BSD_packet_filter=""
     [packet_io.external.interface]
     {% if tsg_access_type == 0 %}
     type=pcap
-    name={{server.external_interface}}
+    name={{packet_io.external_interface}}
     {% else %}
     type=pcap
     name=lo
@@ -108,8 +108,8 @@ BSD_packet_filter=""
      
         [profiling.log.remote]
         enabled=1
-        server_ip={{ fs_remote.address }}
+        server_ip=127.0.0.1
-        server_port={{ fs_remote.port }}
+        server_port=8100
 
         [profiling.log.remote.field_stat2]
 ### note, is valid when "remote_send_out_type=field_stat2"	 

roles/tfe/templates/doh.conf.j2

@@ -7,7 +7,7 @@ enable=1
 # RLOG_LV_DEBUG : 10
 # RLOG_LV_INFO  : 20
 # RLOG_LV_FATAL : 30
-log_level=10
+log_level={{ doh_log_level }}
 
 [maat]
 # default TSG_OBJ_APP_ID

roles/tfe/templates/future.conf.j2

@@ -1,5 +1,5 @@
 [STAT]
 no_stats=0
-statsd_server={{ fs_remote.address }}
+statsd_server=127.0.0.1
-statsd_port={{ fs_remote.port }}
+statsd_port=8100
 histogram_bins=0.50,0.80,0.9,0.95

roles/tfe/templates/pangu_pxy.conf.j2

@@ -1,7 +1,9 @@
 [debug]
-log_level=10
+log_level={{ pangu_log_level }}
 
 [log]
+# default 1, if enable "en_sendlog", the iterm "tfe.conf [kafka] enable" must set 1
+en_sendlog=1
 entrance_id=0
 
 #Addresses of minio. Format is defined by WiredLB.

roles/tfe/templates/tfe-env-config.j2

@@ -1,5 +1,5 @@
 {% if tsg_access_type == 4 %}
-TFE_DEVICE_DATA_INCOMING={ nic_data_incoming.vf2_name }}
+TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.vf2_name }}
 {% elif tsg_running_type == 0 %}
 TFE_DEVICE_DATA_INCOMING=tun_kni
 {% else %}
@@ -14,7 +14,7 @@ TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
 TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
 TFE_PEER_IP_DATA_INCOMING=172.16.241.1
 
-{% if tsg_running_type == 0 or 1 %}
+{% if tsg_running_type == 0 %}
-TFE_WATCHDOG_DEVICE={{ server.tun_name }}
+TFE_WATCHDOG_DEVICE={{ nic_inner_ctrl.name }}
 TFE_WATCHDOG_IP=192.168.100.1
 {% endif %}

roles/tfe/templates/tfe.conf.j2

@@ -32,11 +32,7 @@ service_cache_expire_seconds=600
 # default 0
 mc_cache_enable=1
 # default eth0
-{% if tsg_running_type == 0 or 1 %}
-mc_cache_eth={{ server.tun_name }}
-{% else %}
 mc_cache_eth={{ nic_inner_ctrl.name }}
-{% endif %}
 # default NULL
 mc_cache_broker_list={{ log_kafkabrokers.address }}
 # default PXY-EXCH-INTERMEDIA-CERT
@@ -59,12 +55,14 @@ enable_health_check=1
 passthrough_all_tcp=0
 
 [traffic_mirror]
-{% if tsg_running_type == 0 or 1 %}
+{% if tsg_running_type == 0 %}
 device=lo
+type=0
 {% else %}
 device={{ nic_traffic_mirror.name }}
+type=1
 {% endif %}
-type=0
+
 
 [ratelimit]
 #read_rate=200000
@@ -82,25 +80,21 @@ tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
 [log]
-level=10
+level={{ tfe_log_level }}
 
 [stat]
-statsd_server={{ fs_remote.address }}
+statsd_server=127.0.0.1
-statsd_port={{ fs_remote.port }}
+statsd_port=8100
 statsd_cycle=5
 # FS_OUTPUT_STATSD=1, FS_OUTPUT_INFLUX_LINE=2
 statsd_format=2
 
 [http]
-loglevel=10
+loglevel={{ tfe_http_log_level }}
 
 [kafka]
 enable=1
-{% if tsg_running_type == 0 or 1 %}
-nic_name={{ server.ethname }}
-{% else %}
 nic_name={{ nic_mgr.name }}
-{% endif %}
 kafka_brokerlist={{ log_kafkabrokers.address }}
 kafka_topic=PROXY-EVENT-LOG
 device_id_filepath=/opt/tsg/etc/tsg_sn.json

roles/tsg-env-tun-mode/templates/setup.j2

@@ -1,15 +1,15 @@
 #!/bin/bash
 modprobe 8021q
-vconfig add {{ server.ethname }} 100
+vconfig add {{ nic_mgr.name }} 100
-vconfig set_flag {{ server.ethname }}.100 1 1
+vconfig set_flag {{ nic_mgr.name }}.100 1 1
-ifconfig {{ server.ethname }}.100 192.168.100.1 netmask 255.255.255.0 up
+ifconfig {{ nic_mgr.name }}.100 192.168.100.1 netmask 255.255.255.0 up
 {% if tsg_access_type == 0 %}
-ethtool -K {{ server.internal_interface }} tso off
+ethtool -K {{ packet_io.internal_interface }} tso off
-ethtool -K {{ server.internal_interface }} gso off
+ethtool -K {{ packet_io.internal_interface }} gso off
-ethtool -K {{ server.internal_interface }} gro off
+ethtool -K {{ packet_io.internal_interface }} gro off
-ethtool -K {{ server.external_interface }} tso off
+ethtool -K {{ packet_io.external_interface }} tso off
-ethtool -K {{ server.external_interface }} gso off
+ethtool -K {{ packet_io.external_interface }} gso off
-ethtool -K {{ server.external_interface }} gro off
+ethtool -K {{ packet_io.external_interface }} gro off
 {% elif tsg_access_type == 4 %}
 echo 3 > /sys/class/net/{{ nic_data_incoming.ethname }}/device/sriov_numvfs
 ip link set {{ nic_data_incoming.ethname }} vf 1 vlan 4095

roles/tsg-env-tun-mode/templates/tsg-env_stop.j2

@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-echo 0 >/sys/class/net/{{ server.ethname }}/device/sriov_numvfs
+echo 0 >/sys/class/net/{{ nic_mgr.name }}/device/sriov_numvfs
-ifconfig {{ server.ethname }}.100 down
+ifconfig {{ nic_mgr.name }}.100 down
-vconfig rem {{ server.ethname }}.100
+vconfig rem {{ nic_mgr.name }}.100
 {% if tsg_access_type == 4 %}
 echo 0 >/sys/class/net/{{ nic_data_incoming.ethname }}/device/sriov_numvfs
 {% endif %}