summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2017-03-27 19:13:08 +0200
committertomsou <soth@intracom-telecom.com>2017-03-28 06:27:01 +0000
commit5960fab7230bebbffc439457d5542d086cb3f8af (patch)
treebf23abe17f2fdaba1cd79debad5c9094ca819b2f
parent7d9d4d18b64fef71d9d4a7de0c4f143e2154ec2c (diff)
Remove quagga fix in the testcase
Solves partly: JIRA: SDNVPN-130 Change-Id: I1cf99e9294925545f6fece660983e32f6543f2b8 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
-rw-r--r--sdnvpn/test/functest/testcase_3.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 41f8f70..b7df013 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -71,18 +71,6 @@ def main():
ext_net_mask = ext_net_cidr[0].split('/')[1]
controller_ext_ip = ext_net_cidr[0].split('/')[0]
- # TODO This code has to be adapted into Apex quagga rpm spec
- installer_type = str(os.environ['INSTALLER_TYPE'].lower())
- if installer_type == "apex":
- add_quagga_user = 'sudo usermod -a -G quaggavt quagga'
- test_utils.run_odl_cmd(controller, add_quagga_user)
-
- create_quagga_run_folder = "sudo mkdir -p /var/run/quagga/"
- test_utils.run_odl_cmd(controller, create_quagga_run_folder)
-
- chown_quagga_folder = 'sudo chown quagga:quagga -R /var/run/quagga/'
- test_utils.run_odl_cmd(controller, chown_quagga_folder)
-
logger.info("Starting bgp speaker of controller at IP %s "
% controller_ext_ip)
logger.info("Checking if zrpcd is "
@@ -178,6 +166,7 @@ def main():
TESTCASE_CONFIG.quagga_subnet_cidr,
TESTCASE_CONFIG.quagga_router_name)
+ installer_type = str(os.environ['INSTALLER_TYPE'].lower())
if installer_type == "fuel":
disk = 'raw'
elif installer_type == "apex":