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>

1 files changed, 22 insertions, 21 deletions

diff --git a/tests/unit/benchmark/scenarios/networking/test_ping.py b/tests/unit/benchmark/scenarios/networking/test_ping.py
index b2c5b9859..3a897d0f8 100644
--- a/tests/unit/benchmark/scenarios/networking/test_ping.py
+++ b/tests/unit/benchmark/scenarios/networking/test_ping.py
@@ -21,71 +21,72 @@ class PingTestCase(unittest.TestCase):
 
     def setUp(self):
         self.ctx = {
-            'host': '172.16.0.137',
-            'user': 'cirros',
-            'key_filename': "mykey.key"
+            'host': {
+                'ip': '172.16.0.137',
+                'user': 'cirros',
+                'key_filename': "mykey.key"
+            },
+            "target": {
+                "ipaddr": "10.229.17.105",
             }
+        }
 
     @mock.patch('yardstick.benchmark.scenarios.networking.ping.ssh')
     def test_ping_successful_no_sla(self, mock_ssh):
 
-        p = ping.Ping(self.ctx)
-
         args = {
             'options': {'packetsize': 200},
-            'ipaddr': '172.16.0.138'
             }
         result = {}
 
+        p = ping.Ping(args, self.ctx)
+
         mock_ssh.SSH().execute.return_value = (0, '100', '')
-        p.run(args, result)
+        p.run(result)
         self.assertEqual(result, {'rtt': 100.0})
 
     @mock.patch('yardstick.benchmark.scenarios.networking.ping.ssh')
     def test_ping_successful_sla(self, mock_ssh):
 
-        p = ping.Ping(self.ctx)
-
         args = {
             'options': {'packetsize': 200},
-            'ipaddr': '172.16.0.138',
             'sla': {'max_rtt': 150}
             }
         result = {}
 
+        p = ping.Ping(args, self.ctx)
+
         mock_ssh.SSH().execute.return_value = (0, '100', '')
-        p.run(args, result)
+        p.run(result)
         self.assertEqual(result, {'rtt': 100.0})
 
     @mock.patch('yardstick.benchmark.scenarios.networking.ping.ssh')
     def test_ping_unsuccessful_sla(self, mock_ssh):
 
-        p = ping.Ping(self.ctx)
-
         args = {
             'options': {'packetsize': 200},
-            'ipaddr': '172.16.0.138',
             'sla': {'max_rtt': 50}
-            }
+        }
         result = {}
 
+        p = ping.Ping(args, self.ctx)
+
         mock_ssh.SSH().execute.return_value = (0, '100', '')
-        self.assertRaises(AssertionError, p.run, args, result)
+        self.assertRaises(AssertionError, p.run, result)
 
     @mock.patch('yardstick.benchmark.scenarios.networking.ping.ssh')
     def test_ping_unsuccessful_script_error(self, mock_ssh):
 
-        p = ping.Ping(self.ctx)
-
         args = {
             'options': {'packetsize': 200},
-            'ipaddr': '172.16.0.138',
             'sla': {'max_rtt': 50}
-            }
+        }
         result = {}
 
+        p = ping.Ping(args, self.ctx)
+
         mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, p.run, args, result)
+        self.assertRaises(RuntimeError, p.run, result)
 
 
 def main():