Adapt SDNVPN Functest test according to new framework

[sdnvpn.git] / sdnvpn / test / functest / testcase_3.py

diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index dbbdb59..44e7366 100644 (file)
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -11,32 +11,24 @@
 #   - Start a BGP router with OpenDaylight
 #   - Add the functest Quagga as a neighbor
 #   - Verify that the OpenDaylight and gateway Quagga peer
+
 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
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
 
-import functest.utils.openstack_utils as os_utils
-import functest.utils.functest_utils as ft_utils
 
-from sdnvpn.lib.results import Results
+logger = logging.getLogger(__name__)
 
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
 TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_3")
 
-logger = logging.getLogger('sdnvpn-testcase-3')
-
-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)
@@ -279,14 +271,12 @@ def main():
     else:
         results.add_failure("Peering with quagga")
 
-    test_utils.cleanup_nova(nova_client, floatingip_ids, instance_ids,
-                            image_ids)
-    test_utils.cleanup_neutron(neutron_client, bgpvpn_ids, interfaces,
-                               subnet_ids, router_ids, network_ids)
-
+    test_utils.cleanup_nova(nova_client, instance_ids, image_ids)
+    test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
+                               interfaces, subnet_ids, router_ids,
+                               network_ids)
     return results.compile_summary()
 
-
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
-    main()
+    sys.exit(main())