@@ -496,8 +496,13 @@ def _process_testbed_file(profile, yaml_contents):
496496 if isinstance (dev , dict ):
497497 testbed_info [dev_name ] = {}
498498 for key in ('os' , 'platform' , 'model' , 'pid' , 'type' , 'logical' ):
499- if key in dev :
499+ if dev . get ( key ) :
500500 testbed_info [dev_name ][key ] = dev [key ]
501+ if dev .get ('connections' , {}).get ('a' ):
502+ port = dev [key ]['a' ].get ('port' )
503+ ip = dev [key ]['a' ].get ('ip' )
504+ if ip and port :
505+ testbed_info [dev_name ]['console' ] = f'{ ip } :{ port } '
501506
502507def _process_clean_file (profile , yaml_contents ):
503508 # Extract bringup information from the clean file and
@@ -566,6 +571,7 @@ def discover_yamls(manifests, search_path, relative_path=None):
566571 msg = f'Error loading YAML file { value } from ' \
567572 f'manifest { manifest ["file" ]} '
568573 logger .exception (msg )
574+ yaml_contents = None
569575 continue
570576 else :
571577 # YAML file relative path from manifest does not
@@ -575,7 +581,7 @@ def discover_yamls(manifests, search_path, relative_path=None):
575581 logger .warning (msg )
576582
577583 processor = yaml_processors .get (argument )
578- if processor :
584+ if processor and yaml_contents :
579585 try :
580586 processor (profile , yaml_contents )
581587 except Exception as e :
@@ -584,4 +590,4 @@ def discover_yamls(manifests, search_path, relative_path=None):
584590 f'manifest { manifest ["file" ]} '
585591 logger .exception (msg )
586592
587- return manifests
593+ return manifests
0 commit comments