Add support for sonic-vpp DUT.

ansible/lab

@@ -127,6 +127,9 @@ sonic_s6000:
       ansible_host: 10.250.0.122
       ansible_hostv6: fec0::ffff:afa:12
       card_type: supervisor
+    vlab-vpp-01:
+      ansible_host: 10.250.0.92
+      ansible_hostv6: fec0::ffff:afa:70
 
 sonic_s6100:
   vars:

ansible/roles/vm_set/tasks/start_sonic_vm.yml

@@ -17,6 +17,7 @@
     hwsku: "{{ hostvars[dut_name].hwsku }}"
     num_asic: "{{ hostvars[dut_name]['num_asics'] | default(1) }}"
     card_type: "{{ hostvars[dut_name]['card_type'] | default('pizzabox') }}"
+    asic_type: "{{ hostvars[dut_name].asic_type | default('') }}"
 
 - name: Remove arp entry for {{ dut_name }}
   shell: arp -d {{ mgmt_ip_address }}

ansible/roles/vm_set/templates/sonic.xml.j2

@@ -36,6 +36,13 @@
   <cpu mode='host-model'>
     <model fallback='forbid'/>
     <topology sockets='1' dies='1' cores='2' threads='2'/>
+{% elif asic_type == 'vpp' %}
+  <memory unit='GiB'>8</memory>
+  <currentMemory unit='GiB'>8</currentMemory>
+  <vcpu placement='static'>6</vcpu>
+  <cpu mode='host-model'>
+    <model fallback='forbid'/>
+    <topology sockets='1' dies='1' cores='6' threads='1'/>
   </cpu>
 {% else %}
   <memory unit='GiB'>4</memory>
@@ -76,12 +83,20 @@
     </serial>
     <interface type='ethernet'>
         <target dev='{{ dut_name }}-0' />
+    {% if asic_type == 'vpp' %}
+        <model type='virtio-net-pci' />
+    {% else %}
         <model type='e1000' />
+    {% endif %}
     </interface>
 {% for i in range(port_alias|length) %}
     <interface type='ethernet' >
         <target dev='{{ dut_name }}-{{ i + 1 }}' />
+    {% if asic_type == 'vpp' %}
+        <model type='virtio-net-pci' />
+    {% else %}
         <model type='e1000' />
+    {% endif %}
         <mtu size='{{ fp_mtu_size }}' />
     </interface>
 {% endfor %}
@@ -94,3 +109,4 @@
   </devices>
   <seclabel type='dynamic' model='apparmor' relabel='yes'/>
 </domain>
+

ansible/veos_vtb

@@ -80,6 +80,7 @@ all:
         vlab-t2-1-2:
         vlab-t2-1-sup:
         vlab-c-02:
+        vlab-vpp-01:
     ptf:
       hosts:
         ptf-01:
@@ -328,6 +329,15 @@ all:
           ansible_user: admin
           ansible_ssh_user: admin
           ansible_altpassword: admin
+        vlab-vpp-01:
+          ansible_host: 10.250.0.92
+          ansible_hostv6: fec0::ffff:afa:70
+          type: kvm
+          hwsku: Force10-S6000
+          asic_type: vpp
+          serial_port: 9001
+          ansible_password: password
+          ansible_user: admin
 
 # The groups below are helpers to limit running playbooks to a specific server only
 server_1:

ansible/vtestbed.yaml

@@ -442,3 +442,33 @@
   inv_name: veos_vtb
   auto_recover: 'False'
   comment: Tests virtual force vs vm with 7 nodes
+
+- conf-name: vms-kvm-vpp-t1-lag
+  group-name: vms6-2
+  topo: t1-lag
+  ptf_image_name: docker-ptf
+  ptf: ptf-02
+  ptf_ip: 10.250.0.106/24
+  ptf_ipv6: fec0::ffff:afa:6/64
+  server: server_1
+  vm_base: VM0104
+  dut:
+    - vlab-vpp-01
+  inv_name: veos_vtb
+  auto_recover: 'False'
+  comment: Tests virtual vpp switch vm
+
+- conf-name: vms-kvm-vpp-t1
+  group-name: vms6-2
+  topo: t1
+  ptf_image_name: docker-ptf
+  ptf: ptf-02
+  ptf_ip: 10.250.0.106/24
+  ptf_ipv6: fec0::ffff:afa:6/64
+  server: server_1
+  vm_base: VM0104
+  dut:
+    - vlab-vpp-01
+  inv_name: veos_vtb
+  auto_recover: 'False'
+  comment: Tests virtual vpp switch vm