aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_ip_mcast.py
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-03-16 15:49:09 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-03-17 19:41:56 +0000
commit180279b912827c30494ec1b90ee4325a15cb337c (patch)
tree996598cfabfd253efd0ab8a3f52562cd7e1e8366 /test/test_ip_mcast.py
parent696e88da9799056036f329676213f3c0c0a1db9c (diff)
Fix IP feature ordering.
Drop comes before lookup when enabled. is_first_or_last is not required when setting a feature, the anchor is added in find_config_with_features(). Don't make the PG interfaces automatically L3 enabled, this way we can have tests that check the L3 protocol disbaled behaviour. Change-Id: Icef22a920b27ff9cec6ab2da6b05f05c532cb60f Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/test_ip_mcast.py')
-rw-r--r--test/test_ip_mcast.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index 864cb803..094942b3 100644
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -4,7 +4,8 @@ import unittest
from framework import VppTestCase, VppTestRunner
from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
-from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal
+from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal, \
+ MRouteItfFlags, MRouteEntryFlags
from scapy.packet import Raw
from scapy.layers.l2 import Ether
@@ -12,23 +13,6 @@ from scapy.layers.inet import IP, UDP, getmacbyip, ICMP
from scapy.layers.inet6 import IPv6, getmacbyip6
from util import ppp
-
-class MRouteItfFlags:
- MFIB_ITF_FLAG_NONE = 0
- MFIB_ITF_FLAG_NEGATE_SIGNAL = 1
- MFIB_ITF_FLAG_ACCEPT = 2
- MFIB_ITF_FLAG_FORWARD = 4
- MFIB_ITF_FLAG_SIGNAL_PRESENT = 8
- MFIB_ITF_FLAG_INTERNAL_COPY = 16
-
-
-class MRouteEntryFlags:
- MFIB_ENTRY_FLAG_NONE = 0
- MFIB_ENTRY_FLAG_SIGNAL = 1
- MFIB_ENTRY_FLAG_DROP = 2
- MFIB_ENTRY_FLAG_CONNECTED = 4
- MFIB_ENTRY_FLAG_INHERIT_ACCEPT = 8
-
#
# The number of packets sent is set to 90 so that when we replicate more than 3
# times, which we do for some entries, we will generate more than 256 packets