[PATCH V1] [Kimchi] Issue #1047: In xmlutils/interface.py --> get_iface_xml returns none for type Ethernet

From: Archana Singh <archus@linux.vnet.ibm.com> For type other than bridge and direct, default method get_iface_network_xml gets called to resolve this issue. Signed-off-by: Archana Singh <archus@linux.vnet.ibm.com> --- xmlutils/interface.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xmlutils/interface.py b/xmlutils/interface.py index 05f4e19..af33ea0 100644 --- a/xmlutils/interface.py +++ b/xmlutils/interface.py @@ -25,12 +25,11 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): typ = params.get('type', 'network') - if typ == 'network': - return get_iface_network_xml(params, arch, os_distro, os_version) - elif typ == 'bridge': + if typ == 'bridge': return get_iface_ovs_xml(params, arch) elif typ == 'direct': return get_iface_macvtap_xml(params, arch) + return get_iface_network_xml(params, arch, os_distro, os_version) def get_iface_network_xml(params, arch=None, os_distro=None, os_version=None): -- 2.7.4

Reviewed-By: Lucio Correia <luciojhc@linux.vnet.ibm.com> On 27-09-2016 07:35, archus@linux.vnet.ibm.com wrote:
From: Archana Singh <archus@linux.vnet.ibm.com>
For type other than bridge and direct, default method get_iface_network_xml gets called to resolve this issue.
Signed-off-by: Archana Singh <archus@linux.vnet.ibm.com> --- xmlutils/interface.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/xmlutils/interface.py b/xmlutils/interface.py index 05f4e19..af33ea0 100644 --- a/xmlutils/interface.py +++ b/xmlutils/interface.py @@ -25,12 +25,11 @@ from wok.plugins.kimchi import osinfo
def get_iface_xml(params, arch=None, os_distro=None, os_version=None): typ = params.get('type', 'network') - if typ == 'network': - return get_iface_network_xml(params, arch, os_distro, os_version) - elif typ == 'bridge': + if typ == 'bridge': return get_iface_ovs_xml(params, arch) elif typ == 'direct': return get_iface_macvtap_xml(params, arch) + return get_iface_network_xml(params, arch, os_distro, os_version)
def get_iface_network_xml(params, arch=None, os_distro=None, os_version=None):
-- Lucio Correia Software Engineer IBM LTC Brazil
participants (3)
-
Aline Manera
-
archus@linux.vnet.ibm.com
-
Lucio Correia