X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FKubernetesUtils.py;h=029d635c72e477e3fb300ca5c0e6309331d63633;hb=74bdfde76393764485cfb4667d94589468261dd4;hp=7a4784d42f3e86a06bb99933b68912f82c18d4d1;hpb=585bba1465e4fe2e83f6ff702c7db5af4f05d162;p=csit.git diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py index 7a4784d42f..029d635c72 100644 --- a/resources/libraries/python/KubernetesUtils.py +++ b/resources/libraries/python/KubernetesUtils.py @@ -15,7 +15,7 @@ from time import sleep -from resources.libraries.python.constants import Constants +from resources.libraries.python.Constants import Constants from resources.libraries.python.topology import NodeType from resources.libraries.python.ssh import SSH, exec_cmd_no_error from resources.libraries.python.CpuUtils import CpuUtils @@ -483,7 +483,7 @@ class KubernetesUtils(object): vpp_config.set_node(kwargs['node']) vpp_config.add_unix_cli_listen(value='0.0.0.0:5002') vpp_config.add_unix_nodaemon() - vpp_config.add_dpdk_socketmem('1024,1024') + vpp_config.add_socksvr() vpp_config.add_heapsize('4G') vpp_config.add_ip_heap_size('4G') vpp_config.add_ip6_heap_size('4G') @@ -493,14 +493,14 @@ class KubernetesUtils(object): vpp_config.add_dpdk_no_tx_checksum_offload() vpp_config.add_dpdk_dev_default_rxq(kwargs['rxq_count_int']) vpp_config.add_dpdk_dev(kwargs['if1'], kwargs['if2']) - vpp_config.add_dpdk_num_mbufs(kwargs['num_mbufs_int']) + vpp_config.add_buffers_per_numa(kwargs['buffers_per_numa']) # We will pop first core from list to be main core vpp_config.add_cpu_main_core(str(cpuset_main.pop(0))) # if this is not only core in list, the rest will be used as workers. if cpuset_cpus: corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus) vpp_config.add_cpu_corelist_workers(corelist_workers) - vpp_config.apply_config(filename=kwargs['filename'], restart_vpp=False) + vpp_config.write_config(filename=kwargs['filename']) @staticmethod def create_kubernetes_vnf_startup_config(**kwargs): @@ -529,6 +529,7 @@ class KubernetesUtils(object): vpp_config.set_node(kwargs['node']) vpp_config.add_unix_cli_listen(value='0.0.0.0:5002') vpp_config.add_unix_nodaemon() + vpp_config.add_socksvr() # We will pop first core from list to be main core vpp_config.add_cpu_main_core(str(cpuset_main.pop(0))) # if this is not only core in list, the rest will be used as workers. @@ -536,4 +537,4 @@ class KubernetesUtils(object): corelist_workers = ','.join(str(cpu) for cpu in cpuset_cpus) vpp_config.add_cpu_corelist_workers(corelist_workers) vpp_config.add_plugin('disable', 'dpdk_plugin.so') - vpp_config.apply_config(filename=kwargs['filename'], restart_vpp=False) + vpp_config.write_config(filename=kwargs['filename'])