Merge "vnfdgen: replace yaml.load with yaml.safe_load"

[yardstick.git] / tests / unit / benchmark / scenarios / networking / test_ping.py

diff --git a/tests/unit/benchmark/scenarios/networking/test_ping.py b/tests/unit/benchmark/scenarios/networking/test_ping.py
index d930adc..0635324 100644 (file)
--- a/tests/unit/benchmark/scenarios/networking/test_ping.py
+++ b/tests/unit/benchmark/scenarios/networking/test_ping.py
@@ -11,6 +11,7 @@
 
 # Unittest for yardstick.benchmark.scenarios.networking.ping.Ping
 
+from __future__ import absolute_import
 import mock
 import unittest
 
@@ -21,67 +22,76 @@ 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'
-            }
+            'target': 'ares.demo'
+        }
+        result = {}
+
+        p = ping.Ping(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (0, '100', '')
-        result = p.run(args)
-        self.assertEqual(result, float(mock_ssh.SSH().execute.return_value[1]))
+        mock_ssh.SSH.from_node().execute.return_value = (0, '100', '')
+        p.run(result)
+        self.assertEqual(result, {'rtt.ares': 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}
-            }
+            'sla': {'max_rtt': 150},
+            'target': 'ares.demo'
+        }
+        result = {}
+
+        p = ping.Ping(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (0, '100', '')
-        result = p.run(args)
-        self.assertEqual(result, float(mock_ssh.SSH().execute.return_value[1]))
+        mock_ssh.SSH.from_node().execute.return_value = (0, '100', '')
+        p.run(result)
+        self.assertEqual(result, {'rtt.ares': 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}
-            }
+            'sla': {'max_rtt': 50},
+            'target': 'ares.demo'
+        }
+        result = {}
+
+        p = ping.Ping(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (0, '100', '')
-        self.assertRaises(AssertionError, p.run, args)
+        mock_ssh.SSH.from_node().execute.return_value = (0, '100', '')
+        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}
-            }
+            'sla': {'max_rtt': 50},
+            'target': 'ares.demo'
+        }
+        result = {}
+
+        p = ping.Ping(args, self.ctx)
 
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, p.run, args)
+        mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
+        self.assertRaises(RuntimeError, p.run, result)
 
 
 def main():