6c746172ef
This fixes the change from https://gerrit.fd.io/r/#/c/16175/ ... ====== Totals ====== Ran: 856 tests in 2123.0000 sec. - Passed: 667 - Skipped: 157 - Expected Fail: 0 - Unexpected Success: 0 - Failed: 32 Sum of execute time for each test: 1641.0832 sec. ============== Worker Balance ============== - Worker 0 (416 tests) => 0:35:06.788054 - Worker 1 (440 tests) => 0:31:13.814911 Test id Runtime (s) -------------------------------------------------------------------------------------- ----------- test.test_vcl.VCLCutThruTestCase.test_ldp_cut_thru_bi_dir_nsock 120.382 test.test_vcl.VCLThruHostStackGroupBTestCase.test_ldp_thru_host_stack_bi_dir_nsock 60.368 test.test_vcl.VCLIpv6ThruHostStackGroupBTestCase.test_ldp_thru_host_stack_bi_dir_nsock 60.356 test.test_igmp.TestIgmp.test_igmp_host 47.411 test.test_reassembly.TestFIFReassembly.test_fif6 38.561 test.test_reassembly.TestFIFReassembly.test_fif4 37.045 test.test_gbp.TestGBP.test_gbp 30.041 test.test_dhcp.TestDHCP.test_dhcp_proxy 29.339 test.test_vcl.VCLCutThruTestCase.test_ldp_cut_thru_iperf3 20.489 test.test_neighbor.ARPTestCase.test_arp 19.004 Change-Id: Ic1565f14962f157d5041230de3aeeab0b85f21e1 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
89 lines
2.9 KiB
Python
89 lines
2.9 KiB
Python
""" abstract vpp object and object registry """
|
|
|
|
from abc import ABCMeta, abstractmethod
|
|
|
|
from six import moves
|
|
|
|
|
|
class VppObject(object):
|
|
""" Abstract vpp object """
|
|
__metaclass__ = ABCMeta
|
|
|
|
@abstractmethod
|
|
def add_vpp_config(self):
|
|
""" Add the configuration for this object to vpp. """
|
|
pass
|
|
|
|
@abstractmethod
|
|
def query_vpp_config(self):
|
|
"""Query the vpp configuration.
|
|
|
|
:return: True if the object is configured"""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def remove_vpp_config(self):
|
|
""" Remove the configuration for this object from vpp. """
|
|
pass
|
|
|
|
@abstractmethod
|
|
def object_id(self):
|
|
""" Return a unique string representing this object. """
|
|
pass
|
|
|
|
|
|
class VppObjectRegistry(object):
|
|
""" Class which handles automatic configuration cleanup. """
|
|
_shared_state = {}
|
|
|
|
def __init__(self):
|
|
self.__dict__ = self._shared_state
|
|
if not hasattr(self, "_object_registry"):
|
|
self._object_registry = []
|
|
if not hasattr(self, "_object_dict"):
|
|
self._object_dict = dict()
|
|
|
|
def register(self, obj, logger):
|
|
""" 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
|
|
logger.debug("REG: registering %s" % obj)
|
|
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
|
|
from the registry.
|
|
"""
|
|
if not self._object_registry:
|
|
logger.info("REG: No objects registered for auto-cleanup.")
|
|
return
|
|
logger.info("REG: Removing VPP configuration for registered objects")
|
|
# remove the config in reverse order as there might be dependencies
|
|
failed = []
|
|
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("REG: Couldn't remove configuration for object(s):")
|
|
for obj in failed:
|
|
logger.error(moves.reprlib.repr(obj))
|
|
raise Exception("Couldn't remove configuration for object(s): %s" %
|
|
(", ".join(str(x) for x in failed)))
|