diff --git a/tempest/common/utils/linux/remote_client.py b/tempest/common/utils/linux/remote_client.py index e9ea92a2f3..b7c776b29d 100644 --- a/tempest/common/utils/linux/remote_client.py +++ b/tempest/common/utils/linux/remote_client.py @@ -175,11 +175,6 @@ class RemoteClient(object): cmd = "sudo ip link set {nic} {state}".format(nic=nic, state=state) return self.exec_command(cmd) - def get_pids(self, pr_name): - # Get pid(s) of a process/program - cmd = "ps -ef | grep %s | grep -v 'grep' | awk {'print $1'}" % pr_name - return self.exec_command(cmd).split('\n') - def get_dns_servers(self): cmd = 'cat /etc/resolv.conf' resolve_file = self.exec_command(cmd).strip().split('\n') @@ -188,10 +183,6 @@ class RemoteClient(object): if len(l) and l[0] == 'nameserver'] return dns_servers - def send_signal(self, pid, signum): - cmd = 'sudo /bin/kill -{sig} {pid}'.format(pid=pid, sig=signum) - return self.exec_command(cmd) - def _renew_lease_udhcpc(self, fixed_ip=None): """Renews DHCP lease via udhcpc client. """ file_path = '/var/run/udhcpc.' @@ -199,7 +190,8 @@ class RemoteClient(object): pid = self.exec_command('cat {path}{nic}.pid'. format(path=file_path, nic=nic_name)) pid = pid.strip() - self.send_signal(pid, 'USR1') + cmd = 'sudo /bin/kill -{sig} {pid}'.format(pid=pid, sig='USR1') + self.exec_command(cmd) def _renew_lease_dhclient(self, fixed_ip=None): """Renews DHCP lease via dhclient client. """ diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index e5f5f68a3e..ff48abedcc 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -635,13 +635,14 @@ class ScenarioTest(tempest.test.BaseTestCase): private_key=private_key) if dev_name is not None: ssh_client.make_fs(dev_name) - ssh_client.mount(dev_name, mount_path) + ssh_client.exec_command('sudo mount /dev/%s %s' % (dev_name, + mount_path)) cmd_timestamp = 'sudo sh -c "date > %s/timestamp; sync"' % mount_path ssh_client.exec_command(cmd_timestamp) timestamp = ssh_client.exec_command('sudo cat %s/timestamp' % mount_path) if dev_name is not None: - ssh_client.umount(mount_path) + ssh_client.exec_command('sudo umount %s' % mount_path) return timestamp def get_timestamp(self, ip_address, dev_name=None, mount_path='/mnt', @@ -653,7 +654,7 @@ class ScenarioTest(tempest.test.BaseTestCase): timestamp = ssh_client.exec_command('sudo cat %s/timestamp' % mount_path) if dev_name is not None: - ssh_client.umount(mount_path) + ssh_client.exec_command('sudo umount %s' % mount_path) return timestamp def get_server_ip(self, server):