Change in vdsm[master]: net: source route: don't attempt to configure invalid values

danken at redhat.com danken at redhat.com
Wed Sep 3 16:13:49 UTC 2014


Dan Kenigsberg has uploaded a new change for review.

Change subject: net: source route: don't attempt to configure invalid values
......................................................................

net: source route: don't attempt to configure invalid values

If a DHCP server provides Vdsm with invalid ip/netmask/gateway supervdsm
logs a not-very-useful

    "ipaddr, mask or gateway not received"

Instead, this patch logs dhclient's faulty information before passing it
to the source route configurator, which hopefully would provide the
local admin more clues regarding the failure.

Change-Id: I0c4719629bfdc632bbc35171489670062c6c14cb
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm/network/sourceroute.py
M vdsm/network/sourceroutethread.py
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/32416/1

diff --git a/vdsm/network/sourceroute.py b/vdsm/network/sourceroute.py
index da78ac4..5564acd 100644
--- a/vdsm/network/sourceroute.py
+++ b/vdsm/network/sourceroute.py
@@ -64,10 +64,6 @@
                      srcDevice=self.device)]
 
     def configure(self, ipaddr, mask, gateway):
-        if gateway in (None, '0.0.0.0') or not ipaddr or not mask:
-            logging.error("ipaddr, mask or gateway not received")
-            return
-
         self.ipaddr = ipaddr
         self.mask = mask
         self.gateway = gateway
diff --git a/vdsm/network/sourceroutethread.py b/vdsm/network/sourceroutethread.py
index c2f14e6..04e9347 100644
--- a/vdsm/network/sourceroutethread.py
+++ b/vdsm/network/sourceroutethread.py
@@ -48,7 +48,11 @@
                     ip = sourceRouteContents[1]
                     mask = sourceRouteContents[2]
                     gateway = sourceRouteContents[3]
-                    sourceRoute.configure(ip, mask, gateway)
+                    if gateway in (None, '0.0.0.0') or not ip or not mask:
+                        logging.error('invalid DHCP response %s',
+                            sourceRouteContents)
+                    else:
+                        sourceRoute.configure(ip, mask, gateway)
                 else:
                     sourceRoute.remove()
             else:


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c4719629bfdc632bbc35171489670062c6c14cb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list