From: Jing Lu <lvjing5@huawei.com>
Date: Tue, 14 Feb 2017 06:04:53 +0000 (+0000)
Subject: Merge "vnf_generic: convert sshmanager to class"
X-Git-Tag: danube.1.0~92
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bb3d222fffdd525320d7ac1e28e170e17d26a0dc;p=yardstick.git

Merge "vnf_generic: convert sshmanager to class"
---

bb3d222fffdd525320d7ac1e28e170e17d26a0dc
diff --cc tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index f40b8234f,9b7174e7e..1b02b6eff
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@@ -18,14 -18,12 +18,14 @@@
  # Unittest for yardstick.benchmark.scenarios.networking.test_vnf_generic
  
  from __future__ import absolute_import
 +
 +import os
  import unittest
 +
  import mock
 -import os
  
  from yardstick.benchmark.scenarios.networking.vnf_generic import \
-     ssh_manager, NetworkServiceTestCase, IncorrectConfig, IncorrectSetup
+     SshManager, NetworkServiceTestCase, IncorrectConfig, IncorrectSetup
  from yardstick.network_services.collector.subscriber import Collector
  from yardstick.network_services.vnf_generic.vnf.base import \
      GenericTrafficGen, GenericVNF
@@@ -315,10 -301,10 +315,10 @@@ class TestNetworkServiceTestCase(unitte
          with mock.patch("yardstick.ssh.SSH") as ssh:
              ssh_mock = mock.Mock(autospec=ssh.SSH)
              ssh_mock.execute = \
 -                mock.Mock(return_value=(0, SYS_CLASS_NET+IP_ADDR_SHOW, ""))
 +                mock.Mock(return_value=(0, SYS_CLASS_NET + IP_ADDR_SHOW, ""))
              ssh.return_value = ssh_mock
              for node, node_dict in self.context_cfg["nodes"].items():
-                 with ssh_manager(node_dict) as conn:
+                 with SshManager(node_dict) as conn:
                      self.assertIsNotNone(conn)
  
      def test___init__(self):