From 305c50188851155207b41120e8c89fee4c5eeb63 Mon Sep 17 00:00:00 2001
From: treyad <treyad@viosoft.com>
Date: Thu, 15 Nov 2018 08:44:33 -0800
Subject: Add vIPSEC VNF for running Crypto performance test case

VNF life cycle
- instantiate
- collect_kpi
- terminate

JIRA: YARDSTICK-1484

Change-Id: I39fd24fdadbce6cee161c906fc95c16a36cb7cd8
Signed-off-by: treyad <treyad@viosoft.com>
---
 yardstick/network_services/helpers/cpu.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'yardstick/network_services/helpers/cpu.py')

diff --git a/yardstick/network_services/helpers/cpu.py b/yardstick/network_services/helpers/cpu.py
index 8c21754ff..8cdd829a0 100644
--- a/yardstick/network_services/helpers/cpu.py
+++ b/yardstick/network_services/helpers/cpu.py
@@ -33,11 +33,11 @@ class CpuSysCores(object):
         core_lines = {}
         for line in lines:
             if line.strip():
-                    name, value = line.split(":", 1)
-                    core_lines[name.strip()] = value.strip()
+                name, value = line.split(":", 1)
+                core_lines[name.strip()] = value.strip()
             else:
-                    core_details.append(core_lines)
-                    core_lines = {}
+                core_details.append(core_lines)
+                core_lines = {}
 
         return core_details
 
@@ -51,7 +51,7 @@ class CpuSysCores(object):
         lines = self._open_cpuinfo()
         core_details = self._get_core_details(lines)
         for core in core_details:
-            for k, v in core.items():
+            for k, _ in core.items():
                 if k == "physical id":
                     if core["physical id"] not in self.core_map:
                         self.core_map[core['physical id']] = []
@@ -60,6 +60,16 @@ class CpuSysCores(object):
 
         return self.core_map
 
+    def get_cpu_layout(self):
+        _, stdout, _ = self.connection.execute("lscpu -p")
+        cpuinfo = {}
+        cpuinfo['cpuinfo'] = list()
+        for line in stdout.split("\n"):
+            if line and line[0] != "#":
+                cpuinfo['cpuinfo'].append([CpuSysCores._str2int(x) for x in
+                                           line.split(",")])
+        return cpuinfo
+
     def validate_cpu_cfg(self, vnf_cfg=None):
         if vnf_cfg is None:
             vnf_cfg = {
@@ -78,3 +88,10 @@ class CpuSysCores(object):
                 return -1
 
         return 0
+
+    @staticmethod
+    def _str2int(string):
+        try:
+            return int(string)
+        except ValueError:
+            return 0
-- 
cgit 1.2.3-korg