x/steth
Code Issues Proposed changes

Merge "Add get_interface support for centos 7.1"

Browse Source
This commit is contained in:
Jenkins 2016-03-09 03:30:11 +00:00 committed by Gerrit Code Review
commit cfb50d3900
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
steth/agent/common/utils.py
View File

@ -85,9 +85,9 @@ def get_interface(interface):
such as eth0.
"""
# Supported CentOS Version
supported_dists = ['7.0', '6.5']
supported_dists = ['7.0', '7.1', '6.5']
def format_centos_7_0(inf):
def format_centos_7(inf):
pattern = r'<([A-Z]+)'
state = re.search(pattern, stdout[0]).groups()[0]
state = 'UP' if not cmp(state, 'UP') else 'DOWN'
@ -134,8 +134,8 @@ def get_interface(interface):
inf = resource.Interface(interface)
if not cmp(linux_dist, '6.5'):
return format_centos_6_5(inf)
elif not cmp(linux_dist, '7.0'):
return format_centos_7_0(inf)
elif not cmp(linux_dist, '7.0') or not cmp(linux_dist, '7.1'):
return format_centos_7(inf)
except Exception:
message = stdout.pop(0)
return stdcode, message, None

3
steth/tests/unit/agent/common/test_utils.py
View File

@ -73,6 +73,9 @@ class TestUtils(unittest.TestCase):
'TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0']
execute.return_value = (0, out)
self.assertEqual(utils.get_interface('eth0')[0], 0)
# test centos 8.1
platform.linux_distribution = mock.Mock(return_value=['', '7.1', ''])
self.assertEqual(utils.get_interface('eth0')[0], 0)
# test other distribution
platform.linux_distribution = mock.Mock(return_value=['', '6.6', ''])
self.assertEqual(utils.get_interface('eth0')[0], 1)