diff options
author | QiLiang <liangqi1@huawei.com> | 2015-10-21 12:29:53 +0000 |
---|---|---|
committer | QiLiang <liangqi1@huawei.com> | 2015-10-27 03:34:28 +0000 |
commit | 2e1094d4aee93180126d3ce86db3cc7df2e87bc5 (patch) | |
tree | 221e98fd325ff6fcb4fbbb3e656a3789f3a77342 /tests/unit/benchmark/scenarios/networking/test_netperf.py | |
parent | 884926d05f435217c7dac038b3bfbd7e9d05826b (diff) |
Heat context code refactor part 2
Heat context code refactor to cater for the evolution of the
Yardstick framework.
Refactor runner_cfg host/target info handle, as specified at
https://etherpad.opnfv.org/p/yardstick_framework
step 4. Get general Context info (use Context.get).
Before this refactor host and target vm must have the same user name
and ssh key, that is not general enough for later extension.
test_case.yaml do NOT need to change.
JIRA: YARDSTICK-168
Change-Id: I5cfe868f3c6f633214ef550bc9676fe1de0709db
Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'tests/unit/benchmark/scenarios/networking/test_netperf.py')
-rwxr-xr-x | tests/unit/benchmark/scenarios/networking/test_netperf.py | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/tests/unit/benchmark/scenarios/networking/test_netperf.py b/tests/unit/benchmark/scenarios/networking/test_netperf.py index 4bb5983c3..3f224733c 100755 --- a/tests/unit/benchmark/scenarios/networking/test_netperf.py +++ b/tests/unit/benchmark/scenarios/networking/test_netperf.py @@ -24,15 +24,22 @@ class NetperfTestCase(unittest.TestCase): def setUp(self): self.ctx = { - 'host': '172.16.0.137', - 'target': '172.16.0.138', - 'user': 'cirros', - 'key_filename': "mykey.key" + 'host': { + 'ip': '172.16.0.137', + 'user': 'cirros', + 'key_filename': 'mykey.key' + }, + 'target': { + 'ip': '172.16.0.138', + 'user': 'cirros', + 'key_filename': 'mykey.key', + 'ipaddr': '172.16.0.138' + } } def test_netperf_successful_setup(self, mock_ssh): - p = netperf.Netperf(self.ctx) + p = netperf.Netperf({}, self.ctx) mock_ssh.SSH().execute.return_value = (0, '', '') p.setup() @@ -42,26 +49,22 @@ class NetperfTestCase(unittest.TestCase): def test_netperf_successful_no_sla(self, mock_ssh): - p = netperf.Netperf(self.ctx) - mock_ssh.SSH().execute.return_value = (0, '', '') - p.host = mock_ssh.SSH() - options = {} args = {'options': options} result = {} + p = netperf.Netperf(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + sample_output = self._read_sample_output() mock_ssh.SSH().execute.return_value = (0, sample_output, '') expected_result = json.loads(sample_output) - p.run(args, result) + p.run(result) self.assertEqual(result, expected_result) def test_netperf_successful_sla(self, mock_ssh): - p = netperf.Netperf(self.ctx) - mock_ssh.SSH().execute.return_value = (0, '', '') - p.host = mock_ssh.SSH() - options = {} args = { 'options': options, @@ -69,18 +72,18 @@ class NetperfTestCase(unittest.TestCase): } result = {} + p = netperf.Netperf(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + sample_output = self._read_sample_output() mock_ssh.SSH().execute.return_value = (0, sample_output, '') expected_result = json.loads(sample_output) - p.run(args, result) + p.run(result) self.assertEqual(result, expected_result) def test_netperf_unsuccessful_sla(self, mock_ssh): - p = netperf.Netperf(self.ctx) - mock_ssh.SSH().execute.return_value = (0, '', '') - p.host = mock_ssh.SSH() - options = {} args = { 'options': options, @@ -88,22 +91,26 @@ class NetperfTestCase(unittest.TestCase): } result = {} + p = netperf.Netperf(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + sample_output = self._read_sample_output() mock_ssh.SSH().execute.return_value = (0, sample_output, '') - self.assertRaises(AssertionError, p.run, args, result) + self.assertRaises(AssertionError, p.run, result) def test_netperf_unsuccessful_script_error(self, mock_ssh): - p = netperf.Netperf(self.ctx) - mock_ssh.SSH().execute.return_value = (0, '', '') - p.host = mock_ssh.SSH() - options = {} args = {'options': options} result = {} + p = netperf.Netperf(args, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH() + mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR') - self.assertRaises(RuntimeError, p.run, args, result) + self.assertRaises(RuntimeError, p.run, result) def _read_sample_output(self): curr_path = os.path.dirname(os.path.abspath(__file__)) |