Merge "Add ODL HA testcase"

[yardstick.git] / tests / unit / network_services / vnf_generic / vnf / test_tg_ping.py

diff --git a/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py b/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py
index c1b2d27..91a353d 100644 (file)
--- a/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py
+++ b/tests/unit/network_services/vnf_generic/vnf/test_tg_ping.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 # Copyright (c) 2016-2017 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,7 +34,7 @@ if stl_patch:
     from yardstick.network_services.vnf_generic.vnf.tg_ping import PingTrafficGen
     from yardstick.network_services.vnf_generic.vnf.tg_ping import PingResourceHelper
     from yardstick.network_services.vnf_generic.vnf.tg_ping import PingSetupEnvHelper
-    from yardstick.network_services.vnf_generic.vnf.sample_vnf import VnfSshHelper
+    from yardstick.network_services.vnf_generic.vnf.vnf_ssh_helper import VnfSshHelper
 
 
 class TestPingResourceHelper(unittest.TestCase):
@@ -80,7 +78,7 @@ class TestPingParser(unittest.TestCase):
         ping_parser = PingParser(q_out)
         ping_parser.write(sample_out)
         ping_parser.clear()
-        self.assertEqual(True, q_out.empty())
+        self.assertTrue(q_out.empty())
 
     def test_close(self):
         q_out = Queue()
@@ -228,7 +226,7 @@ class TestPingTrafficGen(unittest.TestCase):
     CMD_KWARGS = {
         'target_ip': u'152.16.100.20',
         'local_ip': u'152.16.100.19',
-        'local_if_name': u'xe0',
+        'local_if_name': u'xe0_fake',
     }
 
     @mock.patch("yardstick.ssh.SSH")
@@ -238,7 +236,7 @@ class TestPingTrafficGen(unittest.TestCase):
 
         self.assertIsInstance(ping_traffic_gen.setup_helper, PingSetupEnvHelper)
         self.assertIsInstance(ping_traffic_gen.resource_helper, PingResourceHelper)
-        self.assertEquals(ping_traffic_gen._result, {})
+        self.assertEqual(ping_traffic_gen._result, {})
 
     @mock.patch("yardstick.ssh.SSH")
     def test__bind_device_kernel_with_failure(self, ssh):
@@ -270,7 +268,7 @@ class TestPingTrafficGen(unittest.TestCase):
         mock_ssh(ssh, spec=VnfSshHelper, exec_result=(0, "success", ""))
         ping_traffic_gen = PingTrafficGen('vnf1', self.VNFD_0)
         ping_traffic_gen.setup_helper.ssh_helper = mock.MagicMock(
-            **{"execute.return_value": (0, "success", "")})
+            **{"execute.return_value": (0, "xe0_fake", "")})
         self.assertIsInstance(ping_traffic_gen.ssh_helper, mock.Mock)
         self.assertEqual(ping_traffic_gen._result, {})
 
@@ -278,23 +276,14 @@ class TestPingTrafficGen(unittest.TestCase):
 
         self.assertEqual(
             ping_traffic_gen.vnfd_helper.interfaces[0]['virtual-interface']['local_iface_name'],
-            'success')
+            'xe0_fake')
         self.assertEqual(self.CMD_KWARGS, ping_traffic_gen.resource_helper.cmd_kwargs)
         self.assertIsNotNone(ping_traffic_gen._result)
 
-    @mock.patch("yardstick.ssh.SSH")
-    def test_listen_traffic(self, ssh):
+    def test_listen_traffic(self):
         ping_traffic_gen = PingTrafficGen('vnf1', self.VNFD_0)
         self.assertIsNone(ping_traffic_gen.listen_traffic({}))
 
-    @mock.patch("yardstick.ssh.SSH")
-    def test_scale_negative(self, ssh):
-        ssh.from_node.return_value.execute.return_value = 0, "success", ""
-        ssh.from_node.return_value.run.return_value = 0, "success", ""
-
-        ping_traffic_gen = PingTrafficGen('vnf1', self.VNFD_0)
-        ping_traffic_gen.scale()
-
     @mock.patch("yardstick.ssh.SSH")
     def test_terminate(self, ssh):
         ssh.from_node.return_value.execute.return_value = 0, "success", ""