More cleanup. Fix network-cfg file
Change-Id: Ib3a564d2ed5fd097e528b8e15fd13c5ec28595b3
diff --git a/TestON/tests/DEMO_SDNIP/DEMO_SDNIP.py b/TestON/tests/DEMO_SDNIP/DEMO_SDNIP.py
index b496c4c..85f55cf 100644
--- a/TestON/tests/DEMO_SDNIP/DEMO_SDNIP.py
+++ b/TestON/tests/DEMO_SDNIP/DEMO_SDNIP.py
@@ -276,7 +276,6 @@
expectAllSuccess=True )
main.stop()
-
def CASE2( self, main ):
'''
point-to-point intents test for each BGP peer and BGP speaker pair
diff --git a/TestON/tests/DEMO_SDNIP/Dependency/Functions.py b/TestON/tests/DEMO_SDNIP/Dependency/Functions.py
index e29c23a..1e87ac2 100644
--- a/TestON/tests/DEMO_SDNIP/Dependency/Functions.py
+++ b/TestON/tests/DEMO_SDNIP/Dependency/Functions.py
@@ -133,11 +133,6 @@
onpass = "Ping test results are expected",
onfail = "Ping test results are Not expected" )
- if result == False:
- main.cleanup()
- main.exit()
-
-
def pingHostToHost( main, hosts = ["host64514", "host64515", "host64516"],
expectAllSuccess = True ):
"""
@@ -174,12 +169,6 @@
onpass = "Ping test results are expected",
onfail = "Ping test results are Not expected" )
- '''
- if result == False:
- main.cleanup()
- main.exit()
- '''
-
def setupTunnel( main, srcIp, srcPort, dstIp, dstPort ):
"""
diff --git a/TestON/tests/DEMO_SDNIP/Dependency/network-cfg.json b/TestON/tests/DEMO_SDNIP/Dependency/network-cfg.json
index 23d692e..602a72f 100644
--- a/TestON/tests/DEMO_SDNIP/Dependency/network-cfg.json
+++ b/TestON/tests/DEMO_SDNIP/Dependency/network-cfg.json
@@ -1,5 +1,4 @@
{
- "hosts": {
"ports" : {
"of:00000000000000a8/5" : {
"interfaces" : [