From 76a89550163ca761ce22ed239ae1c8fbd1b7beab Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Fri, 5 Apr 2019 15:19:23 -0500 Subject: [PATCH] Update nfv scenario tests to use /etc/platform/openrc When /etc/nova/openrc was removed from the controller these scenario tests were not updated and therefore were unable to run. Verified that the tests are able to get further. Story: 2004764 Task: 30370 Change-Id: I4206f850957afdd551f9932b9c452d58aee893e9 Signed-off-by: Al Bailey --- nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py | 6 +++--- nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py index 3f819aac..5e31bb2a 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py +++ b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py @@ -138,7 +138,7 @@ class TestHost(_test_base.Test): if wipe: 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; " "echo -e '\n' >> %s" % (filename, filename, filename)) @@ -149,7 +149,7 @@ class TestHost(_test_base.Test): if wipe: 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 " "'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s" % (filename, self._start_datetime, self._end_datetime, @@ -162,7 +162,7 @@ class TestHost(_test_base.Test): if wipe: 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 " "--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; " "echo -e '\n' >> %s" diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py index 62bdf56a..af8397d0 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py +++ b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py @@ -136,7 +136,7 @@ class TestInstance(_test_base.Test): if wipe: 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; " "echo -e '\n' >> %s" % (filename, filename, filename)) @@ -147,7 +147,7 @@ class TestInstance(_test_base.Test): if wipe: 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 " "'start=%s;end=%s' | sed 's/^/\t /' >> %s; echo -e '\n' >> %s" % (filename, self._start_datetime, self._end_datetime, @@ -160,7 +160,7 @@ class TestInstance(_test_base.Test): if wipe: 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 " "--query 'start=%s;end=%s' | sed 's/^/\t /' >> %s; " "echo -e '\n' >> %s"