From: Archana Singh <archus@linux.vnet.ibm.com> Below are the changes done for s390x architecture to only add default networks to template if template.conf has network configuration uncommented otherwise do not add any network by default. 1) Only on s390x, osinfo._get_tmpl_defaults() does not add default network in case template.conf has commented out network configuration. 2) Only on s390x, NetworksModel._check_default_networks() does not throw key error if networks not found in tmpl_defaults. 3) Only on s390x, VMTemplate.validate_integrity() does not throw key error if networks not found in the template. 4) Only on s390x, LibvirtVMTemplate._network_validate() does not throw key error on s390x if networks not found in tmpl_default, as on s390x networks is optional. 5) Only on s390x, VMTemplate._get_network_xml() does return empty string and does not throw key error if networks not found in template object. 6) Only on s390x, control/templates.py gets networks as [] if not found self.info. Archana Singh (1): Only on s390x add default networks to template if template.conf has default network configuration. control/templates.py | 2 +- model/networks.py | 7 ++++++- model/templates.py | 5 ++++- osinfo.py | 14 +++++++++++++- vmtemplate.py | 15 +++++++++++++-- 5 files changed, 37 insertions(+), 6 deletions(-) -- 2.7.4