modify onos functest to suit joid CI 97/7697/1
authorlanqinglong <lanqinglong@huawei.com>
Fri, 22 Jan 2016 02:35:41 +0000 (10:35 +0800)
committerMorgan Richomme <morgan.richomme@orange.com>
Fri, 22 Jan 2016 08:46:57 +0000 (08:46 +0000)
Change-Id: Ib73d80e06042c849f8f627b252b28c2fb95a283d
(cherry picked from commit cc0375241d59e2c010e6c9e04040187478dc5533)

testcases/Controllers/ONOS/Teston/CI/onosfunctest.py

index ccd49b7..64b8ac1 100644 (file)
@@ -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()