X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=sdnvpn%2Ftest%2Ffunctest%2Ftestcase_3.py;h=41f8f708f7b17c6521d47324eaf0048581aa1e69;hb=db1ce6276c443dd9766458c516cc58c7f2e098d5;hp=416af39ab71d9848ba15ed7a0ab2751c703ae934;hpb=a720669923b555f348235076369479bb13571978;p=sdnvpn.git

diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 416af39..41f8f70 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -1,4 +1,3 @@
-#
 # 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
@@ -68,9 +67,21 @@ def main():
 
     controller = controllers[0]  # We don't handle HA well
     get_ext_ip_cmd = "sudo ip a | grep br-ex | grep inet | awk '{print $2}'"
-    ext_net_cidr = controller.run_cmd(get_ext_ip_cmd).split("/")
-    ext_net_mask = ext_net_cidr[1].split('\n')[0]
-    controller_ext_ip = ext_net_cidr[0]
+    ext_net_cidr = controller.run_cmd(get_ext_ip_cmd).strip().split('\n')
+    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)
@@ -167,7 +178,6 @@ 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":