]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Revert "Big Switch: Check source_address attribute exists"
authorKevin Benton <blak111@gmail.com>
Thu, 8 May 2014 22:47:31 +0000 (15:47 -0700)
committerKevin Benton <blak111@gmail.com>
Thu, 8 May 2014 22:51:52 +0000 (15:51 -0700)
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

neutron/plugins/bigswitch/servermanager.py

index 79eb5e776f14a760df3855f33ca5d34a0b5318e4..8792290af6cf8582184f805031a8fe634e6cfe63 100644 (file)
@@ -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()