1、删除tsg_access_type 变量

2、新增proxy_topo_type，capture_pacakge_type,traffic_addr_type,network_topo_type,traffic_load_type,runtime_env_type 3、删除关于adc，atca的mrzcpd，sapp相关配置文件
2021-02-04 17:41:33 +08:00
parent 6478678b45
commit a5610fa082
23 changed files with 83 additions and 732 deletions
--- a/install_config/group_vars/platform.yml
+++ b/install_config/group_vars/platform.yml
@@ -0,0 +1,64 @@
+#########################################
+#####0: Pcap;  1: Inline_device;   5:ATCA_VXLAN;
+tsg_access_type: 0
+
+#####0: in_server 1:in_atca 3: in_adc
+##### proxy_topo_type: type of sapp to tfe traffic transport topology (include: in_server_tun,in_atca, in_adc)
+proxy_topo_type: 0
+
+#####0: pcap; 1: drive(mrzcpd) 
+##### capture_packet_type : type of the sapp capture packat from nic(include:pcap,drive(mrzcpd))
+capture_packet_type: 0
+
+#####0:mirror 1:series
+##### traffic_attr_type: type of traffic attribute (include mirror and series)
+traffic_attr_type: 0
+
+#####0:one-arm 1:two-arms
+##### network_topo_type: type of network topology(include: one-arm and two-arms)
+network_topo_type: 0
+
+#####0:raw 1:vxlan 2:vlan
+##### traffic_load_type: type of traffic load(include: raw,vxlan,vlan)
+traffic_load_type: 0
+
+#####0:server 1:adc 2:atca
+#### runtime_env_type: type of program runtime environment(include:server,adc,atca )
+runtime_env_type: 0 
+
+#########################################
+#Sapp Performance Config
+#如果capture_packet_type=0，sapp跑在pcap模式，则以下配置可忽略
+sapp:
+  worker_threads: 23
+  send_only_threads_max: 1
+  bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24
+  inbound_route_dir: 1
+
+#########################################
+#Sapp Double-Arm Config
+packet_io:
+  internal_interface: eth2
+  external_interface: eth3
+
+
+#########################################
+#Marsio Config
+mrzcpd:
+  iocore: 39
+
+mrtunnat:
+  lcore_id: 38
+
+#########################################
+#Inline Device Config
+inline_device_config:
+  keepalive_ip: 192.168.1.30
+  keepalive_mask: 255.255.255.252
+  data_incoming: eth5
+
+#########################################
+
+sapp_prometheus_enable: 1
+sapp_prometheus_port: 9273
+sapp_prometheus_url_path: "/metrics"
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -1,64 +0,0 @@
-#########################################
-#####0: Pcap;  1: Inline_device;   5:ATCA_VXLAN;
-tsg_access_type: 0
-#####0: Tun_mode;  1: normal;
-tsg_running_type: 0
-
-
-#########################################
-#Sapp Performance Config
-#如果tsg_access_type=0，sapp跑在pcap模式，则以下配置可忽略
-sapp:
-  worker_threads: 23
-  send_only_threads_max: 1
-  bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24
-  inbound_route_dir: 1
-
-#########################################
-#Sapp Double-Arm Config
-packet_io:
-  internal_interface: eth2
-  external_interface: eth3
-
-
-#########################################
-#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
-
-#########################################
-
-sapp_prometheus_enable: 1
-sapp_prometheus_port: 9273
-sapp_prometheus_url_path: "/metrics"