Fix install_dvs_plugin method.

-fix install_dvs_plugin method according
 to change in fuel-qa master branch.

Change-Id: Id549542a283c1092c09de43a7204e85dba85135c

plugin_test/helpers/plugin.py

@@ -17,7 +17,7 @@ import os
 
 from fuelweb_test import logger
 
-from fuelweb_test.helpers import checkers
+from fuelweb_test.helpers import utils
 
 from proboscis.asserts import assert_true
 
@@ -33,14 +33,14 @@ plugin_name = "fuel-plugin-vmware-dvs"
 def install_dvs_plugin(master_node):
     """Download and instal DVS plugin on master node."""
     # copy plugins to the master node
-    checkers.upload_tarball(
+    utils.upload_tarball(
         master_node,
         DVS_PLUGIN_PATH, "/var")
 
     # install plugin
-    checkers.install_plugin_check_code(
+    utils.install_plugin_check_code(
         master_node,
-        plugin=os.path.basename(DVS_PLUGIN_PATH))
+        os.path.basename(DVS_PLUGIN_PATH))
 
 
 def enable_plugin(cluster_id, fuel_web_client, multiclusters=True):

plugin_test/tests/test_plugin_vmware_dvs_destructive.py

@@ -33,7 +33,6 @@ from fuelweb_test.settings import SERVTEST_USERNAME
 
 from fuelweb_test.tests.base_test_case import SetupEnvironment
 from fuelweb_test.tests.base_test_case import TestBasic
-from tests.test_plugin_vmware_dvs_system import TestDVSSystem
 
 from helpers import openstack
 from helpers import plugin
@@ -43,6 +42,8 @@ from proboscis import test
 
 from proboscis.asserts import assert_true
 
+from tests.test_plugin_vmware_dvs_system import TestDVSSystem
+
 
 @test(groups=["plugins", 'dvs_vcenter_plugin', 'dvs_vcenter_system'])
 class TestDVSDestructive(TestBasic):
@@ -317,8 +318,7 @@ class TestDVSDestructive(TestBasic):
         """
         self.env.revert_snapshot("ready_with_5_slaves")
 
-        plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+        plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
 
         # Configure cluster with 2 vcenter clusters and vcenter glance
         cluster_id = self.fuel_web.create_cluster(
@@ -534,8 +534,7 @@ class TestDVSDestructive(TestBasic):
         self.env.revert_snapshot("ready_with_5_slaves")
 
         self.show_step(1)
-        plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+        plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
 
         self.show_step(2)
         cluster_id = self.fuel_web.create_cluster(
@@ -632,8 +631,7 @@ class TestDVSDestructive(TestBasic):
         """
         self.env.revert_snapshot("ready_with_5_slaves")
 
-        plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+        plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
 
         # Configure cluster with 2 vcenter clusters and vcenter glance
         cluster_id = self.fuel_web.create_cluster(

plugin_test/tests/test_plugin_vmware_dvs_smoke.py

@@ -72,7 +72,7 @@ class TestDVSSmoke(TestBasic):
         self.env.revert_snapshot("ready_with_1_slaves")
 
         plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+            self.ssh_manager.admin_ip)
 
         # Configure cluster with 2 vcenter clusters
         cluster_id = self.fuel_web.create_cluster(
@@ -139,7 +139,7 @@ class TestDVSSmoke(TestBasic):
         self.env.revert_snapshot("ready_with_9_slaves")
 
         plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+            self.ssh_manager.admin_ip)
 
         # Configure cluster with 2 vcenter clusters and vcenter glance
         cluster_id = self.fuel_web.create_cluster(
@@ -204,7 +204,7 @@ class TestDVSSmoke(TestBasic):
         self.show_step(1)
         self.show_step(2)
         plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+            self.ssh_manager.admin_ip)
 
         cmd = 'fuel plugins list'
 

plugin_test/tests/test_plugin_vmware_dvs_system.py

@@ -91,8 +91,7 @@ class TestDVSSystem(TestBasic):
 
         self.show_step(1)
         self.show_step(2)
-        plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+        plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
 
         self.show_step(3)
         cluster_id = self.fuel_web.create_cluster(
@@ -893,7 +892,7 @@ class TestDVSSystem(TestBasic):
         self.show_step(1)
         self.show_step(2)
         self.env.revert_snapshot("ready_with_5_slaves")
-        plugin.install_dvs_plugin(self.env.d_env.get_admin_remote())
+        plugin.install_dvs_plugin(self.ssh_manager.admin_ip)
 
         self.show_step(3)
         cluster_id = self.fuel_web.create_cluster(

plugin_test/tests/test_plugin_vmware_dvs_templates.py

@@ -83,7 +83,7 @@ class TestNetworkTemplates(TestNetworkTemplatesBase, TestBasic):
         self.env.revert_snapshot("ready_with_9_slaves")
 
         plugin.install_dvs_plugin(
-            self.env.d_env.get_admin_remote())
+            self.ssh_manager.admin_ip)
 
         cluster_id = self.fuel_web.create_cluster(
             name=self.__class__.__name__,