starlingx/nfv
Code Issues Proposed changes

Merge "Update nfv scenario tests to use /etc/platform/openrc"

Browse Source
This commit is contained in:
Zuul 2019-04-10 20:27:30 +00:00 committed by Gerrit Code Review
commit d114ae8212
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ class TestHost(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-LIST' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tALARM-LIST' >> %s; "
"fm alarm-list --nowrap | sed 's/^/\t /' >> %s; " "fm alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" % (filename, filename, filename)) "echo -e '\n' >> %s" % (filename, filename, filename))
@ -149,7 +149,7 @@ class TestHost(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tLOG-LIST' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tLOG-LIST' >> %s; "
"fm 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" "'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime, % (filename, self._start_datetime, self._end_datetime,
@ -162,7 +162,7 @@ class TestHost(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-HISTORY' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tALARM-HISTORY' >> %s; "
"fm event-list --alarms --nowrap --nopaging --limit 100 " "fm event-list --alarms --nowrap --nopaging --limit 100 "
"--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; " "--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" "echo -e '\n' >> %s"

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

@ -136,7 +136,7 @@ class TestInstance(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-LIST' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tALARM-LIST' >> %s; "
"fm alarm-list --nowrap | sed 's/^/\t /' >> %s; " "fm alarm-list --nowrap | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" % (filename, filename, filename)) "echo -e '\n' >> %s" % (filename, filename, filename))
@ -147,7 +147,7 @@ class TestInstance(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tLOG-LIST' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tLOG-LIST' >> %s; "
"fm 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" "'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s"
% (filename, self._start_datetime, self._end_datetime, % (filename, self._start_datetime, self._end_datetime,
@ -160,7 +160,7 @@ class TestInstance(_test_base.Test):
if wipe: if wipe:
open(filename, 'w').close() open(filename, 'w').close()
os.system("source /etc/nova/openrc; echo -e '\tALARM-HISTORY' >> %s; " os.system("source /etc/platform/openrc; echo -e '\tALARM-HISTORY' >> %s; "
"fm event-list --alarms --nowrap --nopaging --limit 100 " "fm event-list --alarms --nowrap --nopaging --limit 100 "
"--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; " "--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; "
"echo -e '\n' >> %s" "echo -e '\n' >> %s"