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
This commit is contained in:
parent
f15352b934
commit
0649c4fd20
@ -153,9 +153,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):
|
||||
@ -167,14 +165,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',
|
||||
@ -246,7 +242,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))
|
||||
@ -256,7 +252,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)
|
||||
|
||||
@ -484,7 +480,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,
|
||||
@ -494,9 +490,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")
|
||||
|
@ -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)
|
||||
|
@ -532,6 +532,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: "
|
||||
|
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user