x/vmware-nsx
Code Issues Proposed changes

Merge "Completes coverage of quantum.agent.linux.utils"

Browse Source
This commit is contained in:
Jenkins 2012-12-01 15:31:22 +00:00 committed by Gerrit Code Review
commit a12a1a36c8
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
quantum/agent/linux/utils.py
View File

@ -3,17 +3,17 @@
# Copyright 2012 Locaweb.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# @author: Juliano Martinez, Locaweb.
@ -29,6 +29,7 @@ from eventlet.green import subprocess
from quantum.common import utils
from quantum.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@ -70,4 +71,4 @@ def get_interface_mac(interface):
info = fcntl.ioctl(s.fileno(), 0x8927,
struct.pack('256s', interface[:DEVICE_NAME_LEN]))
return ''.join(['%02x:' % ord(char)
for char in info[MAC_START:MAC_END]])[:-1]
for char in info[MAC_START:MAC_END]])[:-1]

16
quantum/tests/unit/test_agent_utils.py → quantum/tests/unit/test_agent_linux_utils.py
View File

@ -54,3 +54,19 @@ class AgentUtilsExecuteTest(unittest.TestCase):
result = utils.execute(["cat"], process_input="%s\n" %
self.test_file[:-1])
self.assertEqual(result, "%s\n" % self.test_file[:-1])
def test_with_addl_env(self):
result = utils.execute(["ls", self.test_file],
addl_env={'foo': 'bar'})
self.assertEqual(result, "%s\n" % self.test_file)
class AgentUtilsGetInterfaceMAC(unittest.TestCase):
def test_get_interface_mac(self):
expect_val = '01:02:03:04:05:06'
with mock.patch('fcntl.ioctl') as ioctl:
ioctl.return_value = ''.join(['\x00' * 18,
'\x01\x02\x03\x04\x05\x06',
'\x00' * 232])
actual_val = utils.get_interface_mac('eth0')
self.assertEquals(actual_val, expect_val)