X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_object.py;h=d3652b1b62c23086f9ae590ac218ea9c4185a10f;hb=acecd0d9c225d5f87f2a518854c7eb7af319ef96;hp=2a993ff9e7c79c4aa6f9ecfe9d0bd5c69dcf4345;hpb=090096bff365b4ad69c061303c0852bf214b4f03;p=vpp.git diff --git a/test/vpp_object.py b/test/vpp_object.py index 2a993ff9e7c..d3652b1b62c 100644 --- a/test/vpp_object.py +++ b/test/vpp_object.py @@ -4,11 +4,11 @@ import abc class VppObject(metaclass=abc.ABCMeta): - """ Abstract vpp object """ + """Abstract vpp object""" @abc.abstractmethod def add_vpp_config(self) -> None: - """ Add the configuration for this object to vpp. """ + """Add the configuration for this object to vpp.""" pass @abc.abstractmethod @@ -20,18 +20,18 @@ class VppObject(metaclass=abc.ABCMeta): @abc.abstractmethod def remove_vpp_config(self) -> None: - """ Remove the configuration for this object from vpp. """ + """Remove the configuration for this object from vpp.""" pass def object_id(self) -> str: - """ Return a unique string representing this object. """ + """Return a unique string representing this object.""" return "Undefined. for <%s %s>" % (self.__class__.__name__, id(self)) def __str__(self) -> str: return self.object_id() def __repr__(self) -> str: - return '<%s>' % self.object_id() + return "<%s>" % self.object_id() def __hash__(self) -> int: return hash(self.object_id()) @@ -48,8 +48,9 @@ class VppObject(metaclass=abc.ABCMeta): return not self.__eq__(other) -class VppObjectRegistry(object): - """ Class which handles automatic configuration cleanup. """ +class VppObjectRegistry: + """Class which handles automatic configuration cleanup.""" + _shared_state = {} def __init__(self) -> None: @@ -60,7 +61,7 @@ class VppObjectRegistry(object): self._object_dict = dict() def register(self, obj: VppObject, logger) -> None: - """ Register an object in the registry. """ + """Register an object in the registry.""" if obj.object_id() not in self._object_dict: self._object_registry.append(obj) self._object_dict[obj.object_id()] = obj @@ -69,7 +70,7 @@ class VppObjectRegistry(object): logger.debug("REG: duplicate add, ignoring (%s)" % obj) def unregister_all(self, logger) -> None: - """ Remove all object registrations from registry. """ + """Remove all object registrations from registry.""" logger.debug("REG: removing all object registrations") self._object_registry = [] self._object_dict = dict() @@ -93,12 +94,14 @@ class VppObjectRegistry(object): failed.append(obj) else: logger.info( - "REG: Skipping removal for %s, configuration not present" % - obj) + "REG: Skipping removal for %s, configuration not present" % obj + ) self.unregister_all(logger) if failed: logger.error("REG: Couldn't remove configuration for object(s):") for obj in failed: logger.error(repr(obj)) - raise Exception("Couldn't remove configuration for object(s): %s" % - (", ".join(str(x) for x in failed))) + raise Exception( + "Couldn't remove configuration for object(s): %s" + % (", ".join(str(x) for x in failed)) + )