Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: Support 4o6 and 6o4 for SPD tunnel mode SAs
[vpp.git]
/
test
/
test_geneve.py
diff --git
a/test/test_geneve.py
b/test/test_geneve.py
index
7eb23f2
..
16cb6c2
100644
(file)
--- a/
test/test_geneve.py
+++ b/
test/test_geneve.py
@@
-1,7
+1,7
@@
#!/usr/bin/env python3
import socket
#!/usr/bin/env python3
import socket
-from util import ip4_range
, ip4_range
+from util import ip4_range
import unittest
from framework import VppTestCase, VppTestRunner
from template_bd import BridgeDomain
import unittest
from framework import VppTestCase, VppTestRunner
from template_bd import BridgeDomain
@@
-9,7
+9,8
@@
from template_bd import BridgeDomain
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from scapy.contrib.geneve import GENEVE
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from scapy.contrib.geneve import GENEVE
-from scapy.utils import atol
+
+import util
from vpp_ip_route import VppIpRoute, VppRoutePath
from vpp_ip import INVALID_INDEX
from vpp_ip_route import VppIpRoute, VppRoutePath
from vpp_ip import INVALID_INDEX
@@
-176,9
+177,7
@@
class TestGeneve(BridgeDomain, VppTestCase):
# Our Multicast address
cls.mcast_ip4 = '239.1.1.1'
# Our Multicast address
cls.mcast_ip4 = '239.1.1.1'
- iplong = atol(cls.mcast_ip4)
- cls.mcast_mac = "01:00:5e:%02x:%02x:%02x" % (
- (iplong >> 16) & 0x7F, (iplong >> 8) & 0xFF, iplong & 0xFF)
+ cls.mcast_mac = util.mcast_ip_to_mac(cls.mcast_ip4)
# Create GENEVE VTEP on VPP pg0, and put geneve_tunnel0 and pg1
# into BD.
# Create GENEVE VTEP on VPP pg0, and put geneve_tunnel0 and pg1
# into BD.