From: lanqinglong <lanqinglong@huawei.com>
Date: Fri, 22 Jan 2016 02:35:41 +0000 (+0800)
Subject: modify onos functest to suit joid CI
X-Git-Tag: brahmaputra.1.0~132^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a58e87593e40e6117153a2604b176e7f4d367c0d;p=functest.git

modify onos functest to suit joid CI

Change-Id: Ib73d80e06042c849f8f627b252b28c2fb95a283d
(cherry picked from commit cc0375241d59e2c010e6c9e04040187478dc5533)
---

diff --git a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
index ccd49b75b..64b8ac1de 100644
--- a/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py
@@ -95,8 +95,7 @@ def GetResult():
     return payload
 
 def SetOnosIp():
-    onoscreds = ONOS_CONF_DIR + "/openstack.creds"
-    cmd = "cat " + onoscreds + " | grep OS_AUTH_URL"
+    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()