1 files changed, 29 insertions, 41 deletions

diff --git a/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py b/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
index 02a85525a..0223fd3ff 100644
--- a/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
+++ b/yardstick/tests/unit/benchmark/contexts/standalone/test_ovs_dpdk.py
@@ -26,14 +26,6 @@ class OvsDpdkContextTestCase(unittest.TestCase):
     NODES_ovs_dpdk_SAMPLE = "nodes_ovs_dpdk_sample.yaml"
     NODES_DUPLICATE_SAMPLE = "nodes_duplicate_sample.yaml"
 
-    ATTRS = {
-        'name': 'StandaloneOvsDpdk',
-        'file': 'pod',
-        'flavor': {},
-        'servers': {},
-        'networks': {},
-    }
-
     NETWORKS = {
         'mgmt': {'cidr': '152.16.100.10/24'},
         'private_0': {
@@ -55,7 +47,17 @@ class OvsDpdkContextTestCase(unittest.TestCase):
     }
 
     def setUp(self):
+        self.attrs = {
+            'name': 'foo',
+            'task_id': '1234567890',
+            'file': self._get_file_abspath(self.NODES_ovs_dpdk_SAMPLE)
+        }
         self.ovs_dpdk = ovs_dpdk.OvsDpdkContext()
+        self.addCleanup(self._remove_contexts)
+
+    def _remove_contexts(self):
+        if self.ovs_dpdk in self.ovs_dpdk.list:
+            self.ovs_dpdk._delete_context()
 
     @mock.patch('yardstick.benchmark.contexts.standalone.model.Server')
     @mock.patch('yardstick.benchmark.contexts.standalone.model.StandaloneContextHelper')
@@ -66,9 +68,18 @@ class OvsDpdkContextTestCase(unittest.TestCase):
         self.assertTrue(self.ovs_dpdk.first_run)
 
     def test_init(self):
+        ATTRS = {
+            'name': 'StandaloneOvsDpdk',
+            'task_id': '1234567890',
+            'file': 'pod',
+            'flavor': {},
+            'servers': {},
+            'networks': {},
+        }
+
         self.ovs_dpdk.helper.parse_pod_file = mock.Mock(
             return_value=[{}, {}, {}])
-        self.assertIsNone(self.ovs_dpdk.init(self.ATTRS))
+        self.assertIsNone(self.ovs_dpdk.init(ATTRS))
 
     def test_setup_ovs(self):
         with mock.patch("yardstick.ssh.SSH") as ssh:
@@ -186,12 +197,7 @@ class OvsDpdkContextTestCase(unittest.TestCase):
 
     def test__get_server_with_dic_attr_name(self):
 
-        attrs = {
-            'name': 'foo',
-            'file': self._get_file_abspath(self.NODES_ovs_dpdk_SAMPLE)
-        }
-
-        self.ovs_dpdk.init(attrs)
+        self.ovs_dpdk.init(self.attrs)
 
         attr_name = {'name': 'foo.bar'}
         result = self.ovs_dpdk._get_server(attr_name)
@@ -200,14 +206,9 @@ class OvsDpdkContextTestCase(unittest.TestCase):
 
     def test__get_server_not_found(self):
 
-        attrs = {
-            'name': 'foo',
-            'file': self._get_file_abspath(self.NODES_ovs_dpdk_SAMPLE)
-        }
-
         self.ovs_dpdk.helper.parse_pod_file = mock.Mock(
             return_value=[{}, {}, {}])
-        self.ovs_dpdk.init(attrs)
+        self.ovs_dpdk.init(self.attrs)
 
         attr_name = 'bar.foo'
         result = self.ovs_dpdk._get_server(attr_name)
@@ -216,12 +217,7 @@ class OvsDpdkContextTestCase(unittest.TestCase):
 
     def test__get_server_mismatch(self):
 
-        attrs = {
-            'name': 'foo',
-            'file': self._get_file_abspath(self.NODES_ovs_dpdk_SAMPLE)
-        }
-
-        self.ovs_dpdk.init(attrs)
+        self.ovs_dpdk.init(self.attrs)
 
         attr_name = 'bar.foo1'
         result = self.ovs_dpdk._get_server(attr_name)
@@ -230,31 +226,23 @@ class OvsDpdkContextTestCase(unittest.TestCase):
 
     def test__get_server_duplicate(self):
 
-        attrs = {
-            'name': 'foo',
-            'file': self._get_file_abspath(self.NODES_DUPLICATE_SAMPLE)
-        }
+        self.attrs['file'] = self._get_file_abspath(self.NODES_DUPLICATE_SAMPLE)
 
-        self.ovs_dpdk.init(attrs)
+        self.ovs_dpdk.init(self.attrs)
 
-        attr_name = 'node1.foo'
+        attr_name = 'node1.foo-12345678'
         with self.assertRaises(ValueError):
             self.ovs_dpdk._get_server(attr_name)
 
     def test__get_server_found(self):
 
-        attrs = {
-            'name': 'foo',
-            'file': self._get_file_abspath(self.NODES_ovs_dpdk_SAMPLE)
-        }
-
-        self.ovs_dpdk.init(attrs)
+        self.ovs_dpdk.init(self.attrs)
 
-        attr_name = 'node1.foo'
+        attr_name = 'node1.foo-12345678'
         result = self.ovs_dpdk._get_server(attr_name)
 
         self.assertEqual(result['ip'], '10.229.47.137')
-        self.assertEqual(result['name'], 'node1.foo')
+        self.assertEqual(result['name'], 'node1.foo-12345678')
         self.assertEqual(result['user'], 'root')
         self.assertEqual(result['key_filename'], '/root/.yardstick_key')