X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_object.py;h=a1cf42fce35385e74cb8a028ad9a1cd39af2d148;hb=15ac81c16fba83033090299413a3a2dbb848a0f9;hp=61a96ec2993cc49b5ae877c988af83b19f1ce1e9;hpb=738844871220f853629504f61c248f0c9402dc77;p=vpp.git diff --git a/test/vpp_object.py b/test/vpp_object.py index 61a96ec2993..a1cf42fce35 100644 --- a/test/vpp_object.py +++ b/test/vpp_object.py @@ -50,6 +50,12 @@ class VppObjectRegistry(object): else: logger.debug("REG: duplicate add, ignoring (%s)" % obj) + def unregister_all(self, logger): + """ Remove all object registrations from registry. """ + logger.debug("REG: removing all object registrations") + self._object_registry = [] + self._object_dict = dict() + def remove_vpp_config(self, logger): """ Remove configuration (if present) from vpp and then remove all objects @@ -72,8 +78,7 @@ class VppObjectRegistry(object): for obj in self._object_registry: if obj.query_vpp_config(): failed.append(obj) - self._object_registry = [] - self._object_dict = dict() + self.unregister_all(logger) if failed: logger.error("REG: Couldn't remove configuration for object(s):") for obj in failed: