Merge pull request #37 from pingping-lin/sdnip_teston_branch
change sdn-ip application name and delete debug code
diff --git a/TestON/drivers/common/cli/quaggaclidriver.py b/TestON/drivers/common/cli/quaggaclidriver.py
index 77e1fab..8314941 100644
--- a/TestON/drivers/common/cli/quaggaclidriver.py
+++ b/TestON/drivers/common/cli/quaggaclidriver.py
@@ -22,15 +22,11 @@
self.name = self.options['name']
# self.handle = super(QuaggaCliDriver,self).connect(user_name = self.user_name, ip_address = self.ip_address,port = self.port, pwd = self.pwd)
self.handle = super(QuaggaCliDriver, self).connect(user_name=self.user_name, ip_address="1.1.1.1", port=self.port, pwd=self.pwd)
- main.log.info("quagga handle" + str(self.handle) )
- main.log.info("where is this timeout from?")
main.log.info("connect parameters:" + str(self.user_name) + ";" + str(self.ip_address) + ";" + str(self.port) + ";" + str(self.pwd))
if self.handle:
#self.handle.expect("",timeout=10)
#self.handle.expect("\$",timeout=10)
- #main.log.info(self.handle.before)
- #main.log.info(self.handle.after)
self.handle.sendline("telnet localhost 2605")
#self.handle.expect("Password:", timeout=5)
self.handle.expect("Password:")
@@ -171,7 +167,7 @@
intents_json_obj = json.loads(get_intents_result)
for intent in intents_json_obj:
- if intent['appId'] != "org.onlab.onos.sdnip" :
+ if intent['appId'] != "org.onosproject.sdnip" :
continue
if intent['type'] == "MultiPointToSinglePointIntent" and intent['state'] == 'INSTALLED':
egress = str(intent['egress']['device']) + ":" + str(intent['egress']['port'])
@@ -196,7 +192,7 @@
intents_json_obj = json.loads(get_intents_result)
for intent in intents_json_obj:
- if intent['appId'] != "org.onlab.onos.sdnip":
+ if intent['appId'] != "org.onosproject.sdnip":
continue
if intent['type'] == "PointToPointIntent" and "protocol=6" in str(intent['selector']):
ingress = str(intent['ingress']['device']) + ":" + str(intent['ingress']['port'])