Merge remote-tracking branch 'origin/console_info' into bastell-discovery_subset

Author: Ben Astell

Makefile

@@ -26,7 +26,7 @@ install:
 	@echo "Installing dependencies"
 	@pip install $(DEPENDENCIES)
 	@echo "Installing package"
-	@python setup.py install
+	@python3 setup.py install
 	@echo ""
 	@echo "Done."
 	@echo ""
@@ -35,15 +35,15 @@ package:
 	@echo "--------------------------------------------------------------------"
 	@echo "Building package"
 	@mkdir -p $(DIST_DIR)/
-	@python setup.py bdist_wheel --dist-dir=$(DIST_DIR)
+	@python3 setup.py bdist_wheel --dist-dir=$(DIST_DIR)
 	@echo ""
 	@echo "Done."
 	@echo ""
 
 clean:
 	@echo ""
 	@echo "--------------------------------------------------------------------"
-	@python setup.py clean
+	@python3 setup.py clean
 	@echo "Removing *.pyc and __pycache__/ files"
 	@find . -type f -name "*.pyc" | xargs rm -vrf
 	@find . -type d -name "__pycache__" | xargs rm -vrf
@@ -60,7 +60,7 @@ develop:
 	@echo ""
 	@echo "--------------------------------------------------------------------"
 	@echo "Setting up development environment"
-	@python setup.py develop --no-deps -q
+	@python3 setup.py develop --no-deps -q
 	@echo ""
 	@echo "Done."
 	@echo ""
@@ -69,7 +69,7 @@ undevelop:
 	@echo ""
 	@echo "--------------------------------------------------------------------"
 	@echo "Removing development environment"
-	@python setup.py develop -q --no-deps --uninstall
+	@python3 setup.py develop -q --no-deps --uninstall
 	@echo ""
 	@echo "Done."
 	@echo ""

src/pyatsimagebuilder/utils.py

@@ -505,8 +505,13 @@ def _process_testbed_file(profile, yaml_contents):
             if isinstance(dev, dict):
                 testbed_info[dev_name] = {}
                 for key in ('os', 'platform', 'model', 'pid', 'type', 'logical'):
-                    if key in dev:
+                    if dev.get(key):
                         testbed_info[dev_name][key] = dev[key]
+                if dev.get('connections', {}).get('a'):
+                    port = dev[key]['a'].get('port')
+                    ip = dev[key]['a'].get('ip')
+                    if ip and port:
+                        testbed_info[dev_name]['console'] = f'{ip}:{port}'
 
 def _process_clean_file(profile, yaml_contents):
     # Extract bringup information from the clean file and
@@ -581,6 +586,7 @@ def discover_yamls(manifests, search_path, relative_path=None):
                         msg = f'Error loading YAML file {value} from ' \
                                 f'manifest {manifest["file"]}'
                         logger.exception(msg)
+                        yaml_contents = None
                         continue
                 else:
                     # YAML file relative path from manifest does not
@@ -590,7 +596,7 @@ def discover_yamls(manifests, search_path, relative_path=None):
                     logger.warning(msg)
 
                 processor = yaml_processors.get(argument)
-                if processor:
+                if processor and yaml_contents:
                     try:
                         processor(profile, yaml_contents)
                     except Exception as e:
@@ -599,4 +605,4 @@ def discover_yamls(manifests, search_path, relative_path=None):
                                 f'manifest {manifest["file"]}'
                         logger.exception(msg)
 
-    return manifests
+    return manifests