Replace deprecated constants by direct usage

self.d_env.admin_net = 'admin'
'nat_interface' = ''
This patch is reduces warnings amount during
tests run on fuel-devops 3.0.3+

Change-Id: I2bf54952bff79b9483c121a78383e136bcd2a351

fuelweb_test/models/environment.py

@@ -149,9 +149,7 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
     @logwrap
     def get_admin_node_ip(self):
         return str(
-            self.d_env.nodes(
-            ).admin.get_ip_address_by_network_name(
-                self.d_env.admin_net))
+            self.d_env.nodes().admin.get_ip_address_by_network_name('admin'))
 
     @logwrap
     def get_ebtables(self, cluster_id, devops_nodes):
@@ -163,14 +161,12 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
         params = {
             'device_label': settings.ISO_LABEL,
             'iface': iface_alias('eth0'),
-            'ip': node.get_ip_address_by_network_name(
-                self.d_env.admin_net),
-            'mask': self.d_env.get_network(
-                name=self.d_env.admin_net).ip.netmask,
+            'ip': node.get_ip_address_by_network_name('admin'),
+            'mask': self.d_env.get_network(name='admin').ip.netmask,
             'gw': self.d_env.router(),
             'hostname': ''.join((settings.FUEL_MASTER_HOSTNAME,
                                  settings.DNS_SUFFIX)),
-            'nat_interface': self.d_env.nat_interface,
+            'nat_interface': '',
             'nameserver': settings.DNS,
             'showmenu': 'yes' if settings.SHOW_FUELMENU else 'no',
             'wait_for_external_config': 'yes',
@@ -242,7 +238,7 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
         self.ssh_manager.clean_all_connections()
 
         try:
-            admin.await(self.d_env.admin_net, timeout=30, by_port=8000)
+            admin.await('admin', timeout=30, by_port=8000)
         except Exception as e:
             logger.warning("From first time admin isn't reverted: "
                            "{0}".format(e))
@@ -252,7 +248,7 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
 
             admin.start()
             logger.info('Admin node started second time.')
-            self.d_env.nodes().admin.await(self.d_env.admin_net)
+            self.d_env.nodes().admin.await('admin')
             self.set_admin_ssh_password()
             self.admin_actions.wait_for_fuel_ready(timeout=600)
 
@@ -473,7 +469,7 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
         wait_pass(lambda: tcp_ping_(
             self.d_env.nodes(
             ).admin.get_ip_address_by_network_name
-            (self.d_env.admin_net), 22), timeout=timeout)
+            ('admin'), 22), timeout=timeout)
 
     @logwrap
     def wait_for_fuelmenu(self,
@@ -483,9 +479,9 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
             """Try to close fuelmenu and check ssh connection"""
             try:
                 tcp_ping_(
-                    self.d_env.nodes(
-                    ).admin.get_ip_address_by_network_name
-                    (self.d_env.admin_net), 22)
+                    self.d_env.nodes().admin.get_ip_address_by_network_name(
+                        'admin'),
+                    22)
             except Exception:
                 #  send F8 trying to exit fuelmenu
                 self.d_env.nodes().admin.send_keys("<F8>\n")

fuelweb_test/tests/tests_strength/test_master_node_failover.py

@@ -36,7 +36,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
         self.env.d_env.nodes().admin.resume()
         try:
             self.env.d_env.nodes().admin.await(
-                self.env.d_env.admin_net, timeout=60, by_port=8000)
+                'admin', timeout=60, by_port=8000)
         except Exception as e:
             logger.warning(
                 "From first time admin isn't reverted: {0}".format(e))
@@ -45,7 +45,7 @@ class DeployHAOneControllerMasterNodeFail(base_test_case.TestBasic):
             time.sleep(10)
             self.env.d_env.nodes().admin.start()
             logger.info('Admin node started second time.')
-            self.env.d_env.nodes().admin.await(self.env.d_env.admin_net)
+            self.env.d_env.nodes().admin.await('admin')
             self.env.set_admin_ssh_password()
             self.env.admin_actions.wait_for_fuel_ready(
                 timeout=600)

system_test/actions/base.py

@@ -24,6 +24,7 @@ from proboscis import SkipTest
 from proboscis.asserts import assert_equal
 from proboscis.asserts import assert_true
 # pylint: disable=redefined-builtin
+# noinspection PyUnresolvedReferences
 from six.moves import xrange
 # pylint: enable=redefined-builtin
 
@@ -47,6 +48,7 @@ from system_test.helpers.decorators import make_snapshot_if_step_fail
 
 
 # pylint: disable=no-member
+# noinspection PyUnresolvedReferences
 class PrepareActions(object):
     """Base class with prepare actions
 
@@ -146,12 +148,11 @@ class PrepareActions(object):
             os.path.dirname(fuelweb_test.__file__),
             'cloud_image_settings/cloud_settings.iso')
 
-        admin_net_object = self.env.d_env.get_network(
-            name=self.env.d_env.admin_net)
+        admin_net_object = self.env.d_env.get_network(name='admin')
         admin_network = admin_net_object.ip.network
         admin_netmask = admin_net_object.ip.netmask
         admin_ip = str(self.env.d_env.nodes(
-        ).admin.get_ip_address_by_network_name(self.env.d_env.admin_net))
+        ).admin.get_ip_address_by_network_name('admin'))
         interface_name = settings.iface_alias("eth0")
         gateway = self.env.d_env.router()
         dns = settings.DNS
@@ -227,6 +228,7 @@ class PrepareActions(object):
         snapshot_name = "ready_with_{}_slaves".format(slaves)
         self.env.revert_snapshot(snapshot_name)
 
+    # noinspection PyMethodParameters
     @nested_action
     def prepare_admin_node_with_slaves():
         """Combine preparation steps in alias"""
@@ -372,7 +374,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
 
         """
         if self.cluster_id is None:
-            raise SkipTest()
+            raise SkipTest(
+                "The cluster_id is not specified, can not add node to cluster"
+            )
 
         self._add_node(self.env_config['nodes'])
 
@@ -385,7 +389,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
 
         """
         if self.cluster_id is None:
-            raise SkipTest()
+            raise SkipTest(
+                "The cluster_id is not specified, can not run the deploy"
+            )
 
         self.fuel_web.deploy_cluster_wait(self.cluster_id)
 
@@ -394,7 +400,9 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
     def stop_on_deploy(self):
         """Stop environment deploying and wait while slave bacame online"""
         if self.cluster_id is None:
-            raise SkipTest()
+            raise SkipTest(
+                "The cluster_id is not specified, can not stop the deploy"
+            )
 
         cluster_id = self.cluster_id
         self.fuel_web.deploy_cluster_wait_progress(
@@ -413,7 +421,8 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
 
         """
         if self.cluster_id is None:
-            raise SkipTest()
+            raise SkipTest("The cluster_id is not specified, "
+                           "can not run network verification")
 
         self.fuel_web.verify_network(self.cluster_id)
 
@@ -569,6 +578,7 @@ class BaseActions(PrepareActions, HealthCheckActions, PluginsActions,
                 dev_node = self.fuel_web.get_devops_node_by_nailgun_fqdn(
                     ng_nodes[node_number]['fqdn'])
 
+                # noinspection PyCallingNonCallable
                 power_action([dev_node])
             else:
                 logger.error("Unknown power switch action: "

system_test/tests/test_fuel_migration.py

@@ -99,7 +99,7 @@ class FuelMasterMigrate(ActionTest, BaseActions, FuelMasterActions):
 
         logger.info('Wait for Master node become online')
         self.env.d_env.nodes().admin.await(
-            network_name=self.env.d_env.admin_net,
+            network_name='admin',
             timeout=60 * 10)
 
         logger.info('Second reboot of Master node...')
@@ -116,7 +116,7 @@ class FuelMasterMigrate(ActionTest, BaseActions, FuelMasterActions):
 
         logger.info('Wait for Master node become online')
         self.env.d_env.nodes().admin.await(
-            network_name=self.env.d_env.admin_net,
+            network_name='admin',
             timeout=60 * 10)
 
         logger.info("Wait for file 'migration-done' appears")