openstack
/
tempest
Code Issues Proposed changes

Remove set_nic_state from old remote_client 

set_nic_state was just one-line command wrapper method and it was
not worth to keep it as a common method. That made stacktrace
deep unnecessarily.
This patch removes set_nic_state for the cleanup.

NOTE: This method is not used at outside of Tempest.

Change-Id: Ida09a3b4098980c1644cc096453c34ef6e1c2a37
This commit is contained in:
Ken'ichi Ohmichi 2017-03-17 10:41:44 -07:00
parent 24f5751aa6
commit 126fe985f6
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tempest/common/utils/linux/remote_client.py
View File

@ -80,10 +80,10 @@ class RemoteClient(remote_client.RemoteClient):
return self.exec_command(cmd)
def set_mac_address(self, nic, address):
self.set_nic_state(nic=nic, state="down")
self.exec_command("sudo ip link set %s down" % nic)
cmd = "sudo ip link set dev {0} address {1}".format(nic, address)
self.exec_command(cmd)
self.set_nic_state(nic=nic, state="up")
self.exec_command("sudo ip link set %s up" % nic)
def get_mac_address(self, nic=""):
show_nic = "show {nic} ".format(nic=nic) if nic else ""
@ -105,10 +105,6 @@ class RemoteClient(remote_client.RemoteClient):
ip=addr, mask=network_mask_bits, nic=nic)
return self.exec_command(cmd)
def set_nic_state(self, nic, state="up"):
cmd = "sudo ip link set {nic} {state}".format(nic=nic, state=state)
return self.exec_command(cmd)
def get_dns_servers(self):
cmd = 'cat /etc/resolv.conf'
resolve_file = self.exec_command(cmd).strip().split('\n')

2
tempest/scenario/test_network_basic_ops.py
View File

@ -289,7 +289,7 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
ssh_client.assign_static_ip(
nic=new_nic, addr=new_port['fixed_ips'][0]['ip_address'],
network_mask_bits=CONF.network.project_network_mask_bits)
ssh_client.set_nic_state(nic=new_nic)
ssh_client.exec_command("sudo ip link set %s up" % new_nic)
def _get_server_nics(self, ssh_client):
reg = re.compile(r'(?P<num>\d+): (?P<nic_name>\w+):')

3
tempest/scenario/test_network_v6.py
View File

@ -153,7 +153,8 @@ class TestGettingAddress(manager.NetworkScenarioTest):
"ports: %s")
% (network_id, ports))
mac6 = ports[0]
ssh.set_nic_state(ssh.get_nic_name_by_mac(mac6))
nic = ssh.get_nic_name_by_mac(mac6)
ssh.exec_command("sudo ip link set %s up" % nic)
def _prepare_and_test(self, address6_mode, n_subnets6=1, dualnet=False):
net_list = self.prepare_network(address6_mode=address6_mode,

9
tempest/tests/common/utils/linux/test_remote_client.py
View File

@ -147,15 +147,6 @@ a0:b0:c0:d0:e0:f0"""
self._assert_exec_called_with(
"sudo ip addr add %s/%s dev %s" % (ip, '28', nic))
def test_set_nic_state(self):
nic = 'eth0'
self.conn.set_nic_state(nic)
self._assert_exec_called_with(
'sudo ip link set %s up' % nic)
self.conn.set_nic_state(nic, "down")
self._assert_exec_called_with(
'sudo ip link set %s down' % nic)
class TestRemoteClientWithServer(base.TestCase):