CSIT-1493 VPP restart handling code

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

diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py
index 14cba48..60e1286 100644 (file)
--- a/resources/libraries/python/KubernetesUtils.py
+++ b/resources/libraries/python/KubernetesUtils.py
@@ -15,9 +15,9 @@
 
 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
+from resources.libraries.python.ssh import SSH, exec_cmd_no_error
 from resources.libraries.python.CpuUtils import CpuUtils
 from resources.libraries.python.VppConfigGenerator import VppConfigGenerator
 
@@ -33,6 +33,46 @@ class KubernetesUtils(object):
         """Initialize KubernetesUtils class."""
         pass
 
+    @staticmethod
+    def load_docker_image_on_node(node, image_path):
+        """Load Docker container image from file on node.
+
+        :param node: DUT node.
+        :param image_path: Container image path.
+        :type node: dict
+        :type image_path: str
+        :raises RuntimeError: If loading image failed on node.
+        """
+        command = 'docker load -i {image_path}'.\
+            format(image_path=image_path)
+        message = 'Failed to load Docker image on {node}.'.\
+            format(node=node['host'])
+        exec_cmd_no_error(node, command, timeout=240, sudo=True,
+                          message=message)
+
+        command = "docker rmi $(sudo docker images -f 'dangling=true' -q)".\
+            format(image_path=image_path)
+        message = 'Failed to clean Docker images on {node}.'.\
+            format(node=node['host'])
+        try:
+            exec_cmd_no_error(node, command, timeout=240, sudo=True,
+                              message=message)
+        except RuntimeError:
+            pass
+
+    @staticmethod
+    def load_docker_image_on_all_duts(nodes, image_path):
+        """Load Docker container image from file on all DUTs.
+
+        :param nodes: Topology nodes.
+        :param image_path: Container image path.
+        :type nodes: dict
+        :type image_path: str
+        """
+        for node in nodes.values():
+            if node['type'] == NodeType.DUT:
+                KubernetesUtils.load_docker_image_on_node(node, image_path)
+
     @staticmethod
     def setup_kubernetes_on_node(node):
         """Set up Kubernetes on node.
@@ -216,12 +256,12 @@ class KubernetesUtils(object):
 
         cmd = 'kubectl delete {nspace} {rtype} {name}'\
             .format(nspace=nspace, rtype=rtype, name=name)
-        (ret_code, _, _) = ssh.exec_command_sudo(cmd)
+        (ret_code, _, _) = ssh.exec_command_sudo(cmd, timeout=120)
         if int(ret_code) != 0:
             raise RuntimeError('Failed to delete Kubernetes resources '
                                'on {node}.'.format(node=node['host']))
 
-        cmd = 'kubectl get {nspace} pods -a --no-headers'\
+        cmd = 'kubectl get {nspace} pods --no-headers'\
             .format(nspace=nspace)
         for _ in range(MAX_RETRY):
             (ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd)
@@ -355,7 +395,7 @@ class KubernetesUtils(object):
         nspace = '-n {nspace}'.format(nspace=nspace) if nspace \
             else '--all-namespaces'
 
-        cmd = 'kubectl get {nspace} pods -a --no-headers' \
+        cmd = 'kubectl get {nspace} pods --no-headers' \
             .format(nspace=nspace)
         for _ in range(MAX_RETRY):
             (ret_code, stdout, _) = ssh.exec_command_sudo(cmd)
@@ -443,7 +483,6 @@ 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_heapsize('4G')
         vpp_config.add_ip_heap_size('4G')
         vpp_config.add_ip6_heap_size('4G')
@@ -453,14 +492,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):
@@ -496,4 +535,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'])