Prevent netCfg test from crashing on bad ONOS output.
Fix typo in docker driver
Change-Id: Iab7a53125c0a43fc0e2b4bab87286c504d14d55d
diff --git a/TestON/drivers/common/api/dockerapidriver.py b/TestON/drivers/common/api/dockerapidriver.py
index 0444665..f8e9e23 100644
--- a/TestON/drivers/common/api/dockerapidriver.py
+++ b/TestON/drivers/common/api/dockerapidriver.py
@@ -155,7 +155,7 @@
"""
try:
main.log.info( self.name +
- ": Checkeng Docker Status for CT with 'Names' " + ctName )
+ ": Checking Docker Status for CT with 'Names' " + ctName )
namelist = [response["Names"] for response in self.dockerClient.containers(all=True) if not []]
main.log.info("Name list is: " + str(namelist) )
if( [ctName] in namelist):
diff --git a/TestON/tests/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNCnetCfg/FUNCnetCfg.py
index 190357d..30cbd32 100644
--- a/TestON/tests/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNCnetCfg/FUNCnetCfg.py
@@ -504,7 +504,7 @@
if "of:0000000000000001" in sw['id']:
s1Correct = True
for k in keys:
- if str( sw['annotations'][k] ) != str( main.s1Json[k] ):
+ if str( sw.get( 'annotations', {} ).get( k ) ) != str( main.s1Json[k] ):
s1Correct = False
main.log.debug( "{} is wrong on s1".format( k ) )
if not s1Correct:
@@ -612,7 +612,7 @@
allowedDevices = [ "of:{}".format( str( i ).zfill( 16 ) ) for i in [ 1, 2 ] ]
onosDevices = []
for sw in json.loads( devices ):
- onosDevices.append( str( sw['id'] ) )
+ onosDevices.append( str( sw.get( 'id' ) ) )
onosDevices.sort()
failMsg = "ONOS devices doesn't match the list of allowed devices.\n"
failMsg += "Expected devices: {}\nActual devices: {}".format( allowedDevices,
@@ -625,10 +625,10 @@
main.step( "Check device annotations" )
keys = [ 'name', 'owner', 'rackAddress' ]
for sw in json.loads( devices ):
- if "of:0000000000000001" in sw['id']:
+ if "of:0000000000000001" in sw.get( 'id' ):
s1Correct = True
for k in keys:
- if str( sw['annotations'][k] ) != str( main.s1Json[k] ):
+ if str( sw.get( 'annotations', {} ).get( k ) ) != str( main.s1Json[k] ):
s1Correct = False
main.log.debug( "{} is wrong on s1".format( k ) )
if not s1Correct:
@@ -636,7 +636,7 @@
elif "of:0000000000000002" in sw['id']:
s2Correct = True
for k in keys:
- if str( sw['annotations'][k] ) != str( main.s2Json[k] ):
+ if str( sw.get( 'annotations', {} ).get( k ) ) != str( main.s2Json[k] ):
s2Correct = False
main.log.debug( "{} is wrong on s2".format( k ) )
if not s2Correct: