Change in vdsm[master]: NetReload: netmodels for addNetwork

asegurap at redhat.com asegurap at redhat.com
Mon May 27 12:11:45 UTC 2013


Antoni Segura Puimedon has posted comments on this change.

Change subject: NetReload: netmodels for addNetwork
......................................................................


Patch Set 7: (6 inline comments)

....................................................
File vdsm/netmodels.py
Line 50: 
Line 51: 
Line 52: class Nic(NetDevice):
Line 53:     @classmethod
Line 54:     def objectivize(cls, name, configurator, mtu, _netinfo, bonding=None):
Done
Line 55:         if name not in _netinfo.nics:
Line 56:             raise ConfigNetworkError(ne.ERR_BAD_NIC, 'unknown nic: %s' % name)
Line 57:         nicBond = _netinfo.getBondingForNic(name)
Line 58:         if not bonding and nicBond or \


Line 57:         nicBond = _netinfo.getBondingForNic(name)
Line 58:         if not bonding and nicBond or \
Line 59:                 bonding and nicBond and nicBond != bonding:
Line 60:             raise ConfigNetworkError(ne.ERR_USED_NIC, 'nic %s already enslaved'
Line 61:                                      ' to %s' % (name, nicBond))
Done
Line 62:         return cls(name, configurator, mtu=mtu if bonding else
Line 63:                    max(mtu, int(netinfo.getMtu(name))))
Line 64: 
Line 65:     def configure(self, network=None, bridge=None, bonding=None, vlan=None,


Line 59:                 bonding and nicBond and nicBond != bonding:
Line 60:             raise ConfigNetworkError(ne.ERR_USED_NIC, 'nic %s already enslaved'
Line 61:                                      ' to %s' % (name, nicBond))
Line 62:         return cls(name, configurator, mtu=mtu if bonding else
Line 63:                    max(mtu, int(netinfo.getMtu(name))))
Done
Line 64: 
Line 65:     def configure(self, network=None, bridge=None, bonding=None, vlan=None,
Line 66:                   **opts):
Line 67:         self.configurator.configureNic(self, network=network, bridge=bridge,


Line 167:         if name and nics:
Line 168:             slaves = []
Line 169:             for nic in nics:
Line 170:                 nicVlans = tuple(_netinfo.getVlansForIface(nic))
Line 171:                 nicNet = _netinfo.getNetworkForIface(nic)
Done
Line 172:                 if nicVlans or nicNet:
Line 173:                     raise ConfigNetworkError(
Line 174:                         ne.ERR_USED_NIC, 'nic %s already used by %s %s' %
Line 175:                         (nic, 'vlans' if nicVlans else 'network',


Line 168:             slaves = []
Line 169:             for nic in nics:
Line 170:                 nicVlans = tuple(_netinfo.getVlansForIface(nic))
Line 171:                 nicNet = _netinfo.getNetworkForIface(nic)
Line 172:                 if nicVlans or nicNet:
Moved the nicBond check here.
Line 173:                     raise ConfigNetworkError(
Line 174:                         ne.ERR_USED_NIC, 'nic %s already used by %s %s' %
Line 175:                         (nic, 'vlans' if nicVlans else 'network',
Line 176:                          nicVlans or nicNet))


Line 179:         elif name in _netinfo.bondings:  # Implicit bonding.
Line 180:             nics = [nic for nic in _netinfo.getNicsForBonding(name)]
Line 181:             mtu = max(int(netinfo.getMtu(name)), mtu)
Line 182:             slaves = [Nic.objectivize(nic, configurator, mtu, _netinfo, name)
Line 183:                       for nic in nics]
Done
Line 184:             options = _netinfo.bondings[name]['cfg'].get('BONDING_OPTS')
Line 185:         else:
Line 186:             raise ConfigNetworkError(ne.ERR_BAD_BONDING,
Line 187:                                      'Bonding %s not specified and it is not '


--
To view, visit http://gerrit.ovirt.org/14303
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iba5c5b84760e27245cbe34c3b290c54e51278e72
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare at redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw at linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list