Fix bgpd.conf path and duplication in tc_3

Change-Id: I78e521fddd8a156d5c9597d6307ac9b6f2571f5c
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
(cherry picked from commit 4c9d7aa555b450c5c3cb88debed7f2f62f884346)

diff --git a/sdnvpn/artifacts/quagga_setup.sh b/sdnvpn/artifacts/quagga_setup.sh
index 6da50e1..8983387 100644 (file)
--- a/sdnvpn/artifacts/quagga_setup.sh
+++ b/sdnvpn/artifacts/quagga_setup.sh
@@ -15,7 +15,7 @@ OWN_IP=%s
 
 ZEBRA_CONFIG_LOCATION="/etc/quagga/zebra.conf"
 DAEMONS_FILE_LOCATION="/etc/quagga/daemons"
-BGPD_CONFIG_LOCATION="/etc/quagga/daemons"
+BGPD_CONFIG_LOCATION="/etc/quagga/bgpd.conf"
 BGPD_LOG_FILE="/var/log/bgpd.log"
 
 DEBIAN_FONTEND=noninteractive apt-get update

diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 8bbc738..aedf0ce 100644 (file)
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -29,7 +29,6 @@ import functest.utils.functest_logger as ft_logger
 
 from sdnvpn.lib.results import Results
 
-
 COMMON_CONFIG = sdnvpn_config.CommonConfig()
 TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_3")
 
@@ -43,11 +42,6 @@ parser.add_argument("-r", "--report",
 
 args = parser.parse_args()
 
-logger = ft_logger.Logger("sdnvpn-testcase-3").getLogger()
-
-COMMON_CONFIG = sdnvpn_config.CommonConfig()
-TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig("testcase_3")
-
 
 def main():
     results = Results(COMMON_CONFIG.line_length)