Igor Lvovsky has submitted this change and it was merged.
Change subject: netConfig: translate to "new" option names from cmdline, too ......................................................................
netConfig: translate to "new" option names from cmdline, too
At some point in prehistoric past a former Vdsm developer decided to change the names of various networking options. IPADDR had become ipaddr; BONDING_OPTS had become bondingOptions; etc. We continued to support older-style names - which are used up to this very day by ovirt-engine. Translation is done by API.Global._translateOptionsToNew for each network API call.
However, we forgot to perform this translation when the network configuration functions are called via the /usr/share/vdsm/addNetwork script during bootstrap/registration.
This lacuna leads to IPADDR being written to configuration file uncontrolably. This patch fixes the issue in the simplest quickest form I could think of.
Change-Id: I2c18acb87ae0372d5af949f6fa4ab24d025d7faf Bug-Id: BZ#847733 failure to create rhevm network over pre-configured VLAN Signed-off-by: Dan Kenigsberg danken@redhat.com --- M vdsm/API.py M vdsm/configNetwork.py 2 files changed, 12 insertions(+), 6 deletions(-)
Approvals: Meni Yakove: Verified Igor Lvovsky: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/7390 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I2c18acb87ae0372d5af949f6fa4ab24d025d7faf Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Igor Lvovsky ilvovsky@redhat.com Gerrit-Reviewer: Livnat Peer lpeer@redhat.com Gerrit-Reviewer: Meni Yakove myakove@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server