starlingx/nfv
Code Issues Proposed changes

Merge "Fix VIM automated tests"

Browse Source
This commit is contained in:
Zuul 2018-09-05 20:11:17 +00:00 committed by Gerrit Code Review
commit adb8214db0
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py
View File

@ -32,7 +32,7 @@ def get_logs(token, start=None, end=None):
"""
url = token.get_service_url(OPENSTACK_SERVICE.FM)
if url is None:
raise ValueError("OpenStack SysInv URL is invalid")
raise ValueError("OpenStack FM URL is invalid")
api_cmd = url + "/event_log?logs=True"
@ -61,7 +61,7 @@ def get_alarm_history(token, start=None, end=None):
"""
url = token.get_service_url(OPENSTACK_SERVICE.FM)
if url is None:
raise ValueError("OpenStack SysInv URL is invalid")
raise ValueError("OpenStack FM URL is invalid")
api_cmd = url + "/event_log?alarms=True"

6
nfv/nfv-tests/nfv_scenario_tests/config.ini
View File

@ -69,6 +69,12 @@ service_name=sysinv
service_type=platform
endpoint_type=admin
[fm]
region_name=RegionOne
service_name=fm
service_type=faultmanagement
endpoint_type=admin
[mtc]
endpoint_override=http://localhost:2112

6
nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py
View File

@ -120,7 +120,7 @@ class TestHost(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-LIST' >> %s; "
"system alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"fm alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" % (filename, filename, filename))
def save_customer_logs(self, filename, wipe=False):
@ -131,7 +131,7 @@ class TestHost(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tLOG-LIST' >> %s; "
"system event-list --logs --nowrap --nopaging --limit 100 --query "
"fm event-list --logs --nowrap --nopaging --limit 100 --query "
"'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime,
filename, filename))
@ -144,7 +144,7 @@ class TestHost(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-HISTORY' >> %s; "
"system event-list --alarms --nowrap --nopaging --limit 100 "
"fm event-list --alarms --nowrap --nopaging --limit 100 "
"--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime,

6
nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py
View File

@ -119,7 +119,7 @@ class TestInstance(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-LIST' >> %s; "
"system alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"fm alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" % (filename, filename, filename))
def save_customer_logs(self, filename, wipe=False):
@ -130,7 +130,7 @@ class TestInstance(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tLOG-LIST' >> %s; "
"system event-list --logs --nowrap --nopaging --limit 100 --query "
"fm event-list --logs --nowrap --nopaging --limit 100 --query "
"'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime,
filename, filename))
@ -143,7 +143,7 @@ class TestInstance(_test_base.Test):
open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-HISTORY' >> %s; "
"system event-list --alarms --nowrap --nopaging --limit 100 "
"fm event-list --alarms --nowrap --nopaging --limit 100 "
"--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime,