Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Revert "fix(jobspec): Delete ipsec nfv density tests"
[csit.git] / resources / libraries / python / QemuManager.py
diff --git a/resources/libraries/python/QemuManager.py b/resources/libraries/python/QemuManager.py
index 66a21aa..259b4c6 100644 (file)
--- a/resources/libraries/python/QemuManager.py
+++ b/resources/libraries/python/QemuManager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -51,8 +51,9 @@ class QemuManager:
         nf_nodes = int(kwargs[u"nf_nodes"])
         queues = kwargs[u"rxq_count_int"] if kwargs[u"auto_scale"] else 1
         vs_dtc = kwargs[u"vs_dtc"]
-        nf_dtc = kwargs[u"vs_dtc"] if kwargs[u"auto_scale"] \
-            else kwargs[u"nf_dtc"]
+        nf_dtc = kwargs[u"nf_dtc"]
+        if kwargs[u"auto_scale"] and not kwargs[u"fixed_auto_scale"]:
+            nf_dtc = kwargs[u"vs_dtc"]
         nf_dtcr = kwargs[u"nf_dtcr"] \
             if isinstance(kwargs[u"nf_dtcr"], int) else 2
 
@@ -107,6 +108,7 @@ class QemuManager:
         :param pinning: If True, then do also QEMU process pinning.
         :type pinning: bool
         """
+        cpus = []
         for machine, machine_affinity in \
                 zip(self.machines.values(), self.machines_affinity.values()):
             index = list(self.machines.values()).index(machine)
@@ -114,6 +116,8 @@ class QemuManager:
             self.nodes[name] = machine.qemu_start()
             if pinning:
                 machine.qemu_set_affinity(*machine_affinity)
+                cpus.extend(machine_affinity)
+        return ",".join(str(cpu) for cpu in cpus)
 
     def kill_all_vms(self, force=False):
         """Kill all added VMs in manager.
@@ -141,6 +145,8 @@ class QemuManager:
         """
         qemu_id = kwargs[u"qemu_id"]
         name = kwargs[u"name"]
+        virtio_feature_mask = kwargs[u"virtio_feature_mask"] \
+            if u"virtio_feature_mask" in kwargs else None
 
         self.machines[name] = QemuUtils(
             node=self.nodes[kwargs[u"node"]],
@@ -148,7 +154,8 @@ class QemuManager:
             smp=len(self.machines_affinity[name]),
             mem=4096,
             vnf=kwargs[u"vnf"],
-            img=Constants.QEMU_VM_KERNEL
+            img=Constants.QEMU_VM_KERNEL,
+            page_size=kwargs[u"page_size"]
         )
         self.machines[name].add_default_params()
         self.machines[name].add_kernelvm_params()
@@ -165,14 +172,287 @@ class QemuManager:
             jumbo_frames=kwargs[u"jumbo"],
             queues=kwargs[u"queues"],
             queue_size=kwargs[u"perf_qemu_qsz"],
-            csum=kwargs[u"enable_csum"],
-            gso=kwargs[u"enable_gso"]
+            virtio_feature_mask=virtio_feature_mask
         )
         self.machines[name].add_vhost_user_if(
             f"/run/vpp/sock-{qemu_id}-2",
             jumbo_frames=kwargs[u"jumbo"],
             queues=kwargs[u"queues"],
             queue_size=kwargs[u"perf_qemu_qsz"],
-            csum=kwargs[u"enable_csum"],
-            gso=kwargs[u"enable_gso"]
+            virtio_feature_mask=virtio_feature_mask
+        )
+
+    def _c_vpp_2vfpt_ip4base_plen24(self, **kwargs):
+        """Instantiate one VM with vpp_2vfpt_ip4base_plen24 configuration.
+
+        :param kwargs: Named parameters.
+        :type kwargs: dict
+        """
+        qemu_id = kwargs[u"qemu_id"]
+        name = kwargs[u"name"]
+
+        self.machines[name] = QemuUtils(
+            node=self.nodes[kwargs[u"node"]],
+            qemu_id=qemu_id,
+            smp=len(self.machines_affinity[name]),
+            mem=4096,
+            vnf=kwargs[u"vnf"],
+            img=Constants.QEMU_VM_KERNEL
+        )
+        self.machines[name].add_default_params()
+        self.machines[name].add_kernelvm_params()
+        if u"DUT1" in name:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"2.2.2.1/30",
+                ip2=u"1.1.1.2/30",
+                route1=u"20.0.0.0/24",
+                routeif1=u"avf-0/0/6/0",
+                nexthop1=u"2.2.2.2",
+                route2=u"10.0.0.0/24",
+                routeif2=u"avf-0/0/7/0",
+                nexthop2=u"1.1.1.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d8",
+                arpip1=u"1.1.1.1",
+                arpif1=u"avf-0/0/7/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        else:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"3.3.3.2/30",
+                ip2=u"2.2.2.2/30",
+                route1=u"10.0.0.0/24",
+                routeif1=u"avf-0/0/7/0",
+                nexthop1=u"2.2.2.1",
+                route2=u"20.0.0.0/24",
+                routeif2=u"avf-0/0/6/0",
+                nexthop2=u"3.3.3.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d9",
+                arpip1=u"3.3.3.1",
+                arpif1=u"avf-0/0/6/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if2"])
+        )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if1"])
+        )
+
+    def _c_vpp_2vfpt_ip4scale2k_plen30(self, **kwargs):
+        """Instantiate one VM with vpp_2vfpt_ip4scale2k_plen30 configuration.
+
+        :param kwargs: Named parameters.
+        :type kwargs: dict
+        """
+        qemu_id = kwargs[u"qemu_id"]
+        name = kwargs[u"name"]
+
+        self.machines[name] = QemuUtils(
+            node=self.nodes[kwargs[u"node"]],
+            qemu_id=qemu_id,
+            smp=len(self.machines_affinity[name]),
+            mem=4096,
+            vnf=kwargs[u"vnf"],
+            img=Constants.QEMU_VM_KERNEL
+        )
+        self.machines[name].add_default_params()
+        self.machines[name].add_kernelvm_params()
+        if u"DUT1" in name:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"2.2.2.1/30",
+                ip2=u"1.1.1.2/30",
+                route1=u"20.0.0.0/30",
+                routeif1=u"avf-0/0/6/0",
+                nexthop1=u"2.2.2.2",
+                route2=u"10.0.0.0/30",
+                routeif2=u"avf-0/0/7/0",
+                nexthop2=u"1.1.1.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d8",
+                arpip1=u"1.1.1.1",
+                arpif1=u"avf-0/0/7/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        else:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"3.3.3.2/30",
+                ip2=u"2.2.2.2/30",
+                route1=u"10.0.0.0/30",
+                routeif1=u"avf-0/0/7/0",
+                nexthop1=u"2.2.2.1",
+                route2=u"20.0.0.0/30",
+                routeif2=u"avf-0/0/6/0",
+                nexthop2=u"3.3.3.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d9",
+                arpip1=u"3.3.3.1",
+                arpif1=u"avf-0/0/6/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if2"])
+        )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if1"])
+        )
+
+    def _c_vpp_2vfpt_ip4scale20k_plen30(self, **kwargs):
+        """Instantiate one VM with vpp_2vfpt_ip4scale20k_plen30 configuration.
+
+        :param kwargs: Named parameters.
+        :type kwargs: dict
+        """
+        qemu_id = kwargs[u"qemu_id"]
+        name = kwargs[u"name"]
+
+        self.machines[name] = QemuUtils(
+            node=self.nodes[kwargs[u"node"]],
+            qemu_id=qemu_id,
+            smp=len(self.machines_affinity[name]),
+            mem=4096,
+            vnf=kwargs[u"vnf"],
+            img=Constants.QEMU_VM_KERNEL
+        )
+        self.machines[name].add_default_params()
+        self.machines[name].add_kernelvm_params()
+        if u"DUT1" in name:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"2.2.2.1/30",
+                ip2=u"1.1.1.2/30",
+                route1=u"20.0.0.0/30",
+                routeif1=u"avf-0/0/6/0",
+                nexthop1=u"2.2.2.2",
+                route2=u"10.0.0.0/30",
+                routeif2=u"avf-0/0/7/0",
+                nexthop2=u"1.1.1.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d8",
+                arpip1=u"1.1.1.1",
+                arpif1=u"avf-0/0/7/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        else:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"3.3.3.2/30",
+                ip2=u"2.2.2.2/30",
+                route1=u"10.0.0.0/30",
+                routeif1=u"avf-0/0/7/0",
+                nexthop1=u"2.2.2.1",
+                route2=u"20.0.0.0/30",
+                routeif2=u"avf-0/0/6/0",
+                nexthop2=u"3.3.3.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d9",
+                arpip1=u"3.3.3.1",
+                arpif1=u"avf-0/0/6/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if2"])
+        )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if1"])
+        )
+
+    def _c_vpp_2vfpt_ip4scale200k_plen30(self, **kwargs):
+        """Instantiate one VM with vpp_2vfpt_ip4scale200k_plen30 configuration.
+
+        :param kwargs: Named parameters.
+        :type kwargs: dict
+        """
+        qemu_id = kwargs[u"qemu_id"]
+        name = kwargs[u"name"]
+
+        self.machines[name] = QemuUtils(
+            node=self.nodes[kwargs[u"node"]],
+            qemu_id=qemu_id,
+            smp=len(self.machines_affinity[name]),
+            mem=4096,
+            vnf=kwargs[u"vnf"],
+            img=Constants.QEMU_VM_KERNEL
+        )
+        self.machines[name].add_default_params()
+        self.machines[name].add_kernelvm_params()
+        if u"DUT1" in name:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"2.2.2.1/30",
+                ip2=u"1.1.1.2/30",
+                route1=u"20.0.0.0/30",
+                routeif1=u"avf-0/0/6/0",
+                nexthop1=u"2.2.2.2",
+                route2=u"10.0.0.0/30",
+                routeif2=u"avf-0/0/7/0",
+                nexthop2=u"1.1.1.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d8",
+                arpip1=u"1.1.1.1",
+                arpif1=u"avf-0/0/7/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        else:
+            self.machines[name].configure_kernelvm_vnf(
+                ip1=u"3.3.3.2/30",
+                ip2=u"2.2.2.2/30",
+                route1=u"10.0.0.0/30",
+                routeif1=u"avf-0/0/7/0",
+                nexthop1=u"2.2.2.1",
+                route2=u"20.0.0.0/30",
+                routeif2=u"avf-0/0/6/0",
+                nexthop2=u"3.3.3.1",
+                arpmac1=u"3c:fd:fe:d1:5c:d9",
+                arpip1=u"3.3.3.1",
+                arpif1=u"avf-0/0/6/0",
+                queues=kwargs[u"queues"],
+                jumbo_frames=kwargs[u"jumbo"]
+            )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if2"])
+        )
+        self.machines[name].add_vfio_pci_if(
+            pci=Topology.get_interface_pci_addr(
+                self.nodes[kwargs[u"node"]], kwargs[u"if1"])
+        )
+
+    def _c_iperf3(self, **kwargs):
+        """Instantiate one VM with iperf3 configuration.
+
+        :param kwargs: Named parameters.
+        :type kwargs: dict
+        """
+        qemu_id = kwargs[u"qemu_id"]
+        name = kwargs[u"name"]
+        virtio_feature_mask = kwargs[u"virtio_feature_mask"] \
+            if u"virtio_feature_mask" in kwargs else None
+
+        self.machines[name] = QemuUtils(
+            node=self.nodes[kwargs[u"node"]],
+            qemu_id=qemu_id,
+            smp=len(self.machines_affinity[name]),
+            mem=4096,
+            vnf=kwargs[u"vnf"],
+            img=Constants.QEMU_VM_KERNEL
+        )
+        self.machines[name].add_default_params()
+        self.machines[name].add_kernelvm_params()
+        self.machines[name].configure_kernelvm_vnf(
+            queues=kwargs[u"queues"],
+            jumbo_frames=kwargs[u"jumbo"]
+        )
+        self.machines[name].add_net_user()
+        self.machines[name].add_vhost_user_if(
+            f"/run/vpp/sock-{qemu_id}-1",
+            server=False,
+            jumbo_frames=kwargs[u"jumbo"],
+            queues=kwargs[u"queues"],
+            queue_size=kwargs[u"perf_qemu_qsz"],
+            virtio_feature_mask=virtio_feature_mask
         )
Integration tests