From 755d64d0e25e5354b6fd50fdfc55c66068ba3cdf Mon Sep 17 00:00:00 2001
From: lanqinglong <lanqinglong@huawei.com>
Date: Thu, 28 Jan 2016 18:06:07 +0800
Subject: change for get joid onos ip (cherry picked from commit
 03ec0a88e72ed6c2fdc2995d0c93d2c61f847ae3)

Change-Id: Ic6d420d855615ddf53de707c19771fffaba47bbf
---
 docker/run_tests.sh                                  |  6 +++++-
 testcases/Controllers/ONOS/Teston/CI/onosfunctest.py | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 8fab51f6e..ff390453f 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -164,7 +164,11 @@ test/csit/suites/vpnservice
        ;;
         "onos")
             info "Running ONOS test case..."
-            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+            if [ $INSTALLER_TYPE == "joid" ]; then
+                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py -i joid
+            else
+                python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+            fi
       ;;
         "promise")
             info "Running PROMISE test case..."
diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index 64b8ac1de..eb2c7936c 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -21,7 +21,11 @@ import logging
 import yaml
 import datetime
 import re
+import argparse
 
+parser = argparse.ArgumentParser()
+parser.add_argument("-i", "--installer", help="Installer type")
+args = parser.parse_args()
 """ logging configuration """
 
 logger = logging.getLogger('onos')
@@ -97,7 +101,14 @@ def GetResult():
 def SetOnosIp():
     cmd = "keystone catalog --service network | grep publicURL"
     cmd_output = os.popen(cmd).read()
-    print cmd_output
+    OC1=re.search(r"\d+\.\d+\.\d+\.\d+",cmd_output).group()
+    os.environ['OC1'] = OC1
+    time.sleep(2)
+    logger.debug( "ONOS IP is " + OC1)
+
+def SetOnosIpForJoid():
+    cmd = "env | grep SDN_CONTROLLER"
+    cmd_output = os.popen(cmd).read()
     OC1=re.search(r"\d+\.\d+\.\d+\.\d+",cmd_output).group()
     os.environ['OC1'] = OC1
     time.sleep(2)
@@ -113,7 +124,11 @@ def CleanOnosTest():
 def main():
 
     DownloadCodes()
-    SetOnosIp()
+    if args.installer == "joid":
+        logger.debug( "Installer is Joid")
+        SetOnosIpForJoid()
+    else:
+        SetOnosIp()
     RunScript("FUNCvirNetNB")
     RunScript("FUNCvirNetNBL3")
 
-- 
cgit 1.2.3-korg