From: Kevin Benton <blak111@gmail.com>
Date: Thu, 8 May 2014 22:47:31 +0000 (-0700)
Subject: Revert "Big Switch: Check source_address attribute exists"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c33013c46a6d66768f585a2570be99d1b2ee85fb;p=openstack-build%2Fneutron-build.git

Revert "Big Switch: Check source_address attribute exists"

This reverts commit 0dde14c0cd6ffea8ebff715342852ef17a9c0b70.

This fix only addressed part of the problem. The socket call
in python 2.6 does not accept an extra source address arg
either.

Change-Id: I4df4f66e9db0da1a8923ee37e918718f3bcf26ee
Partial-Bug: #1316382
---

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index 79eb5e776..8792290af 100644
--- a/neutron/plugins/bigswitch/servermanager.py
+++ b/neutron/plugins/bigswitch/servermanager.py
@@ -566,8 +566,8 @@ class HTTPSConnectionWithValidation(httplib.HTTPSConnection):
     combined_cert = None
 
     def connect(self):
-        sock = socket.create_connection((self.host, self.port), self.timeout,
-                                        getattr(self, 'source_address', None))
+        sock = socket.create_connection((self.host, self.port),
+                                        self.timeout, self.source_address)
         if self._tunnel_host:
             self.sock = sock
             self._tunnel()