X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_object.py;h=8fe549e74ff3b63e3dbf3c0ff97d8eb95801a94a;hb=00671cf9cfbcd9ed25d79712bf01d29cb8787bf2;hp=2b71fc1fd39734366e1772a7f96894511db78fa7;hpb=0e3c0de1ed87f3cdf16e26e05e39ea6eebeafb18;p=vpp.git

diff --git a/test/vpp_object.py b/test/vpp_object.py
index 2b71fc1fd39..8fe549e74ff 100644
--- a/test/vpp_object.py
+++ b/test/vpp_object.py
@@ -1,13 +1,14 @@
+""" abstract vpp object and object registry """
+
 from abc import ABCMeta, abstractmethod
 
+import six
+
 
 class VppObject(object):
     """ Abstract vpp object """
     __metaclass__ = ABCMeta
 
-    def __init__(self):
-        VppObjectRegistry().register(self)
-
     @abstractmethod
     def add_vpp_config(self):
         """ Add the configuration for this object to vpp. """
@@ -42,13 +43,20 @@ class VppObjectRegistry(object):
         if not hasattr(self, "_object_dict"):
             self._object_dict = dict()
 
-    def register(self, o):
+    def register(self, obj, logger):
         """ Register an object in the registry. """
-        if not o.unique_id() in self._object_dict:
-            self._object_registry.append(o)
-            self._object_dict[o.unique_id()] = o
+        if obj.object_id() not in self._object_dict:
+            self._object_registry.append(obj)
+            self._object_dict[obj.object_id()] = obj
+            logger.debug("REG: registering %s" % obj)
         else:
-            print "not adding duplicate %s" % o
+            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):
         """
@@ -56,24 +64,25 @@ class VppObjectRegistry(object):
         from the registry.
         """
         if not self._object_registry:
-            logger.info("No objects registered for auto-cleanup.")
+            logger.info("REG: No objects registered for auto-cleanup.")
             return
-        logger.info("Removing VPP configuration for registered objects")
-        for o in reversed(self._object_registry):
-            if o.query_vpp_config():
-                logger.info("Removing %s", o)
-                o.remove_vpp_config()
-            else:
-                logger.info("Skipping %s, configuration not present", o)
+        logger.info("REG: Removing VPP configuration for registered objects")
+        # remove the config in reverse order as there might be dependencies
         failed = []
-        for o in self._object_registry:
-            if o.query_vpp_config():
-                failed.append(o)
-        self._object_registry = []
-        self._object_dict = dict()
+        for obj in reversed(self._object_registry):
+            if obj.query_vpp_config():
+                logger.info("REG: Removing configuration for %s" % obj)
+                obj.remove_vpp_config()
+                if obj.query_vpp_config():
+                    failed.append(obj)
+            else:
+                logger.info(
+                    "REG: Skipping removal for %s, configuration not present" %
+                    obj)
+        self.unregister_all(logger)
         if failed:
-            logger.error("Couldn't remove configuration for object(s):")
-            for x in failed:
-                logger.error(repr(x))
+            logger.error("REG: Couldn't remove configuration for object(s):")
+            for obj in failed:
+                logger.error(six.reprlib(obj))
             raise Exception("Couldn't remove configuration for object(s): %s" %
                             (", ".join(str(x) for x in failed)))