summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Irnich <tim.irnich@ericsson.com>2017-10-19 20:52:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-19 20:52:56 +0000
commit4245d81de9226f64321dcd828e2a91ac912cf7d7 (patch)
tree955daa906c57c7d8fa89513281f6df85ebef262b
parent6f4fa990aec1d58d39930311640cd6f086e5b696 (diff)
parent240c496340d76be0a64726792de381d8fbc1db38 (diff)
Merge "Remove argparse for adding argument -r"
-rw-r--r--sdnvpn/lib/utils.py2
-rw-r--r--sdnvpn/test/functest/config.yaml4
-rw-r--r--sdnvpn/test/functest/testcase_10.py8
-rw-r--r--sdnvpn/test/functest/testcase_9.py9
4 files changed, 2 insertions, 21 deletions
diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py
index d968010..e241d79 100644
--- a/sdnvpn/lib/utils.py
+++ b/sdnvpn/lib/utils.py
@@ -20,7 +20,7 @@ from opnfv.deployment.factory import Factory as DeploymentFactory
from sdnvpn.lib import config as sdnvpn_config
-logger = logging.getLogger('sndvpn_test_utils')
+logger = logging.getLogger('sdnvpn_test_utils')
common_config = sdnvpn_config.CommonConfig()
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml
index ed55f2b..d3063c1 100644
--- a/sdnvpn/test/functest/config.yaml
+++ b/sdnvpn/test/functest/config.yaml
@@ -149,12 +149,10 @@ testcases:
sdnvpn.test.functest.testcase_9:
enabled: true
description: Verify that all OpenStack nodes OVS br-int have fail_mode set to secure.
- testname_db: functest_testcase_9
sdnvpn.test.functest.testcase_10:
enabled: true
- description: Test if interupts occure during ping, when removing and adding instances
- testname_db: functest_testcase_10
+ description: Test if interupts occure during ping, when removing and adding instances
instance_1_name: sdnvpn-10-1
instance_2_name: sdnvpn-10-2
instance_3_name: sdnvpn-10-3
diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py
index cbad82d..557b658 100644
--- a/sdnvpn/test/functest/testcase_10.py
+++ b/sdnvpn/test/functest/testcase_10.py
@@ -8,7 +8,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
-import argparse
import logging
import re
import sys
@@ -20,13 +19,6 @@ 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()
-
-parser.add_argument("-r", "--report",
- help="Create json result file",
- action="store_true")
-
-args = parser.parse_args()
logger = logging.getLogger('__name__')
diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py
index 2fd067e..45e9d5b 100644
--- a/sdnvpn/test/functest/testcase_9.py
+++ b/sdnvpn/test/functest/testcase_9.py
@@ -13,7 +13,6 @@
# - 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
@@ -27,14 +26,6 @@ TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig(
logger = logging.getLogger('__name__')
-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)