mirror of
https://github.com/SELinuxProject/setools
synced 2025-03-25 04:26:28 +00:00
Minor revisions to Xen code.
* Remove unnecessary namedtuple classes * Simplify __str__ functions on XenContext subclasses * Rename mem_addr to addr in Iomemcon and IomemconQuery * Minor logging tweaks in Xen queries * Remove type checking in DevicetreeconQuery
This commit is contained in:
Chris PeBenito
parent
bda9803773
commit
982b3f893d
@ -19,7 +19,6 @@
|
||||
import logging
|
||||
|
||||
from . import contextquery
|
||||
from .policyrep.xencontext import dev_path
|
||||
|
||||
|
||||
class DevicetreeconQuery(contextquery.ContextQuery):
|
||||
@ -56,23 +55,7 @@ class DevicetreeconQuery(contextquery.ContextQuery):
|
||||
No effect if not using set operations.
|
||||
"""
|
||||
|
||||
_path = None
|
||||
|
||||
@property
|
||||
def path(self):
|
||||
return self._path
|
||||
|
||||
@path.setter
|
||||
def path(self, value):
|
||||
pending_path = dev_path(*value)
|
||||
|
||||
if all(pending_path):
|
||||
if type(pending_path.path) != str:
|
||||
raise ValueError("The path must a string: {0}".format(pending_path))
|
||||
|
||||
self._path = pending_path
|
||||
else:
|
||||
self._path = None
|
||||
path = None
|
||||
|
||||
def __init__(self, policy, **kwargs):
|
||||
super(DevicetreeconQuery, self).__init__(policy, **kwargs)
|
||||
@ -81,7 +64,7 @@ class DevicetreeconQuery(contextquery.ContextQuery):
|
||||
def results(self):
|
||||
"""Generator which yields all matching devicetreecons."""
|
||||
self.log.info("Generating results from {0.policy}".format(self))
|
||||
self.log.debug("path: {0.path}".format(self))
|
||||
self.log.debug("Path: {0.path!r}".format(self))
|
||||
self.log.debug("User: {0.user!r}, regex: {0.user_regex}".format(self))
|
||||
self.log.debug("Role: {0.role!r}, regex: {0.role_regex}".format(self))
|
||||
self.log.debug("Type: {0.type_!r}, regex: {0.type_regex}".format(self))
|
||||
|
||||
@ -31,15 +31,15 @@ class IomemconQuery(contextquery.ContextQuery):
|
||||
policy The policy to query.
|
||||
|
||||
Keyword Parameters/Class attributes:
|
||||
mem_addr A 2-tuple of the memory addr range to match. (Set both to
|
||||
addr A 2-tuple of the memory addr range to match. (Set both to
|
||||
the same value for a single mem addr)
|
||||
mem_addr_subset If true, the criteria will match if it is a subset
|
||||
addr_subset If true, the criteria will match if it is a subset
|
||||
of the iomemcon's range.
|
||||
mem_addr_overlap If true, the criteria will match if it overlaps
|
||||
addr_overlap If true, the criteria will match if it overlaps
|
||||
any of the iomemcon's range.
|
||||
mem_addr_superset If true, the criteria will match if it is a superset
|
||||
addr_superset If true, the criteria will match if it is a superset
|
||||
of the iomemcon's range.
|
||||
mem_addr_proper If true, use proper superset/subset operations.
|
||||
addr_proper If true, use proper superset/subset operations.
|
||||
No effect if not using set operations.
|
||||
|
||||
user The criteria to match the context's user.
|
||||
@ -65,33 +65,33 @@ class IomemconQuery(contextquery.ContextQuery):
|
||||
No effect if not using set operations.
|
||||
"""
|
||||
|
||||
_mem_addr = None
|
||||
mem_addr_subset = False
|
||||
mem_addr_overlap = False
|
||||
mem_addr_superset = False
|
||||
mem_addr_proper = False
|
||||
_addr = None
|
||||
addr_subset = False
|
||||
addr_overlap = False
|
||||
addr_superset = False
|
||||
addr_proper = False
|
||||
|
||||
@property
|
||||
def mem_addr(self):
|
||||
return self._mem_addr
|
||||
def addr(self):
|
||||
return self._addr
|
||||
|
||||
@mem_addr.setter
|
||||
def mem_addr(self, value):
|
||||
pending_mem_addr = addr_range(*value)
|
||||
@addr.setter
|
||||
def addr(self, value):
|
||||
pending_addr = addr_range(*value)
|
||||
|
||||
if all(pending_mem_addr):
|
||||
if pending_mem_addr.low < 1 or pending_mem_addr.high < 1:
|
||||
if all(pending_addr):
|
||||
if pending_addr.low < 1 or pending_addr.high < 1:
|
||||
raise ValueError("Memory address must be positive: {0.low}-{0.high}".
|
||||
format(pending_mem_addr))
|
||||
format(pending_addr))
|
||||
|
||||
if pending_mem_addr.low > pending_mem_addr.high:
|
||||
if pending_addr.low > pending_addr.high:
|
||||
raise ValueError(
|
||||
"The low mem addr must be smaller than the high mem addr: {0.low}-{0.high}".
|
||||
format(pending_mem_addr))
|
||||
format(pending_addr))
|
||||
|
||||
self._mem_addr = pending_mem_addr
|
||||
self._addr = pending_addr
|
||||
else:
|
||||
self._mem_addr = None
|
||||
self._addr = None
|
||||
|
||||
def __init__(self, policy, **kwargs):
|
||||
super(IomemconQuery, self).__init__(policy, **kwargs)
|
||||
@ -100,9 +100,9 @@ class IomemconQuery(contextquery.ContextQuery):
|
||||
def results(self):
|
||||
"""Generator which yields all matching iomemcons."""
|
||||
self.log.info("Generating results from {0.policy}".format(self))
|
||||
self.log.debug("mem_addr: {0.mem_addr}, overlap: {0.mem_addr_overlap}, "
|
||||
"subset: {0.mem_addr_subset}, superset: {0.mem_addr_superset}, "
|
||||
"proper: {0.mem_addr_proper}".format(self))
|
||||
self.log.debug("Address: {0.addr!r}, overlap: {0.addr_overlap}, "
|
||||
"subset: {0.addr_subset}, superset: {0.addr_superset}, "
|
||||
"proper: {0.addr_proper}".format(self))
|
||||
self.log.debug("User: {0.user!r}, regex: {0.user_regex}".format(self))
|
||||
self.log.debug("Role: {0.role!r}, regex: {0.role_regex}".format(self))
|
||||
self.log.debug("Type: {0.type_!r}, regex: {0.type_regex}".format(self))
|
||||
@ -111,13 +111,13 @@ class IomemconQuery(contextquery.ContextQuery):
|
||||
|
||||
for iomemcon in self.policy.iomemcons():
|
||||
|
||||
if self.mem_addr and not self._match_range(
|
||||
iomemcon.mem_addr,
|
||||
self.mem_addr,
|
||||
self.mem_addr_subset,
|
||||
self.mem_addr_overlap,
|
||||
self.mem_addr_superset,
|
||||
self.mem_addr_proper):
|
||||
if self.addr and not self._match_range(
|
||||
iomemcon.addr,
|
||||
self.addr,
|
||||
self.addr_subset,
|
||||
self.addr_overlap,
|
||||
self.addr_superset,
|
||||
self.addr_proper):
|
||||
continue
|
||||
|
||||
if not self._match_context(iomemcon.context):
|
||||
|
||||
@ -100,7 +100,7 @@ class IoportconQuery(contextquery.ContextQuery):
|
||||
def results(self):
|
||||
"""Generator which yields all matching ioportcons."""
|
||||
self.log.info("Generating results from {0.policy}".format(self))
|
||||
self.log.debug("Ports: {0.ports}, overlap: {0.ports_overlap}, "
|
||||
self.log.debug("Ports: {0.ports!r}, overlap: {0.ports_overlap}, "
|
||||
"subset: {0.ports_subset}, superset: {0.ports_superset}, "
|
||||
"proper: {0.ports_proper}".format(self))
|
||||
self.log.debug("User: {0.user!r}, regex: {0.user_regex}".format(self))
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
import logging
|
||||
|
||||
from . import contextquery
|
||||
from .policyrep.xencontext import device_id
|
||||
|
||||
|
||||
class PcideviceconQuery(contextquery.ContextQuery):
|
||||
@ -31,7 +30,7 @@ class PcideviceconQuery(contextquery.ContextQuery):
|
||||
policy The policy to query.
|
||||
|
||||
Keyword Parameters/Class attributes:
|
||||
device A single PCI device ID.
|
||||
device A single PCI device ID.
|
||||
|
||||
user The criteria to match the context's user.
|
||||
user_regex If true, regular expression matching
|
||||
@ -64,13 +63,11 @@ class PcideviceconQuery(contextquery.ContextQuery):
|
||||
|
||||
@device.setter
|
||||
def device(self, value):
|
||||
pending_device = device_id(*value)
|
||||
if value:
|
||||
if value < 1:
|
||||
raise ValueError("PCI device ID must be positive: {0}".format(value))
|
||||
|
||||
if all(pending_device):
|
||||
if pending_device.low < 1:
|
||||
raise ValueError("PCI device ID must be positive: {0}".format(pending_device))
|
||||
|
||||
self._device = pending_device
|
||||
self._device = value
|
||||
else:
|
||||
self._device = None
|
||||
|
||||
@ -81,7 +78,7 @@ class PcideviceconQuery(contextquery.ContextQuery):
|
||||
def results(self):
|
||||
"""Generator which yields all matching pcidevicecons."""
|
||||
self.log.info("Generating results from {0.policy}".format(self))
|
||||
self.log.debug("device id: {0.device}".format(self))
|
||||
self.log.debug("Device ID: {0.device!r}".format(self))
|
||||
self.log.debug("User: {0.user!r}, regex: {0.user_regex}".format(self))
|
||||
self.log.debug("Role: {0.role!r}, regex: {0.role_regex}".format(self))
|
||||
self.log.debug("Type: {0.type_!r}, regex: {0.type_regex}".format(self))
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
import logging
|
||||
|
||||
from . import contextquery
|
||||
from .policyrep.xencontext import pirq
|
||||
|
||||
|
||||
class PirqconQuery(contextquery.ContextQuery):
|
||||
@ -64,13 +63,11 @@ class PirqconQuery(contextquery.ContextQuery):
|
||||
|
||||
@irq.setter
|
||||
def irq(self, value):
|
||||
pending_irq = pirq(*value)
|
||||
if value:
|
||||
if value < 1:
|
||||
raise ValueError("The IRQ must be positive: {0}".format(value))
|
||||
|
||||
if all(pending_irq):
|
||||
if pending_irq.low < 1:
|
||||
raise ValueError("The IRQ must be positive: {0}".format(pending_irq))
|
||||
|
||||
self._irq = pending_irq
|
||||
self._irq = value
|
||||
else:
|
||||
self._irq = None
|
||||
|
||||
@ -81,7 +78,7 @@ class PirqconQuery(contextquery.ContextQuery):
|
||||
def results(self):
|
||||
"""Generator which yields all matching pirqcons."""
|
||||
self.log.info("Generating results from {0.policy}".format(self))
|
||||
self.log.debug("irq: {0.irq}".format(self))
|
||||
self.log.debug("IRQ: {0.irq!r}".format(self))
|
||||
self.log.debug("User: {0.user!r}, regex: {0.user_regex}".format(self))
|
||||
self.log.debug("Role: {0.role!r}, regex: {0.role_regex}".format(self))
|
||||
self.log.debug("Type: {0.type_!r}, regex: {0.type_regex}".format(self))
|
||||
|
||||
@ -24,9 +24,6 @@ from . import context
|
||||
|
||||
addr_range = namedtuple("memory_range", ["low", "high"])
|
||||
port_range = namedtuple("port_range", ["low", "high"])
|
||||
device_id = namedtuple("device_id", ["low"])
|
||||
pirq = namedtuple("irq", ["low"])
|
||||
dev_path = namedtuple("dev_path", ["path"])
|
||||
|
||||
|
||||
def iomemcon_factory(policy, name):
|
||||
@ -95,7 +92,7 @@ class Iomemcon(XenContext):
|
||||
"""A iomemcon statement."""
|
||||
|
||||
def __str__(self):
|
||||
low, high = self.mem_addr
|
||||
low, high = self.addr
|
||||
|
||||
if low == high:
|
||||
return "iomemcon {0} {1}".format(low, self.context)
|
||||
@ -103,7 +100,7 @@ class Iomemcon(XenContext):
|
||||
return "iomemcon {0}-{1} {2}".format(low, high, self.context)
|
||||
|
||||
@property
|
||||
def mem_addr(self):
|
||||
def addr(self):
|
||||
"""
|
||||
The memory range for this iomemcon.
|
||||
|
||||
@ -148,20 +145,16 @@ class Pcidevicecon(XenContext):
|
||||
"""A pcidevicecon statement."""
|
||||
|
||||
def __str__(self):
|
||||
device_id = self.device
|
||||
|
||||
return "pcidevicecon {0} {1}".format(device_id, self.context)
|
||||
return "pcidevicecon {0.device} {0.context}".format(self)
|
||||
|
||||
@property
|
||||
def device(self):
|
||||
"""
|
||||
The device for this pcidevicecon.
|
||||
|
||||
Return: Tuple(low)
|
||||
low The PCI device ID.
|
||||
Return: The PCI device ID.
|
||||
"""
|
||||
device_id = self.qpol_symbol.device(self.policy)
|
||||
return device_id
|
||||
return self.qpol_symbol.device(self.policy)
|
||||
|
||||
|
||||
class Pirqcon(XenContext):
|
||||
@ -169,20 +162,16 @@ class Pirqcon(XenContext):
|
||||
"""A pirqcon statement."""
|
||||
|
||||
def __str__(self):
|
||||
pirq = self.irq
|
||||
|
||||
return "pirqcon {0} {1}".format(pirq, self.context)
|
||||
return "pirqcon {0.irq} {0.context}".format(self)
|
||||
|
||||
@property
|
||||
def irq(self):
|
||||
"""
|
||||
The irq for this pirqcon.
|
||||
|
||||
Return: Tuple(low)
|
||||
low The irq.
|
||||
Return: The irq.
|
||||
"""
|
||||
pirq = self.qpol_symbol.irq(self.policy)
|
||||
return pirq
|
||||
return self.qpol_symbol.irq(self.policy)
|
||||
|
||||
|
||||
class Devicetreecon(XenContext):
|
||||
@ -190,17 +179,13 @@ class Devicetreecon(XenContext):
|
||||
"""A devicetreecon statement."""
|
||||
|
||||
def __str__(self):
|
||||
dev_path = self.path
|
||||
|
||||
return "devicetreecon {0} {1}".format(dev_path, self.context)
|
||||
return "devicetreecon {0.path} {0.context}".format(self)
|
||||
|
||||
@property
|
||||
def path(self):
|
||||
"""
|
||||
The path for this devicetreecon.
|
||||
|
||||
Return: Tuple(path)
|
||||
path The device path name.
|
||||
Return: The device path name.
|
||||
"""
|
||||
dev_path = self.qpol_symbol.path(self.policy)
|
||||
return dev_path
|
||||
return self.qpol_symbol.path(self.policy)
|
||||
|
||||
@ -28,7 +28,7 @@ class IomemconQueryTest(unittest.TestCase):
|
||||
|
||||
def test_000_unset(self):
|
||||
"""Iomemcon query with no criteria"""
|
||||
# query with no parameters gets all mem_addr.
|
||||
# query with no parameters gets all addr.
|
||||
rules = sorted(self.p.iomemcons())
|
||||
|
||||
q = IomemconQuery(self.p)
|
||||
@ -40,397 +40,397 @@ class IomemconQueryTest(unittest.TestCase):
|
||||
"""Iomemcon query with context user exact match"""
|
||||
q = IomemconQuery(self.p, user="user10", user_regex=False)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(10, 10)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(10, 10)], addr)
|
||||
|
||||
def test_011_user_regex(self):
|
||||
"""Iomemcon query with context user regex match"""
|
||||
q = IomemconQuery(self.p, user="user11(a|b)", user_regex=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(11, 11), (11000, 11000)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(11, 11), (11000, 11000)], addr)
|
||||
|
||||
def test_020_role_exact(self):
|
||||
"""Iomemcon query with context role exact match"""
|
||||
q = IomemconQuery(self.p, role="role20_r", role_regex=False)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(20, 20)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(20, 20)], addr)
|
||||
|
||||
def test_021_role_regex(self):
|
||||
"""Iomemcon query with context role regex match"""
|
||||
q = IomemconQuery(self.p, role="role21(a|c)_r", role_regex=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(21, 21), (21001, 21001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(21, 21), (21001, 21001)], addr)
|
||||
|
||||
def test_030_type_exact(self):
|
||||
"""Iomemcon query with context type exact match"""
|
||||
q = IomemconQuery(self.p, type_="type30", type_regex=False)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(30, 30)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(30, 30)], addr)
|
||||
|
||||
def test_031_type_regex(self):
|
||||
"""Iomemcon query with context type regex match"""
|
||||
q = IomemconQuery(self.p, type_="type31(b|c)", type_regex=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(31000, 31000), (31001, 31001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(31000, 31000), (31001, 31001)], addr)
|
||||
|
||||
def test_040_range_exact(self):
|
||||
"""Iomemcon query with context range exact match"""
|
||||
q = IomemconQuery(self.p, range_="s0:c1 - s0:c0.c4")
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(40, 40)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(40, 40)], addr)
|
||||
|
||||
def test_041_range_overlap1(self):
|
||||
"""Iomemcon query with context range overlap match (equal)"""
|
||||
q = IomemconQuery(self.p, range_="s1:c1 - s1:c0.c4", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], addr)
|
||||
|
||||
def test_041_range_overlap2(self):
|
||||
"""Iomemcon query with context range overlap match (subset)"""
|
||||
q = IomemconQuery(self.p, range_="s1:c1,c2 - s1:c0.c3", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], addr)
|
||||
|
||||
def test_041_range_overlap3(self):
|
||||
"""Iomemcon query with context range overlap match (superset)"""
|
||||
q = IomemconQuery(self.p, range_="s1 - s1:c0.c4", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], addr)
|
||||
|
||||
def test_041_range_overlap4(self):
|
||||
"""Iomemcon query with context range overlap match (overlap low level)"""
|
||||
q = IomemconQuery(self.p, range_="s1 - s1:c1,c2", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], addr)
|
||||
|
||||
def test_041_range_overlap5(self):
|
||||
"""Iomemcon query with context range overlap match (overlap high level)"""
|
||||
q = IomemconQuery(self.p, range_="s1:c1,c2 - s1:c0.c4", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(41, 41)], addr)
|
||||
|
||||
def test_042_range_subset1(self):
|
||||
"""Iomemcon query with context range subset match"""
|
||||
q = IomemconQuery(self.p, range_="s2:c1,c2 - s2:c0.c3", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(42, 42)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(42, 42)], addr)
|
||||
|
||||
def test_042_range_subset2(self):
|
||||
"""Iomemcon query with context range subset match (equal)"""
|
||||
q = IomemconQuery(self.p, range_="s2:c1 - s2:c1.c3", range_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(42, 42)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(42, 42)], addr)
|
||||
|
||||
def test_043_range_superset1(self):
|
||||
"""Iomemcon query with context range superset match"""
|
||||
q = IomemconQuery(self.p, range_="s3 - s3:c0.c4", range_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(43, 43)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(43, 43)], addr)
|
||||
|
||||
def test_043_range_superset2(self):
|
||||
"""Iomemcon query with context range superset match (equal)"""
|
||||
q = IomemconQuery(self.p, range_="s3:c1 - s3:c1.c3", range_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(43, 43)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(43, 43)], addr)
|
||||
|
||||
def test_044_range_proper_subset1(self):
|
||||
"""Iomemcon query with context range proper subset match"""
|
||||
q = IomemconQuery(self.p, range_="s4:c1,c2", range_subset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], addr)
|
||||
|
||||
def test_044_range_proper_subset2(self):
|
||||
"""Iomemcon query with context range proper subset match (equal)"""
|
||||
q = IomemconQuery(self.p, range_="s4:c1 - s4:c1.c3", range_subset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_044_range_proper_subset3(self):
|
||||
"""Iomemcon query with context range proper subset match (equal low only)"""
|
||||
q = IomemconQuery(self.p, range_="s4:c1 - s4:c1.c2", range_subset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], addr)
|
||||
|
||||
def test_044_range_proper_subset4(self):
|
||||
"""Iomemcon query with context range proper subset match (equal high only)"""
|
||||
q = IomemconQuery(self.p,
|
||||
range_="s4:c1,c2 - s4:c1.c3", range_subset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(44, 44)], addr)
|
||||
|
||||
def test_045_range_proper_superset1(self):
|
||||
"""Iomemcon query with context range proper superset match"""
|
||||
q = IomemconQuery(self.p, range_="s5 - s5:c0.c4", range_superset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], addr)
|
||||
|
||||
def test_045_range_proper_superset2(self):
|
||||
"""Iomemcon query with context range proper superset match (equal)"""
|
||||
q = IomemconQuery(self.p, range_="s5:c1 - s5:c1.c3", range_superset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_045_range_proper_superset3(self):
|
||||
"""Iomemcon query with context range proper superset match (equal low)"""
|
||||
q = IomemconQuery(self.p, range_="s5:c1 - s5:c1.c4", range_superset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], addr)
|
||||
|
||||
def test_045_range_proper_superset4(self):
|
||||
"""Iomemcon query with context range proper superset match (equal high)"""
|
||||
q = IomemconQuery(self.p, range_="s5 - s5:c1.c3", range_superset=True, range_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(45, 45)], addr)
|
||||
|
||||
def test_050_single_equal(self):
|
||||
"""Iomemcon query with single mem addr exact match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50, 50))
|
||||
q = IomemconQuery(self.p, addr=(50, 50))
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50, 50)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50, 50)], addr)
|
||||
|
||||
def test_051_range_equal(self):
|
||||
"""Iomemcon query with mem addr range exact match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50100, 50110))
|
||||
q = IomemconQuery(self.p, addr=(50100, 50110))
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50100, 50110)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50100, 50110)], addr)
|
||||
|
||||
def test_052_single_subset(self):
|
||||
"""Iomemcon query with single mem addr subset"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50200, 50200), mem_addr_subset=True)
|
||||
q = IomemconQuery(self.p, addr=(50200, 50200), addr_subset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50200, 50200)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50200, 50200)], addr)
|
||||
|
||||
def test_053_range_subset(self):
|
||||
"""Iomemcon query with range subset"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50301, 50309), mem_addr_subset=True)
|
||||
q = IomemconQuery(self.p, addr=(50301, 50309), addr_subset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50300, 50310)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50300, 50310)], addr)
|
||||
|
||||
def test_053_range_subset_edge1(self):
|
||||
"""Iomemcon query with range subset, equal edge case"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50300, 50310), mem_addr_subset=True)
|
||||
q = IomemconQuery(self.p, addr=(50300, 50310), addr_subset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50300, 50310)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50300, 50310)], addr)
|
||||
|
||||
def test_054_single_proper_subset(self):
|
||||
"""Iomemcon query with single mem addr proper subset"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50400, 50400), mem_addr_subset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50400, 50400), addr_subset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_055_range_proper_subset(self):
|
||||
"""Iomemcon query with range proper subset"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50501, 50509), mem_addr_subset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50501, 50509), addr_subset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], addr)
|
||||
|
||||
def test_055_range_proper_subset_edge1(self):
|
||||
"""Iomemcon query with range proper subset, equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50500, 50510), mem_addr_subset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50500, 50510), addr_subset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_055_range_proper_subset_edge2(self):
|
||||
"""Iomemcon query with range proper subset, low equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50500, 50509), mem_addr_subset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50500, 50509), addr_subset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], addr)
|
||||
|
||||
def test_055_range_proper_subset_edge3(self):
|
||||
"""Iomemcon query with range proper subset, high equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50501, 50510), mem_addr_subset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50501, 50510), addr_subset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50500, 50510)], addr)
|
||||
|
||||
def test_056_single_superset(self):
|
||||
"""Iomemcon query with single mem addr superset"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50600, 50602), mem_addr_superset=True)
|
||||
q = IomemconQuery(self.p, addr=(50600, 50602), addr_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50601, 50601)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50601, 50601)], addr)
|
||||
|
||||
def test_056_single_superset_edge1(self):
|
||||
"""Iomemcon query with single mem addr superset, equal edge case"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50601, 50601), mem_addr_superset=True)
|
||||
q = IomemconQuery(self.p, addr=(50601, 50601), addr_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50601, 50601)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50601, 50601)], addr)
|
||||
|
||||
def test_057_range_superset(self):
|
||||
"""Iomemcon query with range superset"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50700, 50711), mem_addr_superset=True)
|
||||
q = IomemconQuery(self.p, addr=(50700, 50711), addr_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50700, 50710)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50700, 50710)], addr)
|
||||
|
||||
def test_057_range_superset_edge1(self):
|
||||
"""Iomemcon query with range superset, equal edge case"""
|
||||
q = IomemconQuery(self.p, mem_addr=(50700, 50710), mem_addr_superset=True)
|
||||
q = IomemconQuery(self.p, addr=(50700, 50710), addr_superset=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50700, 50710)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50700, 50710)], addr)
|
||||
|
||||
def test_058_single_proper_superset(self):
|
||||
"""Iomemcon query with single mem addr proper superset"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50800, 50802), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50800, 50802), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], addr)
|
||||
|
||||
def test_058_single_proper_superset_edge1(self):
|
||||
"""Iomemcon query with single mem addr proper superset, equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50801, 50801), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50801, 50801), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_058_single_proper_superset_edge2(self):
|
||||
"""Iomemcon query with single mem addr proper superset, low equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50801, 50802), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50801, 50802), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], addr)
|
||||
|
||||
def test_058_single_proper_superset_edge3(self):
|
||||
"""Iomemcon query with single mem addr proper superset, high equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50800, 50801), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50800, 50801), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50801, 50801)], addr)
|
||||
|
||||
def test_059_range_proper_superset(self):
|
||||
"""Iomemcon query with range proper superset"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50900, 50911), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50900, 50911), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], addr)
|
||||
|
||||
def test_059_range_proper_superset_edge1(self):
|
||||
"""Iomemcon query with range proper superset, equal edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50901, 50910), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50901, 50910), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([], addr)
|
||||
|
||||
def test_059_range_proper_superset_edge2(self):
|
||||
"""Iomemcon query with range proper superset, equal high mem addr edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50900, 50910), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50900, 50910), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], addr)
|
||||
|
||||
def test_059_range_proper_superset_edge3(self):
|
||||
"""Iomemcon query with range proper superset, equal low mem addr edge case"""
|
||||
q = IomemconQuery(
|
||||
self.p, mem_addr=(50901, 50911), mem_addr_superset=True, mem_addr_proper=True)
|
||||
self.p, addr=(50901, 50911), addr_superset=True, addr_proper=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(50901, 50910)], addr)
|
||||
|
||||
def test_060_single_overlap(self):
|
||||
"""Iomemcon query with single overlap"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60001, 60001), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60001, 60001), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], addr)
|
||||
|
||||
def test_060_single_overlap_edge1(self):
|
||||
"""Iomemcon query with single overlap, range match low"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60001, 60002), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60001, 60002), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], addr)
|
||||
|
||||
def test_060_single_overlap_edge2(self):
|
||||
"""Iomemcon query with single overlap, range match high"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60000, 60001), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60000, 60001), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], addr)
|
||||
|
||||
def test_060_single_overlap_edge3(self):
|
||||
"""Iomemcon query with single overlap, range match proper superset"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60000, 60002), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60000, 60002), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60001, 60001)], addr)
|
||||
|
||||
def test_061_range_overlap_low_half(self):
|
||||
"""Iomemcon query with range overlap, low half match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60100, 60105), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60100, 60105), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60101, 60110)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60101, 60110)], addr)
|
||||
|
||||
def test_062_range_overlap_high_half(self):
|
||||
"""Iomemcon query with range overlap, high half match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60205, 60211), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60205, 60211), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60200, 60210)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60200, 60210)], addr)
|
||||
|
||||
def test_063_range_overlap_middle(self):
|
||||
"""Iomemcon query with range overlap, middle match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60305, 60308), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60305, 60308), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60300, 60310)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60300, 60310)], addr)
|
||||
|
||||
def test_064_range_overlap_equal(self):
|
||||
"""Iomemcon query with range overlap, equal match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60400, 60410), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60400, 60410), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60400, 60410)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60400, 60410)], addr)
|
||||
|
||||
def test_065_range_overlap_superset(self):
|
||||
"""Iomemcon query with range overlap, superset match"""
|
||||
q = IomemconQuery(self.p, mem_addr=(60500, 60510), mem_addr_overlap=True)
|
||||
q = IomemconQuery(self.p, addr=(60500, 60510), addr_overlap=True)
|
||||
|
||||
mem_addr = sorted(p.mem_addr for p in q.results())
|
||||
self.assertListEqual([(60501, 60509)], mem_addr)
|
||||
addr = sorted(p.addr for p in q.results())
|
||||
self.assertListEqual([(60501, 60509)], addr)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user