9 files changed, 116 insertions, 34 deletions
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml
index 6480c4c..3ffd215 100644
--- a/sdnvpn/test/functest/config.yaml
+++ b/sdnvpn/test/functest/config.yaml
@@ -153,3 +153,8 @@ testcases:
       secgroup_descr: Security group for SDNVPN test cases
       targets: '88:88'
       route_distinguishers: '18:18'
+
+  testcase_9:
+      enabled: true
+      description: Verify that all OpenStack nodes OVS br-int have fail_mode set to secure.
+      testname_db: functest_testcase_9
diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py
index 1bffe67..e671264 100644
--- a/sdnvpn/test/functest/run_tests.py
+++ b/sdnvpn/test/functest/run_sdnvpn_tests.py
@@ -97,7 +97,7 @@ def main(report=False):
         gather_logs('overall')
     except Exception as ex:
         logger.error(('Something went wrong in the Log gathering.'
-                      'Ex: Trace: %s')
+                      'Ex: %s, Trace: %s')
                      % ex, traceback.format_exc())
     if overall_status == "FAIL":
         sys.exit(-1)
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
index 8291151..540fe9a 100644
--- a/sdnvpn/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -10,12 +10,12 @@
 
 import argparse
 import logging
-from random import randint
-
-import functest.utils.openstack_utils as os_utils
+import sys
 
-from sdnvpn.lib import utils as test_utils
+from functest.utils import openstack_utils as os_utils
+from random import randint
 from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
@@ -222,4 +222,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
index 0265aee..cea93ce 100644
--- a/sdnvpn/test/functest/testcase_2.py
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -10,14 +10,13 @@
 
 import argparse
 import logging
-from random import randint
 import sys
 
-import functest.utils.openstack_utils as os_utils
-
-import sdnvpn.lib.utils as test_utils
+from functest.utils import openstack_utils as os_utils
+from random import randint
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
-import sdnvpn.lib.config as sdnvpn_config
 
 parser = argparse.ArgumentParser()
 
@@ -262,4 +261,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 24d413c..058a270 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -11,17 +11,17 @@
 #   - Start a BGP router with OpenDaylight
 #   - Add the functest Quagga as a neighbor
 #   - Verify that the OpenDaylight and gateway Quagga peer
+
+import argparse
 import logging
 import os
-import argparse
+import sys
 
+from functest.utils import functest_utils as ft_utils
+from functest.utils import openstack_utils as os_utils
 from sdnvpn.lib import quagga
-import sdnvpn.lib.utils as test_utils
-import sdnvpn.lib.config as sdnvpn_config
-
-import functest.utils.openstack_utils as os_utils
-import functest.utils.functest_utils as ft_utils
-
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
 from sdnvpn.lib.results import Results
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
@@ -287,4 +287,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
index cff60f1..0ca1563 100644
--- a/sdnvpn/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -10,12 +10,12 @@
 
 import argparse
 import logging
-from random import randint
-
-import functest.utils.openstack_utils as os_utils
+import sys
 
-from sdnvpn.lib import utils as test_utils
+from functest.utils import openstack_utils as os_utils
+from random import randint
 from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
@@ -228,4 +228,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 21bc12b..607a299 100644
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -20,11 +20,11 @@ network associated:
 """
 import argparse
 import logging
+import sys
 
-import functest.utils.openstack_utils as os_utils
-
-from sdnvpn.lib import utils as test_utils
+from functest.utils import openstack_utils as os_utils
 from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
@@ -174,4 +174,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py
index 7738c75..11f13bb 100644
--- a/sdnvpn/test/functest/testcase_8.py
+++ b/sdnvpn/test/functest/testcase_8.py
@@ -20,12 +20,12 @@ Test whether router assoc can coexist with floating IP
 """
 import argparse
 import logging
+import sys
 
-import functest.utils.openstack_utils as os_utils
-
-import sdnvpn.lib.utils as test_utils
+from functest.utils import openstack_utils as os_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
-import sdnvpn.lib.config as sdnvpn_config
 
 parser = argparse.ArgumentParser()
 
@@ -176,4 +176,4 @@ def main():
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())
diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py
new file mode 100644
index 0000000..053c02e
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_9.py
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2017 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Tests performed:
+# - Peering OpenDaylight with Quagga:
+#   - Set up a Quagga instance in the functest container
+#   - Start a BGP router with OpenDaylight
+#   - Add the functest Quagga as a neighbor
+#   - Verify that the OpenDaylight and gateway Quagga peer
+import argparse
+import logging
+import sys
+
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib.results import Results
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_9")
+
+logger = logging.getLogger('sdnvpn-testcase-9')
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+
+args = parser.parse_args()
+
+
+def main():
+    results = Results(COMMON_CONFIG.line_length)
+    results.add_to_summary(0, "=")
+    results.add_to_summary(2, "STATUS", "SUBTEST")
+    results.add_to_summary(0, "=")
+
+    openstack_nodes = test_utils.get_nodes()
+
+    # node.is_odl() doesn't work in Apex
+    # https://jira.opnfv.org/browse/RELENG-192
+    controllers = [node for node in openstack_nodes
+                   if "running" in
+                   node.run_cmd("sudo systemctl status opendaylight")]
+
+    msg = ("Verify that all OpenStack nodes OVS br-int have "
+           "fail_mode set to secure")
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    if not controllers:
+        msg = ("Controller (ODL) list is empty. Skipping rest of tests.")
+        logger.info(msg)
+        results.add_failure(msg)
+        return results.compile_summary()
+    else:
+        msg = ("Controller (ODL) list is ready")
+        logger.info(msg)
+        results.add_success(msg)
+    # Get fail_mode status on all nodes
+    fail_mode_statuses = test_utils.is_fail_mode_secure()
+    for node_name, status in fail_mode_statuses.iteritems():
+        msg = 'Node {} br-int is fail_mode secure'.format(node_name)
+        if status:
+            results.add_success(msg)
+        else:
+            results.add_failure(msg)
+
+    return results.compile_summary()
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    sys.exit(main())