diff options
| author |   dongwenjuan <dong.wenjuan@zte.com.cn> | 2019-09-29 14:07:20 +0800 |
|---|---|---|
| committer | dongwenjuan <dong.wenjuan@zte.com.cn> | 2019-09-29 14:44:01 +0800 |
| commit | e961ab783887a9c44d2a321df646f1c49f83b299 (patch) | |
| tree | 1b4f9fde75100aab1054097aa305105b127a66df | |
| parent | 7bba7d67beec7b3db26ab1319bf4080565053096 (diff) | |
use hostname without domain name & fix the `find` command in tox
Change-Id: I719c46a8b5407b565cf0b6df4cd9b4c95a6a8ce5
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
| -rw-r--r-- | doctor_tests/scenario/fault_management.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doctor_tests/scenario/fault_management.py b/doctor_tests/scenario/fault_management.py index 5216aa80..0271dffe 100644 --- a/doctor_tests/scenario/fault_management.py +++ b/doctor_tests/scenario/fault_management.py @@ -111,7 +111,10 @@ class FaultManagement(object): server = servers.get(vm_name) if not server: raise Exception('Can not find instance: vm_name(%s)' % vm_name) - host_name = server.__dict__.get('OS-EXT-SRV-ATTR:hypervisor_hostname') + # use hostname without domain name which is mapped to the cell + hostname = \ + server.__dict__.get('OS-EXT-SRV-ATTR:hypervisor_hostname') + host_name = hostname.split('.')[0] host_ip = self.installer.get_host_ip_from_hostname(host_name) self.log.info('Get host info(name:%s, ip:%s) which vm(%s) launched at' @@ -34,7 +34,7 @@ passenv = SSH_KEY changedir = {toxinidir}/doctor_tests commands = doctor-test - /bin/find {toxinidir} -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete + /usr/bin/find {toxinidir} -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete [testenv:pep8] changedir = {toxinidir} |