Change in vdsm[ovirt-3.5]: net: fix defaultRoute mismatch during restoration.
ibarkan at redhat.com
ibarkan at redhat.com
Mon Aug 10 12:57:23 UTC 2015
Ido Barkan has posted comments on this change.
Change subject: net: fix defaultRoute mismatch during restoration.
......................................................................
Patch Set 2:
(3 comments)
https://gerrit.ovirt.org/#/c/44613/2/lib/vdsm/netconfpersistence.py
File lib/vdsm/netconfpersistence.py:
Line 394: # skip this and then (on vdsm3.5) it is done internally by VDSM.
Line 395: for net, net_attr in config_copy.networks.iteritems():
Line 396: default_route = net_attr.get('defaultRoute')
Line 397: if default_route is not None:
Line 398: net_attr['defaultRoute'] = default_route
> if it's already set, why bother setting it again?
it is indeed silly.
Line 399: elif net in ('ovirtmgmt', 'rhevm'):
Line 400: net_attr['defaultRoute'] = True
Line 401: else:
Line 402: net_attr['defaultRoute'] = False
Line 395: for net, net_attr in config_copy.networks.iteritems():
Line 396: default_route = net_attr.get('defaultRoute')
Line 397: if default_route is not None:
Line 398: net_attr['defaultRoute'] = default_route
Line 399: elif net in ('ovirtmgmt', 'rhevm'):
> use constants.LEGACY_MANAGEMENT_NETWORKS
Done
Line 400: net_attr['defaultRoute'] = True
Line 401: else:
Line 402: net_attr['defaultRoute'] = False
Line 403:
Line 398: net_attr['defaultRoute'] = default_route
Line 399: elif net in ('ovirtmgmt', 'rhevm'):
Line 400: net_attr['defaultRoute'] = True
Line 401: else:
Line 402: net_attr['defaultRoute'] = False
> basically, I think that the code on api.py does the same but written a bit
you are right. it's a mess.
Line 403:
Line 404: def _normalize_ifcfg_keys(self, config_copy):
Line 405: # ignore keys in persisted networks that might originate from vdsm-reg.
Line 406: # these might be a result of calling setupNetworks with ifcfg values
--
To view, visit https://gerrit.ovirt.org/44613
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If8e4d19329b230d620bc4545a0d0355f482b5bef
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ondřej Svoboda <osvoboda at redhat.com>
Gerrit-Reviewer: Petr Horacek <phoracek at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-HasComments: Yes
More information about the vdsm-patches
mailing list