saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added tests for LXC grains and changelog entries

Browse source
This commit is contained in:
piterpunk 2021-05-15 21:01:54 -03:00 • committed by Megan Wilhite
parent ff7f009bf6
commit 598b2550f5
3 changed files with 86 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/53868.fixed Normal file
View file

@ -0,0 +1 @@
Fixed the container detection inside virtual machines

1
changelog/59573.fixed Normal file
View file

@ -0,0 +1 @@
Normalized grain output for LXC containers

84
tests/unit/grains/test_core.py
View file

@ -1232,6 +1232,90 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
grains.get("virtual"), "container",
)
with patch.object(os.path, "isdir", MagicMock(return_value=False)):
with patch.object(
os.path,
"isfile",
MagicMock(
side_effect=lambda x: True
if x in ("/proc/1/cgroup", "/proc/1/environ")
else False
),
):
file_contents = {
"/proc/1/cgroup": "10:memory",
"/proc/1/environ": "container=lxc",
}
with patch(
"salt.utils.files.fopen", mock_open(read_data=file_contents)
):
with patch.dict(core.__salt__, {"cmd.run_all": MagicMock()}):
grains = core._virtual({"kernel": "Linux"})
self.assertEqual(grains.get("virtual_subtype"), "LXC")
self.assertEqual(
grains.get("virtual"), "container",
)
@skipIf(salt.utils.platform.is_windows(), "System is Windows")
def test_lxc_virtual_with_virt_what(self):
"""
Test if virtual grains are parsed correctly in LXC using virt-what.
"""
virt = "lxc\nkvm"
with patch.object(
salt.utils.platform, "is_windows", MagicMock(return_value=False)
):
with patch.object(salt.utils.path, "which", MagicMock(return_value=True)):
with patch.dict(
core.__salt__,
{
"cmd.run_all": MagicMock(
return_value={
"pid": 78,
"retcode": 0,
"stderr": "",
"stdout": virt,
}
)
},
):
osdata = {
"kernel": "test",
}
ret = core._virtual(osdata)
self.assertEqual(ret["virtual"], "container")
self.assertEqual(ret["virtual_subtype"], "LXC")
@skipIf(salt.utils.platform.is_windows(), "System is Windows")
def test_container_inside_virtual_machine(self):
"""
Test if a container inside an hypervisor is shown as a container
"""
with patch.object(os.path, "isdir", MagicMock(return_value=False)):
with patch.object(
os.path,
"isfile",
MagicMock(
side_effect=lambda x: True
if x in ("/proc/cpuinfo", "/proc/1/cgroup", "/proc/1/environ")
else False
),
):
file_contents = {
"/proc/cpuinfo": "QEMU Virtual CPU",
"/proc/1/cgroup": "10:memory",
"/proc/1/environ": "container=lxc",
}
with patch(
"salt.utils.files.fopen", mock_open(read_data=file_contents)
):
with patch.dict(core.__salt__, {"cmd.run_all": MagicMock()}):
grains = core._virtual({"kernel": "Linux"})
self.assertEqual(grains.get("virtual_subtype"), "LXC")
self.assertEqual(
grains.get("virtual"), "container",
)
@skipIf(not salt.utils.platform.is_linux(), "System is not Linux")
def test_xen_virtual(self):
"""