From: Brian Haley <brian.haley@hpe.com>
Date: Fri, 2 Oct 2015 03:35:24 +0000 (-0400)
Subject: Remove local variables from IPDevice.exists
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c4265395c96f152c1724126cb5050c139c85377c;p=openstack-build%2Fneutron-build.git

Remove local variables from IPDevice.exists

As suggested by Carl, code is functionally the same.

Change-Id: I80fe8dc8f6f379c7b9561049075fdf718943246b
---

diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
index 59354b3c7..17600812d 100644
--- a/neutron/agent/linux/ip_lib.py
+++ b/neutron/agent/linux/ip_lib.py
@@ -236,16 +236,12 @@ class IPDevice(SubProcessBase):
         orig_log_fail_as_error = self.get_log_fail_as_error()
         self.set_log_fail_as_error(False)
         try:
-            address = self.link.address
+            return bool(self.link.address)
         except RuntimeError:
-            exists = False
-        else:
-            exists = bool(address)
+            return False
         finally:
             self.set_log_fail_as_error(orig_log_fail_as_error)
 
-        return exists
-
     def delete_addr_and_conntrack_state(self, cidr):
         """Delete an address along with its conntrack state