From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; control/networks.py changes: - changed 'interface' to 'interfaces' in self.info - copyright fix. model/networks.py changes: - changed the param 'interface' to 'interfaces'. All variables that were referencing params['interface'] are now referencing params['interfaces'][0] to retain the same functionality - changed the flow of the create() method by calling the network interface verification for macvtap and bridge connections, removing this call from their specific methods. This will be useful when adding more connection types which will share this same verification - added extra verification in _check_network_interface for the new 'interfaces' parameter, including a verification to assert that 'macvtap' and 'bridge' networks will not be created if more than one interface is passed - moved Network Manager verification up to cover the case where a vlan_tagged_bridge will be created - lookup function of NetworkModel changed to return an array of size 1 with the old 'interface' parameter, renamed it to 'interfaces'. Since no network implemented in the backend supports more than one interface, this change suffices to comply with the new API Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; --- control/networks.py | 4 ++-- model/networks.py | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/control/networks.py b/control/networks.py index fd92111..1431e67 100644 --- a/control/networks.py +++ b/control/networks.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2015 +# Copyright IBM Corp, 2013-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -47,7 +47,7 @@ class Network(Resource): 'in_use': self.info['in_use'], 'autostart': self.info['autostart'], 'connection': self.info['connection'], - 'interface': self.info['interface'], + 'interfaces': self.info['interfaces'], 'subnet': self.info['subnet'], 'dhcp': self.info['dhcp'], 'state': self.info['state'], diff --git a/model/networks.py b/model/networks.py index 81aac3e..15e2d4a 100644 --- a/model/networks.py +++ b/model/networks.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM Corp, 2014-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -88,16 +88,18 @@ class NetworksModel(object): # handle connection type connection = params["connection"] - if connection == 'macvtap': - self._set_network_macvtap(params) - elif connection == 'bridge': - self._set_network_bridge(params) - elif connection in ['nat', 'isolated']: + if connection in ['nat', 'isolated']: if connection == 'nat': params['forward'] = {'mode': 'nat'} # set subnet; bridge/macvtap networks do not need subnet self._set_network_subnet(params) + else: + self._check_network_interface(params) + if connection == 'macvtap': + self._set_network_macvtap(params) + elif connection == 'bridge': + self._set_network_bridge(params) # create network XML params['name'] = escape(params['name']) @@ -165,19 +167,23 @@ class NetworksModel(object): raise OperationFailed("KCHNET0021E", {'iface': iface}) def _check_network_interface(self, params): - try: - # fails if host interface is already in use by a libvirt network - iface = params['interface'] + if not params.get('interfaces'): + raise MissingParameter("KCHNET0004E", {'name': params['name']}) + + if len(params['interfaces']) == 0: + raise InvalidParameter("KCHNET0029E") + + conn = params['connection'] + if conn in ['bridge', 'macvtap'] and len(params['interfaces']) > 1: + raise InvalidParameter("KCHNET0030E") + + for iface in params['interfaces']: if iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} raise InvalidParameter("KCHNET0006E", msg_args) - except KeyError: - raise MissingParameter("KCHNET0004E", {'name': params['name']}) def _set_network_macvtap(self, params): - self._check_network_interface(params) - - iface = params['interface'] + iface = params['interfaces'][0] if ('vlan_id' in params or not (netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface))): raise InvalidParameter('KCHNET0028E', {'name': iface}) @@ -186,11 +192,10 @@ class NetworksModel(object): params['forward'] = {'mode': 'bridge', 'dev': iface} def _set_network_bridge(self, params): - self._check_network_interface(params) params['forward'] = {'mode': 'bridge'} # Bridges cannot be the trunk device of a VLAN - iface = params['interface'] + iface = params['interfaces'][0] if 'vlan_id' in params and netinfo.is_bridge(iface): raise InvalidParameter('KCHNET0019E', {'name': iface}) @@ -205,15 +210,15 @@ class NetworksModel(object): # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): + # libvirt bridge creation will fail with NetworkManager enabled + if self.caps.nm_running: + raise InvalidParameter('KCHNET0027E') + if 'vlan_id' in params: params['bridge'] = \ self._create_vlan_tagged_bridge(str(iface), str(params['vlan_id'])) else: - # libvirt bridge creation will fail with NetworkManager enabled - if self.caps.nm_running: - raise InvalidParameter('KCHNET0027E') - # create Linux bridge interface and use it as actual iface iface = self._create_linux_bridge(iface) params['bridge'] = iface @@ -353,7 +358,7 @@ class NetworkModel(object): subnet = "%s/%s" % (subnet.network, subnet.prefixlen) return {'connection': connection, - 'interface': interface, + 'interfaces': [interface], 'subnet': subnet, 'dhcp': dhcp, 'vms': self._get_vms_attach_to_a_network(name), -- 2.5.0

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; kimchi.network.js and kimchi.network_add_main.js are now considering that the backend is working with an array called 'interfaces'. Same UI behavior is kept by assigning the first element of this array to the existing 'interface' parameter. Copyright format changes were made too. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; --- ui/js/src/kimchi.network.js | 4 ++-- ui/js/src/kimchi.network_add_main.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 96c3fea..1e79f8d 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM Corp, 2013-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ kimchi.initNetworkListView = function() { } else { network.type = data[i].connection; } - network.interface = data[i].interface ? data[i].interface : null; + network.interface = data[i].interfaces ? data[i].interfaces[0] : null; network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; kimchi.addNetworkItem(network); diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 0157df7..6beb115 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2016 + * Copyright IBM Corp, 2013-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,13 +32,13 @@ kimchi.startNetworkCreation = function() { var data = { name : network.name, connection: network.type, - interface: network.interface, + interfaces: [ network.interface ], vlan_id: network.vlan_id }; kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; - network.interface = result.interface ? result.interface : i18n["KCHNET6001M"]; + network.interface = result.interfaces ? result.interfaces[0] : i18n["KCHNET6001M"]; network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; network.persistent = result.persistent; $('#networkGrid').dataGrid('addRow', kimchi.addNetworkItem(network)); @@ -181,4 +181,4 @@ kimchi.loadInterfaces = function(interfaceFilterArray) { kimchi.setDefaultNetworkType(result.length!==0); kimchi.changeNetworkDestination(); }); -}; \ No newline at end of file +}; -- 2.5.0

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; -model/networks.py: added 'vepa' support by creating a new method to verify the availability of all interfaces and preset the parameters for the xml creation. Edited the lookup() method to add the interfaces retrieved by the VEPA xml declaration, keeping the same behavior for the other networks. - xmlutils/network.py: edited the _get_forward_elem() method to add all the interfaces that belongs to a 'vepa' type network. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; --- model/networks.py | 20 +++++++++++++++++++- xmlutils/network.py | 10 +++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/model/networks.py b/model/networks.py index 15e2d4a..ec30458 100644 --- a/model/networks.py +++ b/model/networks.py @@ -100,6 +100,8 @@ class NetworksModel(object): self._set_network_macvtap(params) elif connection == 'bridge': self._set_network_bridge(params) + elif connection == 'vepa': + self._set_network_vepa(params) # create network XML params['name'] = escape(params['name']) @@ -191,6 +193,14 @@ class NetworksModel(object): # set macvtap network params['forward'] = {'mode': 'bridge', 'dev': iface} + def _set_network_vepa(self, params): + for iface in params['interfaces']: + if ('vlan_id' in params or not (netinfo.is_bare_nic(iface) or + netinfo.is_bonding(iface))): + raise InvalidParameter('KCHNET0028E', {'name': iface}) + + params['forward'] = {'mode': 'vepa', 'devs': params['interfaces']} + def _set_network_bridge(self, params): params['forward'] = {'mode': 'bridge'} @@ -357,8 +367,16 @@ class NetworkModel(object): subnet = ipaddr.IPNetwork(subnet) subnet = "%s/%s" % (subnet.network, subnet.prefixlen) + if connection == 'vepa': + interfaces = xpath_get_text( + xml, + "/network/forward/interface/@dev" + ) + else: + interfaces = [interface] + return {'connection': connection, - 'interfaces': [interface], + 'interfaces': interfaces, 'subnet': subnet, 'dhcp': dhcp, 'vms': self._get_vms_attach_to_a_network(name), diff --git a/xmlutils/network.py b/xmlutils/network.py index 6fc3481..01f26f8 100644 --- a/xmlutils/network.py +++ b/xmlutils/network.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM Corp, 2014-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -79,6 +79,14 @@ def _get_forward_elem(**kwargs): forward = E.forward() if 'mode' in kwargs.keys(): forward.set('mode', kwargs['mode']) + if kwargs['mode'] == 'vepa': + devs = kwargs['devs'] + forward.set('dev', devs[0]) + + for dev in devs: + interface = E.interface() + interface.set('dev', dev) + forward.append(interface) if 'dev' in kwargs.keys(): forward.set('dev', kwargs['dev']) -- 2.5.0

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; Pinpoint UI changes to add a new network type named 'vepa' with the same capabilites as the macvtap network. At this moment, the UI does not support multiple physical devices to be declared in the VEPA network. This will require additional UI changes in the future (no backend changes needed). Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; --- ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 4 ++-- ui/pages/network-add.html.tmpl | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 1e79f8d..02a37cd 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -18,6 +18,7 @@ kimchi.NETWORK_TYPE_MACVTAP = "macvtap"; kimchi.NETWORK_TYPE_BRIDGED = "bridge"; +kimchi.NETWORK_TYPE_VEPA = "vepa"; kimchi.initNetwork = function() { diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 6beb115..8e2665b 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -82,7 +82,7 @@ kimchi.getNetworkDialogValues = function() { name : $("#networkName").val(), type : $("#networkType").val() }; - if (network.type === kimchi.NETWORK_TYPE_MACVTAP) { + if (network.type === kimchi.NETWORK_TYPE_MACVTAP || network.type === kimchi.NETWORK_TYPE_VEPA) { network.interface = $("#networkDestinationID").val(); } if (network.type === kimchi.NETWORK_TYPE_BRIDGED) { @@ -106,7 +106,7 @@ kimchi.setupNetworkFormEvent = function() { $('#networkType').on('change', function() { var selectedType = $("#networkType").val(); - if(selectedType === kimchi.NETWORK_TYPE_MACVTAP) { + if(selectedType === kimchi.NETWORK_TYPE_MACVTAP || selectedType === kimchi.NETWORK_TYPE_VEPA) { kimchi.loadInterfaces(new Array("nic", "bonding")); } else { kimchi.loadInterfaces(); diff --git a/ui/pages/network-add.html.tmpl b/ui/pages/network-add.html.tmpl index 6bd2acf..3f50ad2 100644 --- a/ui/pages/network-add.html.tmpl +++ b/ui/pages/network-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM Corp, 2014-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +41,7 @@ <option value="isolated">$_("Isolated: no external network connection")</option> <option value="nat">$_("NAT: outbound physical network connection only")</option> <option value="macvtap">$_("Macvtap: Virtual machines are connected to physical network directly")</option> + <option value="vepa">$_("VEPA: special mode where virtual machines are connected to a VEPA-enabled switch")</option> <option value="bridge">$_("Bridged: Virtual machines are connected through a network bridge")</option> </select> </div> @@ -72,4 +73,4 @@ kimchi.network_add_main(); </script> </body> -</html> \ No newline at end of file +</html> -- 2.5.0