🎈 perf(TSG-9140): TSG-9140网卡重命名

2021-06-25 06:25:21 -04:00
parent e880a55753
commit 864e063a9d
30 changed files with 276 additions and 225 deletions
--- a/ansible/roles/system-init-9140/tasks/main.yml
+++ b/ansible/roles/system-init-9140/tasks/main.yml
@@ -6,94 +6,65 @@
    mode: 0644
  tags: template

- name: "set enp1s0 up "
+- name: "set eth_pf_smbio cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp1s0.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp1s0
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_smbio.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_smbio
  tags: template

- name: "set enp5s0f0 up "
+- name: "set eth_vf_raw cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp5s0f0.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp5s0f0
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_raw.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_raw
  tags: template

- name: "set enp5s0f1 up "
+- name: "set eth_vf_dign_c cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp5s0f1.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp5s0f1
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_dign_c.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_dign_c
  tags: template

- name: "set enp130s0 up "
+- name: "set eth_vf_dign_s cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp130s0.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp130s0
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_dign_s.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_dign_s
  tags: template

- name: "set enp131s0f0 up "
+- name: "set set-eth_vf_raw-macaddr.sh"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp131s0f0.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp131s0f0
+    src: "{{ role_path }}/templates/set-eth_vf_raw-macaddr.sh.toml.j2"
+    dest: /usr/bin/set-eth_vf_raw-macaddr.sh
+    mode: 0777
  tags: template

- name: "set enp131s0f1 up "
+- name: "set eth_pf_smbcx cfg "
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp131s0f1.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp131s0f1
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_smbcx.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_smbcx
  tags: template

- name: "set enp131s0f2 up "
+- name: "set eth_vf_kni cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp131s0f2.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp131s0f2
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_kni.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_kni
  tags: template

- name: "set enp131s0f3 up "
+- name: "set eth_vf_tfe cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp131s0f3.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp131s0f3
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_tfe.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_tfe
  tags: template

- name: "set enp1s2"
+- name: "set eth_vf_mirr cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp1s2.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp1s2
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_mirr.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_mirr
  tags: template

- name: "set enp1s2f1"
+- name: "set eth_vf_ctl cfg"
  template:
-    src: "{{ role_path }}/templates/ifcfg-enp1s2f1.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp1s2f1
-  tags: template
-
- name: "set enp1s2f2"
-  template:
-    src: "{{ role_path }}/templates/ifcfg-enp1s2f2.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp1s2f2
-  tags: template
-
- name: "set enp130s2"
-  template:
-    src: "{{ role_path }}/templates/ifcfg-enp130s2.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp130s2
-  tags: template
-
- name: "set enp130s2f1"
-  template:
-    src: "{{ role_path }}/templates/ifcfg-enp130s2f1.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp130s2f1
-  tags: template
-
- name: "set enp130s2f2"
-  template:
-    src: "{{ role_path }}/templates/ifcfg-enp130s2f2.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp130s2f2
-  tags: template
-
- name: "set enp130s2f3"
-  template:
-    src: "{{ role_path }}/templates/ifcfg-enp130s2f3.toml.j2"
-    dest: /etc/sysconfig/network-scripts/ifcfg-enp130s2f3
+    src: "{{ role_path }}/templates/ifcfg-eth_vf_ctl.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_vf_ctl
  tags: template

 - name: "set if-pre-up "
@@ -103,25 +74,54 @@
    mode: 0755
  tags: template

- name: "set setup.enp131s0f0.ips"
+- name: "copy eth_pf_mgmt0.ips cfg"
  template:
-    src: "{{ role_path }}/templates/setup.enp131s0f0.ips.toml.j2"
-    dest: /sbin/setup.enp131s0f0.ips
+    src: "{{ role_path }}/templates/setup.eth_pf_mgmt0.ips.toml.j2"
+    dest: /sbin/setup.eth_pf_mgmt0.ips
    mode: 0777
  tags: template

- name: "set setup.enp130s2f1.ips"
+- name: "copy setup.eth_vf_tfe.ips"
  template:
-    src: "{{ role_path }}/templates/setup.enp130s2f1.ips.toml.j2"
-    dest: /sbin/setup.enp130s2f1.ips
+    src: "{{ role_path }}/templates/setup.eth_vf_tfe.ips.toml.j2"
+    dest: /sbin/setup.eth_vf_tfe.ips
    mode: 0777
  tags: template

- name: "set set-enp1s2-macaddr.sh"
+- name: "set eth_pf_xe0 cfg "
  template:
-    src: "{{ role_path }}/templates/set-enp1s2-macaddr.sh.toml.j2"
-    dest: /usr/bin/set-enp1s2-macaddr.sh
-    mode: 0777
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_xe0.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_xe0
+  tags: template
+
+- name: "set eth_pf_xe1 cfg "
+  template:
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_xe1.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_xe1
+  tags: template
+
+- name: "set eth_pf_mgmt0 cfg "
+  template:
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_mgmt0.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_mgmt0
+  tags: template
+
+- name: "set eth_pf_mgmt1 cfg "
+  template:
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_mgmt1.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_mgmt1
+  tags: template
+
+- name: "set eth_pf_ge0 cfg "
+  template:
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_ge0.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_ge0
+  tags: template
+
+- name: "set eth_pf_ge1 up "
+  template:
+    src: "{{ role_path }}/templates/ifcfg-eth_pf_ge1.toml.j2"
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth_pf_ge1
  tags: template

 # systemctl set-property user.slice     CPUShares=1500 MemoryLimit=13G
--- a/ansible/roles/system-init-9140/templates/90-9000NPBP01R01.rules.j2
+++ b/ansible/roles/system-init-9140/templates/90-9000NPBP01R01.rules.j2
@@ -1,28 +1,60 @@
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",ATTR{device/sriov_numvfs}="3"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",ATTR{device/sriov/0/trunk}="add 0,4000,4001"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",RUN+="/usr/bin/set-enp1s2-macaddr.sh"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 1 vlan 4000"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 2 vlan 4001"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 0 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 1 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 2 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 0 spoofchk off"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 0 state enable"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 1 state enable"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:00/0000:00:01.0/0000:01:00.0/net/enp1s0",PROGRAM+="/usr/sbin/ip link set enp1s0 vf 2 state enable"
+# rename enp1s0 to eth_pf_smbio
+# rename enp1s2 to eth_vf_raw
+# rename enp1s2f1 to eth_vf_dign_c
+# rename enp1s2f2 to eth_vf_dign_s
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0", NAME:="eth_pf_smbio"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0",ATTR{device/sriov_numvfs}="3"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.0", NAME:="eth_vf_raw"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.1", NAME:="eth_vf_dign_c"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.2", NAME:="eth_vf_dign_s"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0",ATTR{device/sriov/0/trunk}="add 0,4000,4001"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:00.0",RUN+="/usr/bin/set-eth_vf_raw-macaddr.sh"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 1 vlan 4000"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 2 vlan 4001"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 0 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 1 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 2 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 0 spoofchk off"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 0 state enable"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 1 state enable"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:01:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbio vf 2 state enable"

-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",ATTR{device/sriov_numvfs}="4"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 0 vlan 4095"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 1 vlan 4095"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 2 vlan 3816"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 3 vlan 3817"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 0 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 1 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 2 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 3 trust on"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 0 mac 00:0e:c6:d6:72:c1"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 1 mac fe:65:b7:03:50:bd"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 0 state enable"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 1 state enable"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 2 state enable"
-ACTION=="add", SUBSYSTEM=="net",DEVPATH=="/devices/pci0000:80/0000:80:01.0/0000:82:00.0/net/enp130s0",PROGRAM+="/usr/sbin/ip link set enp130s0 vf 3 state enable"
+# rename enp130s0 to eth_pf_smbcx
+# rename enp130s2 to eth_vf_kni
+# rename enp130s2f1 to eth_vf_tfe
+# rename enp130s2f2 to eth_vf_mirr
+# rename enp130s2f3 to eth_vf_ctl
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0", NAME:="eth_pf_smbcx"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:00.0",ATTR{device/sriov_numvfs}="4"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0", NAME:="eth_vf_kni"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1", NAME:="eth_vf_tfe"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.2", NAME:="eth_vf_mirr"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.3", NAME:="eth_vf_ctl"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 vlan 4095"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 vlan 4095"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 2 vlan 3816"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.3",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 3 vlan 3817"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 2 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.3",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 3 trust on"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 mac 00:0e:c6:d6:72:c1"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 mac fe:65:b7:03:50:bd"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.0",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 0 state enable"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.1",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 1 state enable"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.2",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 2 state enable"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:82:02.3",PROGRAM+="/usr/sbin/ip link set eth_pf_smbcx vf 3 state enable"
+
+# rename enp131s0f0 to eth_pf_mgmt0
+# rename enp131s0f1 to eth_pf_mgmt1
+# rename enp131s0f2 to eth_pf_ge0
+# rename enp131s0f3 to eth_pf_ge1
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:83:00.0", NAME:="eth_pf_mgmt0"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:83:00.1", NAME:="eth_pf_mgmt1"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:83:00.2", NAME:="eth_pf_ge0"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:83:00.3", NAME:="eth_pf_ge1"
+
+# rename enp5s0f0 to eth_pf_xe0
+# rename enp5s0f1 to eth_pf_xe1
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.0", NAME:="eth_pf_xe0"
+ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.1", NAME:="eth_pf_xe1"
--- a/ansible/roles/system-init-9140/templates/README.md
+++ b/ansible/roles/system-init-9140/templates/README.md
@@ -0,0 +1,19 @@
+# TSG-9140设备网卡固化列表
+
+|  序号 |  原网卡名    |  bus-info     |  固化网卡名      |  用途                              |
+|  --- |    ---      |   ---         |    ---         |  ---                               |
+|   1  |  enp1s0     |  0000:01:00.0 |  eth_pf_smbio  |  与OS3300连接的X710网卡              |
+|   2  |  enp1s2     |  0000:01:02.0 |  eth_vf_raw    |  从交换板上获取/转发原始流量           |
+|   3  |  enp1s2f1   |  0000:01:02.1 |  eth_vf_dign_c |  数据面自检模拟客户端                 |
+|   4  |  enp1s2f2   |  0000:01:02.2 |  eth_vf_dign_s |  数据面自检模拟服务器                 |
+|   5  |  enp130s0   |  0000:82:00.0 |  eth_pf_smbcx  |  与OS3200连接的X710网卡              |
+|   6  |  enp130s2   |  0000:82:02.0 |  eth_vf_kni    |  kni向tfe发送流量的网卡               |
+|   7  |  enp130s2f1 |  0000:82:02.1 |  eth_vf_tfe    |  tfe向kni发送流量的网卡               |
+|   8  |  enp130s2f2 |  0000:82:02.2 |  eth_vf_mirr   |  解密流量转发                        |
+|   9  |  enp130s2f3 |  0000:82:02.3 |  eth_vf_ctl    |  策略与日志                          |
+|   10 |  enp131s0f0 |  0000:83:00.0 |  eth_pf_mgmt0  |  与OS3300连接的base管理网卡           |
+|   11 |  enp131s0f1 |  0000:83:00.1 |  eth_pf_mgmt1  |  与OS3200连接的base管理网卡（暂未使用） |
+|   12 |  enp131s0f2 |  0000:83:00.2 |  eth_pf_ge0    |  前面板的GE电口(预留)                 |
+|   13 |  enp131s0f3 |  0000:83:00.3 |  eth_pf_ge1    |  前面板的GE电口(预留)                 |
+|   14 |  enp5s0f0   |  0000:05:00.0 |  eth_pf_xe0    |  前面板的10GE光口(预留)               |
+|   15 |  enp5s0f1   |  0000:05:00.1 |  eth_pf_xe0    |  前面板的10GE光口(预留)               |
--- a/ansible/roles/system-init-9140/templates/if-pre-up.toml.j2
+++ b/ansible/roles/system-init-9140/templates/if-pre-up.toml.j2
@@ -6,8 +6,8 @@ if [ "$STA" == "pre-up" ]
 then
  logger "$0 called for interface named $INF with $STA ..."
  case "$INF" in
-          enp131s0f0) logger "Setting $STA $INF ipaddr ..."; /sbin/setup.enp131s0f0.ips $INF $STA;;
-          enp130s2f1) logger "Setting $STA $INF RPS ..."; /sbin/setup.enp130s2f1.ips $INF $STA;;
+          eth_pf_mgmt0) logger "Setting $STA $INF ipaddr ..."; /sbin/setup.eth_pf_mgmt0.ips $INF $STA;;
+          eth_vf_tfe) logger "Setting $STA $INF RPS ..."; /sbin/setup.eth_vf_tfe.ips $INF $STA;;
  esac
 fi
 exit 0
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp131s0f0.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp131s0f0.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp131s0f0
-DEVICE=enp131s0f0
-ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp131s0f2.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp131s0f2.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp131s0f2
-DEVICE=enp131s0f2
-ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp1s0.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp1s0.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp1s0
-DEVICE=enp1s0
-ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp1s2.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp1s2.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp1s2
-DEVICE=enp1s2
-ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp1s2f1.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp1s2f1.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp1s2f1
-DEVICE=enp1s2f1
-ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-enp1s2f2.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-enp1s2f2.toml.j2
@@ -1,14 +0,0 @@
-TYPE=Ethernet
-PROXY_METHOD=none
-BROWSER_ONLY=no
-BOOTPROTO=none
-DEFROUTE=no
-IPV4_FAILURE_FATAL=no
-IPV6INIT=yes
-IPV6_AUTOCONF=no
-IPV6_DEFROUTE=no
-IPV6_FAILURE_FATAL=no
-IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp1s2f2
-DEVICE=enp1s2f2
-ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_ge0.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_ge0.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp5s0f0
-DEVICE=enp5s0f0
+NAME=eth_pf_ge0
+DEVICE=eth_pf_ge0
 ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_ge1.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_ge1.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp5s0f1
-DEVICE=enp5s0f1
+NAME=eth_pf_ge1
+DEVICE=eth_pf_ge1
 ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_mgmt0.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_mgmt0.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_pf_mgmt0
+DEVICE=eth_pf_mgmt0
+ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_mgmt1.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_mgmt1.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_pf_mgmt1
+DEVICE=eth_pf_mgmt1
+ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_smbcx.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_smbcx.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_pf_smbcx
+DEVICE=eth_pf_smbcx
+ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_smbio.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_smbio.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_pf_smbio
+DEVICE=eth_pf_smbio
+ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_xe0.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_xe0.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp131s0f1
-DEVICE=enp131s0f1
+NAME=eth_pf_xe0
+DEVICE=eth_pf_xe0
 ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_xe1.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_pf_xe1.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp131s0f3
-DEVICE=enp131s0f3
+NAME=eth_pf_xe1
+DEVICE=eth_pf_xe1
 ONBOOT=no
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_ctl.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_ctl.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp130s2f3
-DEVICE=enp130s2f3
+NAME=eth_vf_ctl
+DEVICE=eth_vf_ctl
 ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_dign_c.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_dign_c.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_vf_dign_c
+DEVICE=eth_vf_dign_c
+ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_dign_s.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_dign_s.toml.j2
@@ -0,0 +1,14 @@
+TYPE=Ethernet
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=none
+DEFROUTE=no
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=no
+IPV6_DEFROUTE=no
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=stable-privacy
+NAME=eth_vf_dign_s
+DEVICE=eth_vf_dign_s
+ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_kni.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_kni.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp130s0
-DEVICE=enp130s0
+NAME=eth_vf_kni
+DEVICE=eth_vf_kni
 ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_mirr.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_mirr.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp130s2f2
-DEVICE=enp130s2f2
+NAME=eth_vf_mirr
+DEVICE=eth_vf_mirr
 ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_raw.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_raw.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp130s2
-DEVICE=enp130s2
+NAME=eth_vf_raw
+DEVICE=eth_vf_raw
 ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_tfe.toml.j2
+++ b/ansible/roles/system-init-9140/templates/ifcfg-eth_vf_tfe.toml.j2
@@ -9,6 +9,6 @@ IPV6_AUTOCONF=no
 IPV6_DEFROUTE=no
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=stable-privacy
-NAME=enp130s2f1
-DEVICE=enp130s2f1
+NAME=eth_vf_tfe
+DEVICE=eth_vf_tfe
 ONBOOT=yes
--- a/ansible/roles/system-init-9140/templates/set-enp1s2-macaddr.sh.toml.j2
+++ b/ansible/roles/system-init-9140/templates/set-enp1s2-macaddr.sh.toml.j2
@@ -1,9 +0,0 @@
-#!/bin/sh
-echo --------------------  set enp1s2 macaddr  --------------------
-output=$(ipmitool picmg addrinfo)
-echo $output
-substr=${output:21:2}
-echo deviceid:$substr
-macaddr='90:00:00:91:40:'$substr
-echo enp1s2 macaddr:$macaddr
-echo $macaddr > /sys/class/net/enp1s0/device/sriov/0/mac
--- a/ansible/roles/system-init-9140/templates/set-eth_vf_raw-macaddr.sh.toml.j2
+++ b/ansible/roles/system-init-9140/templates/set-eth_vf_raw-macaddr.sh.toml.j2
@@ -0,0 +1,9 @@
+#!/bin/sh
+echo --------------------  set eth_vf_raw macaddr  --------------------
+output=$(ipmitool picmg addrinfo)
+echo $output
+substr=${output:21:2}
+echo deviceid:$substr
+macaddr='90:00:00:91:40:'$substr
+echo eth_vf_raw macaddr:$macaddr
+echo $macaddr > /sys/class/net/eth_pf_smbio/device/sriov/0/mac
--- a/ansible/roles/system-init-9140/templates/setup.enp130s2f1.ips.toml.j2
+++ b/ansible/roles/system-init-9140/templates/setup.enp130s2f1.ips.toml.j2
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-INF="$1"
-STA="$2"
-
-if [ "$INF" == "enp130s2f1" ]
-then
-  logger "$0: Interface $INF with $STA ,Set $INF RPS ..."
-  echo 0003ff,f0003ffc > /sys/class/net/enp130s2f1/queues/rx-0/rps_cpus
-  echo 0003ff,f0003ffc > /sys/class/net/enp130s2f1/queues/rx-1/rps_cpus
-  echo 0003ff,f0003ffc > /sys/class/net/enp130s2f1/queues/rx-2/rps_cpus
-  echo 0003ff,f0003ffc > /sys/class/net/enp130s2f1/queues/rx-3/rps_cpus
-fi
--- a/ansible/roles/system-init-9140/templates/setup.eth_pf_mgmt0.ips.toml.j2
+++ b/ansible/roles/system-init-9140/templates/setup.eth_pf_mgmt0.ips.toml.j2
@@ -5,7 +5,7 @@ STA="$2"

 logger "$0 called for interface named $INF with $STA ..."

-if [ "$INF" == "enp131s0f0" ]
+if [ "$INF" == "eth_pf_mgmt0" ]
 then
  logger "$0: Interface $INF with $STA ,Set $INF ipaddr ..."
  output=$(ipmitool picmg addrinfo)
@@ -14,5 +14,5 @@ then
  echo $substr
  num=$((16#${substr}+16))
  ipaddr='10.254.'$num'.1'
-  ifconfig enp131s0f0 $ipaddr netmask 255.255.0.0
+  ifconfig eth_pf_mgmt0 $ipaddr netmask 255.255.0.0
 fi
--- a/ansible/roles/system-init-9140/templates/setup.eth_vf_tfe.ips.toml.j2
+++ b/ansible/roles/system-init-9140/templates/setup.eth_vf_tfe.ips.toml.j2
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+INF="$1"
+STA="$2"
+
+if [ "$INF" == "eth_vf_tfe" ]
+then
+  logger "$0: Interface $INF with $STA ,Set $INF RPS ..."
+  echo 0003ff,f0003ffc > /sys/class/net/eth_vf_tfe/queues/rx-0/rps_cpus
+  echo 0003ff,f0003ffc > /sys/class/net/eth_vf_tfe/queues/rx-1/rps_cpus
+  echo 0003ff,f0003ffc > /sys/class/net/eth_vf_tfe/queues/rx-2/rps_cpus
+  echo 0003ff,f0003ffc > /sys/class/net/eth_vf_tfe/queues/rx-3/rps_cpus
+fi