x/vmware-nsx
Code Issues Proposed changes

Merge "iptables_manager: Fix get_binary_name for eventlet"

Browse Source
This commit is contained in:
Jenkins 2014-12-03 05:49:24 +00:00 committed by Gerrit Code Review
commit d82cc2d826
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/iptables_manager.py
View File

@ -18,9 +18,9 @@
"""Implements iptables rules using linux utilities."""
import inspect
import os
import re
import sys
from oslo.config import cfg
from oslo.utils import excutils
@ -42,7 +42,7 @@ LOG = logging.getLogger(__name__)
# (max_chain_name_length - len('-POSTROUTING') == 16)
def get_binary_name():
"""Grab the name of the binary we're running in."""
return os.path.basename(inspect.stack()[-1][1])[:16]
return os.path.basename(sys.argv[0])[:16]
binary_name = get_binary_name()

6
neutron/tests/unit/test_iptables_manager.py
View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import inspect
import os
import sys
import mock
from oslo.config import cfg
@ -190,8 +190,8 @@ class IptablesManagerStateFulTestCase(base.BaseTestCase):
self.execute = mock.patch.object(self.iptables, "execute").start()
def test_binary_name(self):
self.assertEqual(iptables_manager.binary_name,
os.path.basename(inspect.stack()[-1][1])[:16])
expected = os.path.basename(sys.argv[0])[:16]
self.assertEqual(expected, iptables_manager.binary_name)
def test_get_chain_name(self):
name = '0123456789' * 5