X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FPolicer.py;h=37b1c7f7456eb79570a4c727ab4667661d0ef281;hp=abf6090cf39ac28cc6a948ca4d39797f11664e1d;hb=9377c956a86e42727039d9dab8879c10c9399f4c;hpb=9902cc2a3610661110c66753554be12520e9c334 diff --git a/resources/libraries/python/Policer.py b/resources/libraries/python/Policer.py index abf6090cf3..37b1c7f745 100644 --- a/resources/libraries/python/Policer.py +++ b/resources/libraries/python/Policer.py @@ -16,6 +16,7 @@ from enum import IntEnum from resources.libraries.python.Constants import Constants +from resources.libraries.python.IPUtil import IpDscp from resources.libraries.python.PapiExecutor import PapiSocketExecutor from resources.libraries.python.topology import Topology @@ -59,28 +60,6 @@ class PolicerPreColor(IntEnum): VIOLATE_COLOR = 2 -class DSCP(IntEnum): - """DSCP for mark-and-transmit action.""" - D_CS0 = 0 - D_CS1 = 8 - D_CS2 = 16 - D_CS3 = 24 - D_CS4 = 32 - D_vCS5 = 40 - D_CS6 = 48 - D_CS7 = 56 - D_AF11 = 10 - D_AF12 = 12 - D_AF13 = 14 - D_AF21 = 18 - D_AF22 = 20 - D_AF23 = 22 - D_AF31 = 26 - D_AF32 = 28 - D_AF33 = 30 - D_EF = 46 - - class Policer: """Policer utilities.""" @@ -165,8 +144,8 @@ class Policer: ).value, type=getattr(PolicerType, f"TYPE_{policer_type.upper()}").value, conform_action=conform_action, - exceed_action = exceed_action, - violate_action = violate_action, + exceed_action=exceed_action, + violate_action=violate_action, color_aware=bool(color_aware == u"'ca'") ) err_msg = f"Failed to configure policer {policer_name} " \ @@ -240,4 +219,4 @@ class Policer: :returns: DSCP numeric value. :rtype: int """ - return getattr(DSCP, f"D_{dscp.upper()}").value + return getattr(IpDscp, f"IP_API_DSCP_{dscp.upper()}").value