update dpi 20.08.1

deploy.yml

@@ -1,17 +1,11 @@
-- hosts: adc_mxn
-  remote_user: root
+- hosts: Functional_Host
   roles:
-#    - tsg-env-mxn
-
-- hosts: adc_mcn0
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/adc_global.yml
-    - install_config/group_vars/adc_mcn0.yml
-  roles:
-#    - tsg-env-mcn0
     - framework
     - kernel-ml
+
+- hosts: blade-00
+  roles:
+#    - tsg-env-mcn0
     - mrzcpd
     - sapp
     - tsg_master
@@ -22,48 +16,30 @@
     - certstore
     - cert-redis
     - telegraf_statistic
-    - tsg_device_tag
 
-- hosts: adc_mcn1
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/adc_global.yml
-    - install_config/group_vars/adc_mcn1.yml
+- hosts: blade-01
   roles:
 #    - tsg-env-mcn1
-    - framework
-    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: adc_mcn2
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/adc_global.yml
-    - install_config/group_vars/adc_mcn2.yml
+- hosts: blade-02
   roles:
 #    - tsg-env-mcn2
-    - framework
-    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: adc_mcn3
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/adc_global.yml
-    - install_config/group_vars/adc_mcn3.yml
+- hosts: blade-03
   roles:
 #    - tsg-env-mcn3
-    - framework
-    - kernel-ml
     - mrzcpd
     - tfe
 
-- hosts: server-as-tun-mode
-  remote_user: root
-  vars_files:
-    - install_config/group_vars/server_as_tun_mode.yml
+- hosts: blade-mxn
+  roles:
+#    - tsg-env-mxn
+
+- hosts: pc-as-tun-mode
   roles:
     - kernel-ml
     - framework
@@ -80,4 +56,3 @@
     - tfe
     - telegraf_statistic
     - proxy_status
-    - tsg_device_tag

install_config/group_vars/adc_global.yml

@@ -1,89 +0,0 @@
-#########################################
-#####1: Inline_device;  2: Allot;  3: ADC_Tun_mode;
-tsg_access_type: 3
-#####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: 30
-fw_mail_log_level: 30
-fw_http_log_level: 30
-fw_dns_log_level: 30
-fw_quic_log_level: 30
-capture_packet_log_level: 30
-tsg_log_level: 30
-tsg_master_log_level: 30
-kni_log_level: 30
-tfe_log_level: 30
-tfe_http_log_level: 30
-pangu_log_level: 30
-doh_log_level: 30
-certstore_log_level: 30
-clotho_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

@@ -1,37 +0,0 @@
-#########################################
-#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:
-  keepalive_ip: 192.168.1.30
-  keepalive_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

@@ -1,17 +0,0 @@
-#########################################
-#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

@@ -1,17 +0,0 @@
-#########################################
-#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

@@ -1,17 +0,0 @@
-#########################################
-#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

@@ -0,0 +1,101 @@
+#########################################
+#####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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -1,130 +0,0 @@
-#########################################
-#####0: Pcap;  1: Inline_device;  4: ATCA_Vlan_Flipping;  5:ATCA_VXLAN;
-tsg_access_type: 1
-#####0: Tun_mode;  1: normal;
-tsg_running_type: 1
-
-########################################
-#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
-clotho_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时生效
-ATCA_data_incoming:
-  ethname: enp1s0
-  vf0_name: enp1s2
-  vf1_name: enp1s2f1
-  vf2_name: enp1s2f2
-
-ATCA_VlanFlipping:
-  vlanID_1: 100
-  vlanID_2: 101
-  vlanID_3: 103
-  vlanID_4: 104
-
-#下列配置只在tsg_access_type=5时生效
-ATCA_VXLAN:
-  keepalive_ip: "10.254.19.1"
-  keepalive_mask: "255.255.255.252"
-
-#########################################
-#Inline Device Config
-inline_device_config:
-  keepalive_ip: 192.168.1.30
-  keepalive_mask: 255.255.255.252
-  data_incoming: eth5

install_config/hosts

@@ -1,36 +1,26 @@
-###################
-#   For example   #
-###################
-#变量device_id根据设备序号设置即可
-#变量vvipv4_1、vvipv4_2、vvipv6_1、vvipv6_2为Allot相关配置，其他环境可不填或直接删除变量
-#
-#[server-as-tun-mode]
-#1.1.1.1 device_id=device_1
-#
-#[adc_mxn]
-#10.3.72.1
-#10.3.72.2
-#
-#[adc_mcn0]
-#10.3.73.1 device_id=device_1 vvipv4_1=10.3.61.1 vvipv4_2=10.3.62.1 vvipv6_1=fc00::61:1 vvipv6_2=fc00::62:1
-#10.3.73.2 device_id=device_2 vvipv4_1=10.3.61.2 vvipv4_2=10.3.62.2 vvipv6_1=fc00::61:2 vvipv6_2=fc00::62:2
-#
-#[adc_mcn1]
-#10.3.74.1 device_id=device_1
-#10.3.74.2 device_id=device_2
-#
-#[adc_mcn2]
-#10.3.75.1 device_id=device_1
-#10.3.75.2 device_id=device_2
-#
-#[adc_mcn3]
-#10.3.76.1 device_id=device_1
-#10.3.76.2 device_id=device_2
+[all:vars]
+ansible_user=root
+package_source=local
 
-[server-as-tun-mode]
-[adc_mxn]
-[adc_mcn0]
-[adc_mcn1]
-[adc_mcn2]
-[adc_mcn3]
+[pc-as-tun-mode]
 
+[blade-mxn]
+1.1.1.1 device_id=1
+
+[blade-00]
+1.1.1.1 device_id=1 vvipv4_1= vvipv4_2= vvipv6_1= vvipv6_2=
+
+[blade-01]
+1.1.1.1 device_id=1
+
+[blade-02]
+1.1.1.1 device_id=1
+
+[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 = {{ certstore_log_level }}
+RUN_LOG_LEVEL = 10
 RUN_LOG_PATH = ./logs
 [CONFIG]
 #Number of running threads

roles/clotho/templates/clotho.conf.j2

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

roles/firewall/templates/capture_packet_plug.conf.j2

@@ -15,11 +15,15 @@ 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={{ capture_packet_log_level }}
+LOG_LEVEL=10
 LOG_PATH=./tsglog/capture_packet_plug/capture_packet
 

roles/firewall/templates/main.conf.j2

@@ -1,24 +1,20 @@
 [FTP_PLUG]
 LOG_PATH=./tsglog/fw_ftp_plug/fw_ftp_plug
-LOG_LEVEL={{ fw_ftp_log_level }}
+LOG_LEVEL=10
 TIMEOUT=600
 
 [MAIL_PLUG]
 LOG_PATH=./tsglog/fw_mail_plug/fw_mail_plug
-LOG_LEVEL={{ fw_mail_log_level }}
+LOG_LEVEL=10
 TIMEOUT=600
 
 [HTTP_PLUG]
 LOG_PATH=./tsglog/fw_http_plug/fw_http_plug
-LOG_LEVEL={{ fw_http_log_level }}
+LOG_LEVEL=10
 
 [DNS_PLUG]
 LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug
-LOG_LEVEL={{ fw_dns_log_level }}
-
-[QUIC_PLUG]
-LOG_PATH=./tsglog/fw_quic_plug/fw_quic_plug
-LOG_LEVEL={{ fw_quic_log_level }}
+LOG_LEVEL=10
 
 [MAAT]
 PROFILE=./tsgconf/maat.conf
@@ -28,28 +24,32 @@ 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={{ tsg_log_level }}
+LOG_LEVEL=10
 LOG_PATH=./tsglog/tsglog
 BROKER_LIST={{ log_kafkabrokers.address }}
 COMMON_FIELD_FILE=tsgconf/tsg_log_field.conf
 
 [STATISTIC]
-CYCLE=5
+CYCLE=1
 TELEGRAF_PORT=8100
 TELEGRAF_IP=127.0.0.1
 OUTPUT_PATH=./tsg_statistic.log
 APP_NAME=statistic
 
 [FIELD_STAT]
-CYCLE=5
-TELEGRAF_PORT=8100
+CYCLE=3
+TELEGRAF_PORT=8125
 TELEGRAF_IP=127.0.0.1
 OUTPUT_PATH=./tsg_stat.log
 APP_NAME=tsg_master
 
 [SYSTEM]
-LOG_LEVEL={{ tsg_master_log_level }}
+LOG_LEVEL=10
 LOG_PATH=./tsglog/tsg_master
 POLICY_PRIORITY_LABEL=POLICY_PRIORITY

roles/framework/tasks/main.yml

@@ -18,7 +18,7 @@
       - /tmp/ansible_deploy/libWiredLB-2.0.3.c7d131b-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/libcjson-1.7.8.542ad7f-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/libdocumentanalyze-2.0.4.efdfc29-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.0.4.7d6bc27-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.0.3.5931b44-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/librulescan-2.2.0.900d2b3-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libwiredcfg-2.0.2.7ce1eea-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm

roles/kernel-ml/tasks/main.yml

@@ -7,9 +7,6 @@
 - 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
@@ -28,18 +25,12 @@
     - tsg_access_type == 4
     - t_kernel_ml.changed
 
-- name: "BIOS:grub2-mkconfig"
+- name: "grub2-mkconfig"
   shell: grub2-mkconfig -o /boot/grub2/grub.cfg
   when:
     - tsg_access_type == 4
     - t_kernel_ml.changed
 
-- name: "UEFI:grub2-mkconfig"
-  shell: grub2-mkconfig  -o /boot/efi/EFI/centos/grub.cfg
-  when:
-    - tsg_access_type == 4
-    - t_kernel_ml.changed
-
 - name: "reboot"
   reboot:
   when: t_kernel_ml.changed

roles/kni/templates/kni.conf.j2

@@ -1,9 +1,13 @@
 [global]
 log_path = ./log/kni/kni.log
-log_level = {{ kni_log_level }}
+log_level = {{ kni.global.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 }}
-{% if tsg_running_type != 2 %}
+{% endif %}
+{% if tsg_running_type == 0 %}
 deploy_mode = tun
 {% else %}
 deploy_mode = normal
@@ -14,7 +18,7 @@ dst_mac_addr = fe:65:b7:03:50:bd
 {% if tsg_access_type == 4 %}
 [tfe0]
 enabled = 1
-dev_eth_symbol = {{ ATCA_data_incoming.vf1_name }}
+dev_eth_symbol = {{ nic_data_incoming.vf1_name }}
 ip_addr = 192.168.100.1
 {% elif tsg_running_type == 2 %}
 [tfe0]
@@ -34,12 +38,20 @@ 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
@@ -75,9 +87,9 @@ mho_expire_time = 0
 mho_eliminate_type = LRU
 
 [field_stat]
-remote_switch = 1
-remote_ip = 127.0.0.1
-remote_port = 8100
+remote_switch = {{ fs_remote.switch }}
+remote_ip = {{ fs_remote.address }}
+remote_port = {{ fs_remote.port }}
 local_path = ./fs2_kni.status
 stat_cycle = 1
 print_mode = 1

roles/mrzcpd/tasks/main.yml

@@ -14,121 +14,85 @@
     src: "{{ role_path }}/templates/mrzcpd.j2"
     dest: /etc/sysconfig/mrzcpd
 
-- name: "update mrglobal.conf - traffic_mirror"
+- name: "update mrglobal.conf - slave blade"
   template:
-    src: "{{ role_path }}/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2"
+    src: "{{ role_path }}/templates/mrglobal.conf.traffic_mirror.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: nic_traffic_mirror is defined
 
 
-- name: "copy mrapp.sapp4.conf to destination server"
+- name: "update mrglobal.conf.tun_mode - tun_server"
   template:
-    src: "{{ role_path }}/templates/mrapp.sapp4.conf "
-    dest: /opt/mrzcpd/etc/mrapp.sapp4.conf 
+    src: "{{ role_path }}/templates/mrglobal.conf.tun_mode.j2"
+    dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
-    - tsg_access_type == 4
+    - tsg_access_type == 0
 
-- name: "update mrglobal.conf.adc_inline"
+- name: "update mrglobal.conf.inline - blade00"
   template:
-    src: "{{ role_path }}/templates/adc_inline/mrglobal.conf.adc_inline.j2"
+    src: "{{ role_path }}/templates/mrglobal.conf.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"
+- name: "update mrglobal.conf.allot - blade00"
   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:
-    src: "{{ role_path }}/templates/allot_access/mrglobal.conf.allot_access.j2"
+    src: "{{ role_path }}/templates/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.adc_tun_mode - mcn0"
+- name: "update mrglobal.conf.allot - blade00"
   template:
-    src: "{{ role_path }}/templates/adc_tun_mode/mrglobal.conf.adc_tun_mode.j2"
+    src: "{{ role_path }}/templates/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_Vlan_Flipping"
+- name: "update mrglobal.conf.ATCA_40G - blade00"
   template:
-    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrglobal.conf.ATCA_Vlan_Flipping.j2"
+    src: "{{ role_path }}/templates/mrglobal.conf.ATCA_40G.j2"
     dest: /opt/mrzcpd/etc/mrglobal.conf
   when: 
     - nic_traffic_mirror is not defined
-    - tsg_access_type == 4
+    - tsg_access_type == 4   
 
-- name: "update mrglobal.conf.ATCA_VXLAN"
+- name: "update mrtunnat.conf.inline - blade00"
   template:
-    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"
+    src: "{{ role_path }}/templates/mrtunnat.conf.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"
+- name: "update mrtunnat.conf.allot_access - blade00"
   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:
-    src: "{{ role_path }}/templates/allot_access/mrtunnat.conf.allot_access.j2"
+    src: "{{ role_path }}/templates/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.adc_tun_mode - mcn0"
+- name: "update mrtunnat.conf.allot_access - blade00"
   template:
-    src: "{{ role_path }}/templates/adc_tun_mode/mrtunnat.conf.adc_tun_mode.j2"
+    src: "{{ role_path }}/templates/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_Vlan_Flipping"
+- name: "update mrtunnat.conf.ATCA_40G - blade00"
   template:
-    src: "{{ role_path }}/templates/ATCA_Vlan_Flipping/mrtunnat.conf.ATCA_Vlan_Flipping.j2"
+    src: "{{ role_path }}/templates/mrtunnat.conf.ATCA_40G.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
@@ -160,20 +124,3 @@
     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

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

@@ -1,57 +0,0 @@
-[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 }}

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

@@ -1,20 +0,0 @@
-[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

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

@@ -1,18 +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=1000
-i_router_vlan_id_0=1001
-en_mac_flipping_0=0

roles/mrzcpd/templates/mrapp.sapp4.conf

@@ -1,2 +0,0 @@
-[bpfdump:vxlan_user]
-enable=1

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

@@ -1,20 +1,19 @@
 [device]
-device={{ATCA_data_incoming.vf0_name}},{{ ATCA_data_incoming.vf1_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=32
 
-[device:{{ATCA_data_incoming.vf0_name}}]
+[device:{{nic_data_incoming.vf0_name}}]
 mtu=4096
 clear_tx_flags=1
 vlan-filter=1
 vlan-strip=1
-vlan-id-allow={{ ATCA_VlanFlipping.vlanID_1 }},{{ ATCA_VlanFlipping.vlanID_2 }},{{ ATCA_VlanFlipping.vlanID_3 }},{{ ATCA_VlanFlipping.vlanID_4 }}
+vlan-id-allow={{ VlanFlipping.vlanID_1 }},{{ VlanFlipping.vlanID_2 }},{{ VlanFlipping.vlanID_3 }},{{ VlanFlipping.vlanID_4 }}
 vlan-pvid=0
 vlan-pvid-mode=2
 hw_strip_crc=1
-#rssmode=3
 
-[device:{{ ATCA_data_incoming.vf1_name }}]
+[device:{{ nic_data_incoming.vf1_name }}]
 mtu=4096
 clear_tx_flags=1
 vlan-filter=1
@@ -29,7 +28,7 @@ sz_buffer=0
 [service]
 # lcore id for i/o service, use comma to split
 iocore={{ mrzcpd.iocore }}
-distmode=1
+distmode=2
 hashmode=0
 idle_threshold=10000
 
@@ -52,9 +51,9 @@ 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_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,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
-forward_rule_5=vp,{{ ATCA_data_incoming.vf1_name }},{{ ATCA_data_incoming.vf1_name }}
+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 }}

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

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

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

@@ -11,7 +11,6 @@ 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/mrglobal.conf.inline.j2

@@ -4,13 +4,16 @@ sz_tunnel=8192
 sz_buffer=0
 
 [device:{{nic_data_incoming.name}}]
-in_addr={{inline_device_config.keepalive_ip}}
-in_mask={{inline_device_config.keepalive_mask}}
+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=1000,1001
+#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

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

@@ -0,0 +1,70 @@
+[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

@@ -0,0 +1,28 @@
+[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.ATCA_40G.j2

@@ -1,7 +1,7 @@
 [tunnat]
 lcore_id={{ mrtunnat.lcore_id }}
 appsym=tunnat
-phydev={{ATCA_data_incoming.vf0_name}}
+phydev={{nic_data_incoming.vf0_name}}
 virtdev=vxlan_fwd
 nr_max_sessions=524280
 nr_slots=1048576
@@ -15,9 +15,10 @@ idle_threshold=10000
 
 [vlan_flipping]
 enable=1
-c_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_1 }}
-i_router_vlan_id_0={{ ATCA_VlanFlipping.vlanID_2 }}
+c_router_vlan_id_0={{ VlanFlipping.vlanID_1 }}
+i_router_vlan_id_0={{ VlanFlipping.vlanID_2 }}
 en_mac_flipping_0=0
-c_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_3 }}
-i_router_vlan_id_1={{ ATCA_VlanFlipping.vlanID_4 }}
+en_mac_flipping_0=0
+c_router_vlan_id_1={{ VlanFlipping.vlanID_3 }}
+i_router_vlan_id_1={{ VlanFlipping.vlanID_4 }}
 en_mac_flipping_1=0

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

@@ -13,9 +13,12 @@ ctrlzone_addr_info_type=2
 
 [vlan_flipping]
 enable=1
-c_router_vlan_id_0=1000
-i_router_vlan_id_0=1001
+c_router_vlan_id_0=4000
+i_router_vlan_id_0=4001
 en_mac_flipping_0=0
-c_router_vlan_id_1=2000
-i_router_vlan_id_1=2001
+c_router_vlan_id_1=1000
+i_router_vlan_id_1=1001
 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/mrtunnat.conf.inline.j2

@@ -0,0 +1,31 @@
+[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/mrzcpd/templates/server_inline/mrglobal.conf.server_inline.j2

@@ -1,47 +0,0 @@
-[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

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

@@ -1,18 +0,0 @@
-[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

roles/sapp/files/sapp.service

@@ -1,9 +1,7 @@
 [Unit]
 Description=sapp service
-{% if tsg_running_type != 0 %}
 Requires=mrzcpd.service
 After=mrzcpd.service
-{% endif %}
 [Service]
 WorkingDirectory=/home/mesasoft/sapp_run
 ExecStart=/home/mesasoft/sapp_run/sapp

roles/sapp/tasks/main.yml

@@ -7,7 +7,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.0.20.b59c12a-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.1.2.69e7edf-2.el7.x86_64.rpm
     state: present
     skip_broken: yes
 
@@ -41,10 +41,10 @@
   when: tsg_access_type == 1
   
 
-- name: "Template sapp.service destination server"
-  template:
-    src: "{{ role_path }}/templates/sapp.service.j2"
-    dest: /usr/lib/systemd/system/sapp.service
+- name: "copy sapp.service destination server"
+  copy:
+    src: "{{ role_path }}/files/sapp.service"
+    dest: /usr/lib/systemd/system/
     mode: 0755
 
 - name: "enable sapp"

roles/sapp/templates/conflist.inf.j2

@@ -17,7 +17,6 @@
 ./plug/protocol/dns/dns.inf
 ./plug/protocol/mail/mail.inf
 ./plug/protocol/ftp/ftp.inf
-./plug/protocol/quic/quic.inf
 
 [business]
 ./plug/business/kni/kni.inf

roles/sapp/templates/gdev.conf.j2

@@ -1,11 +1,5 @@
 [Module]
-{% if tsg_running_type == 2 %}
 pcapdevice={{ nic_data_incoming.name }}
 sendto_gdev_card={{ nic_data_incoming.name }}
-sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
-{% else %}
-pcapdevice={{ inline_device_config.data_incoming }}
-sendto_gdev_card={{ inline_device_config.data_incoming }}
-sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
-{% endif %}
+sendto_gdev_ip={{ nic_data_incoming.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={{packet_io.internal_interface}}
+    name={{server.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={{packet_io.external_interface}}
+    name={{server.external_interface}}
     {% else %}
     type=pcap
     name=lo
@@ -108,8 +108,8 @@ BSD_packet_filter=""
      
         [profiling.log.remote]
         enabled=1
-        server_ip=127.0.0.1
-        server_port=8100
+        server_ip={{ fs_remote.address }}
+        server_port={{ fs_remote.port }}
 
         [profiling.log.remote.field_stat2]
 ### note, is valid when "remote_send_out_type=field_stat2"	 

roles/telegraf_statistic/templates/telegraf_statistic.conf.j2

@@ -1,6 +1,6 @@
 [global_tags]
 [agent]
-  interval = "5s"
+  interval = "30s"
   round_interval = true
   metric_batch_size = 1000
   metric_buffer_limit = 10000
@@ -17,7 +17,7 @@
     files = ["stdout", "/tmp/metrics.out"]
        data_format = "json"
  [[outputs.kafka]]
-   brokers = ["{{ log_kafkabrokers.address }}"]
+   brokers = ["192.168.40.186:9092"]
    topic = "TRAFFIC-METRICS-LOG"
     data_format = "json"
  [[outputs.prometheus_client]]

roles/tfe/files/tfe.service

@@ -8,7 +8,7 @@ After=tfe-env.service
 Type=notify
 ExecStart=/opt/tsg/tfe/bin/tfe
 WorkingDirectory=/opt/tsg/tfe/
-TimeoutSec=7200s
+TimeoutSec=3600s
 RestartSec=10s
 Restart=always
 LimitNOFILE=524288

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={{ doh_log_level }}
+log_level=10
 
 [maat]
 # default TSG_OBJ_APP_ID

roles/tfe/templates/future.conf.j2

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

roles/tfe/templates/pangu_pxy.conf.j2

@@ -1,9 +1,7 @@
 [debug]
-log_level={{ pangu_log_level }}
+log_level=10
 
 [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,6 +1,6 @@
 {% if tsg_access_type == 4 %}
-TFE_DEVICE_DATA_INCOMING={{ ATCA_data_incoming.vf2_name }}
-{% elif tsg_running_type != 2 %}
+TFE_DEVICE_DATA_INCOMING={ nic_data_incoming.vf2_name }}
+{% elif tsg_running_type == 0 %}
 TFE_DEVICE_DATA_INCOMING=tun_kni
 {% else %}
 TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.name }}
@@ -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 != 2 %}
-TFE_WATCHDOG_DEVICE={{ nic_inner_ctrl.name }}
+{% if tsg_running_type == 0 or 1 %}
+TFE_WATCHDOG_DEVICE={{ server.tun_name }}
 TFE_WATCHDOG_IP=192.168.100.1
 {% endif %}

roles/tfe/templates/tfe.conf.j2

@@ -32,7 +32,11 @@ 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
@@ -55,14 +59,12 @@ enable_health_check=1
 passthrough_all_tcp=0
 
 [traffic_mirror]
-{% if tsg_running_type != 2 %}
+{% if tsg_running_type == 0 or 1 %}
 device=lo
-type=0
 {% else %}
 device={{ nic_traffic_mirror.name }}
-type=1
 {% endif %}
-
+type=0
 
 [ratelimit]
 #read_rate=200000
@@ -80,21 +82,25 @@ tcp_ttl_upstream=75
 tcp_ttl_downstream=70
 
 [log]
-level={{ tfe_log_level }}
+level=10
 
 [stat]
-statsd_server=127.0.0.1
-statsd_port=8100
+statsd_server={{ fs_remote.address }}
+statsd_port={{ fs_remote.port }}
 statsd_cycle=5
 # FS_OUTPUT_STATSD=1, FS_OUTPUT_INFLUX_LINE=2
 statsd_format=2
 
 [http]
-loglevel={{ tfe_http_log_level }}
+loglevel=10
 
 [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,27 +1,27 @@
 #!/bin/bash
 modprobe 8021q
-vconfig add {{ nic_mgr.name }} 100
-vconfig set_flag {{ nic_mgr.name }}.100 1 1
-ifconfig {{ nic_mgr.name }}.100 192.168.100.1 netmask 255.255.255.0 up
+vconfig add {{ server.ethname }} 100
+vconfig set_flag {{ server.ethname }}.100 1 1
+ifconfig {{ server.ethname }}.100 192.168.100.1 netmask 255.255.255.0 up
 {% if tsg_access_type == 0 %}
-ethtool -K {{ packet_io.internal_interface }} tso off
-ethtool -K {{ packet_io.internal_interface }} gso off
-ethtool -K {{ packet_io.internal_interface }} gro off
-ethtool -K {{ packet_io.external_interface }} tso off
-ethtool -K {{ packet_io.external_interface }} gso off
-ethtool -K {{ packet_io.external_interface }} gro off
+ethtool -K {{ server.internal_interface }} tso off
+ethtool -K {{ server.internal_interface }} gso off
+ethtool -K {{ server.internal_interface }} gro off
+ethtool -K {{ server.external_interface }} tso off
+ethtool -K {{ server.external_interface }} gso off
+ethtool -K {{ server.external_interface }} gro off
 {% elif tsg_access_type == 4 %}
-echo 3 > /sys/class/net/{{ ATCA_data_incoming.ethname }}/device/sriov_numvfs
-ip link set {{ ATCA_data_incoming.ethname }} vf 1 vlan 4095
-ip link set {{ ATCA_data_incoming.ethname }} vf 2 vlan 4095
-ip link set {{ ATCA_data_incoming.ethname }} vf 0 trust on
-ip link set {{ ATCA_data_incoming.ethname }} vf 1 trust on
-ip link set {{ ATCA_data_incoming.ethname }} vf 2 trust on
-ip link set {{ ATCA_data_incoming.ethname }} vf 1 mac 00:0e:c6:d6:72:c1
-ip link set {{ ATCA_data_incoming.ethname }} vf 2 mac fe:65:b7:03:50:bd
-ip link set {{ ATCA_data_incoming.ethname }} vf 0 spoofchk off
-ip link set {{ ATCA_data_incoming.vf0_name }} up
-ip link set {{ ATCA_data_incoming.vf1_name }} up
-ip link set {{ ATCA_data_incoming.vf2_name }} up
+echo 3 > /sys/class/net/{{ nic_data_incoming.ethname }}/device/sriov_numvfs
+ip link set {{ nic_data_incoming.ethname }} vf 1 vlan 4095
+ip link set {{ nic_data_incoming.ethname }} vf 2 vlan 4095
+ip link set {{ nic_data_incoming.ethname }} vf 0 trust on
+ip link set {{ nic_data_incoming.ethname }} vf 1 trust on
+ip link set {{ nic_data_incoming.ethname }} vf 2 trust on
+ip link set {{ nic_data_incoming.ethname }} vf 1 mac 00:0e:c6:d6:72:c1
+ip link set {{ nic_data_incoming.ethname }} vf 2 mac fe:65:b7:03:50:bd
+ip link set {{ nic_data_incoming.ethname }} vf 0 spoofchk off
+ip link set {{ nic_data_incoming.vf0_name }} up
+ip link set {{ nic_data_incoming.vf1_name }} up
+ip link set {{ nic_data_incoming.vf2_name }} up
 {% endif %}
 

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

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

roles/tsg_device_tag/tasks/main.yml

@@ -1,6 +1,6 @@
 - name: "create /opt/tsg/etc/"
   file:
-    path: /opt/tsg/etc
+    path: /opt/proxy_status
     state: directory
 
 - name: "Template tsg_device_tag.json"

roles/tsg_master/tasks/main.yml

@@ -6,6 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-3.2.4.a73f956-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-3.1.2.7002e1b-2.el7.x86_64.rpm
     state: present
     skip_broken: yes