aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-22 08:47:20 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 08:47:21 +0000
commit184b838d3b6e21004cdae7b2fda9619c0e65516e (patch)
tree97b25c2bdf2a1fce633257cf3eb76d897b916b97
parent2ef324919bf06d3bd377ee4caba99c87b3129e96 (diff)
parenta58e87593e40e6117153a2604b176e7f4d367c0d (diff)
Merge "modify onos functest to suit joid CI" into stable/brahmaputra
-rw-r--r--testcases/Controllers/ONOS/Teston/CI/onosfunctest.py3
1 files changed, 1 insertions, 2 deletions
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()