X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Funit%2Fbenchmark%2Fscenarios%2Fnetworking%2Ftest_netperf_node.py;h=62874cc44bfbfa990ebf444457a655a94f80b00e;hb=99abbb424007da2e01762f3c040a39c0157cbe1f;hp=1c39b292b26a8cddc4fc1986b65f20b825c12457;hpb=1d7bdc10b32892539f8bf69eb9631918d34ffd61;p=yardstick.git

diff --git a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
index 1c39b292b..62874cc44 100755
--- a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
+++ b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
@@ -12,10 +12,13 @@
 # Unittest for
 # yardstick.benchmark.scenarios.networking.netperf_node.NetperfNode
 
-import mock
-import unittest
+from __future__ import absolute_import
+
 import os
-import json
+import unittest
+
+import mock
+from oslo_serialization import jsonutils
 
 from yardstick.benchmark.scenarios.networking import netperf_node
 
@@ -40,7 +43,7 @@ class NetperfNodeTestCase(unittest.TestCase):
     def test_netperf_node_successful_setup(self, mock_ssh):
 
         p = netperf_node.NetperfNode({}, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
 
         p.setup()
         self.assertIsNotNone(p.server)
@@ -54,12 +57,12 @@ class NetperfNodeTestCase(unittest.TestCase):
         result = {}
 
         p = netperf_node.NetperfNode(args, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
-        p.host = mock_ssh.SSH()
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
+        p.host = mock_ssh.SSH.from_node()
 
         sample_output = self._read_sample_output()
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
-        expected_result = json.loads(sample_output)
+        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
+        expected_result = jsonutils.loads(sample_output)
         p.run(result)
         self.assertEqual(result, expected_result)
 
@@ -73,12 +76,12 @@ class NetperfNodeTestCase(unittest.TestCase):
         result = {}
 
         p = netperf_node.NetperfNode(args, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
-        p.host = mock_ssh.SSH()
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
+        p.host = mock_ssh.SSH.from_node()
 
         sample_output = self._read_sample_output()
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
-        expected_result = json.loads(sample_output)
+        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
+        expected_result = jsonutils.loads(sample_output)
         p.run(result)
         self.assertEqual(result, expected_result)
 
@@ -92,11 +95,11 @@ class NetperfNodeTestCase(unittest.TestCase):
         result = {}
 
         p = netperf_node.NetperfNode(args, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
-        p.host = mock_ssh.SSH()
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
+        p.host = mock_ssh.SSH.from_node()
 
         sample_output = self._read_sample_output()
-        mock_ssh.SSH().execute.return_value = (0, sample_output, '')
+        mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
         self.assertRaises(AssertionError, p.run, result)
 
     def test_netperf_node_unsuccessful_script_error(self, mock_ssh):
@@ -106,10 +109,10 @@ class NetperfNodeTestCase(unittest.TestCase):
         result = {}
 
         p = netperf_node.NetperfNode(args, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
-        p.host = mock_ssh.SSH()
+        mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
+        p.host = mock_ssh.SSH.from_node()
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
+        mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
         self.assertRaises(RuntimeError, p.run, result)
 
     def _read_sample_output(self):