Separate files needing GPL license

[csit.git] / resources / libraries / python / QemuManager.py

diff --git a/resources/libraries/python/QemuManager.py b/resources/libraries/python/QemuManager.py
index cfc4fbd..ce55be0 100644 (file)
--- a/resources/libraries/python/QemuManager.py
+++ b/resources/libraries/python/QemuManager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -62,19 +62,19 @@ class QemuManager:
             for nf_node in range(1, nf_nodes + 1):
                 qemu_id = (nf_chain - 1) * nf_nodes + nf_node
                 name = f"{node}_{qemu_id}"
-                sock1 = f"/var/run/vpp/sock-{qemu_id}-1"
-                sock2 = f"/var/run/vpp/sock-{qemu_id}-2"
+                sock1 = f"/run/vpp/sock-{qemu_id}-1"
+                sock2 = f"/run/vpp/sock-{qemu_id}-2"
                 idx1 = (nf_chain - 1) * nf_nodes * 2 + nf_node * 2 - 1
                 vif1_mac = Topology.get_interface_mac(
                     self.nodes[node], f"vhost{idx1}"
                 ) if kwargs[u"vnf"] == u"testpmd_mac" \
-                    else kwargs[u"tg_if1_mac"] if nf_node == 1 \
+                    else kwargs[u"tg_pf1_mac"] if nf_node == 1 \
                     else f"52:54:00:00:{(qemu_id - 1):02x}:02"
                 idx2 = (nf_chain - 1) * nf_nodes * 2 + nf_node * 2
                 vif2_mac = Topology.get_interface_mac(
                     self.nodes[node], f"vhost{idx2}"
                 ) if kwargs[u"vnf"] == u"testpmd_mac" \
-                    else kwargs[u"tg_if2_mac"] if nf_node == nf_nodes \
+                    else kwargs[u"tg_pf2_mac"] if nf_node == nf_nodes \
                     else f"52:54:00:00:{(qemu_id + 1):02x}:01"
 
                 self.machines_affinity[name] = CpuUtils.get_affinity_nf(
@@ -96,11 +96,13 @@ class QemuManager:
                 )
                 self.machines[name].qemu_add_vhost_user_if(
                     sock1, jumbo_frames=kwargs[u"jumbo"], queues=queues,
-                    queue_size=kwargs[u"perf_qemu_qsz"]
+                    queue_size=kwargs[u"perf_qemu_qsz"],
+                    csum=kwargs[u"enable_csum"], gso=kwargs[u"enable_gso"]
                 )
                 self.machines[name].qemu_add_vhost_user_if(
                     sock2, jumbo_frames=kwargs[u"jumbo"], queues=queues,
-                    queue_size=kwargs[u"perf_qemu_qsz"]
+                    queue_size=kwargs[u"perf_qemu_qsz"],
+                    csum=kwargs[u"enable_csum"], gso=kwargs[u"enable_gso"]
                 )
 
     def construct_vms_on_all_nodes(self, **kwargs):