Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Use the IP4 lookup functions
[vpp.git]
/
test
/
vpp_sub_interface.py
diff --git
a/test/vpp_sub_interface.py
b/test/vpp_sub_interface.py
index
8f422d8
..
21560cb
100644
(file)
--- a/
test/vpp_sub_interface.py
+++ b/
test/vpp_sub_interface.py
@@
-1,6
+1,5
@@
from scapy.layers.l2 import Dot1Q
import abc
from scapy.layers.l2 import Dot1Q
import abc
-import six
from vpp_pg_interface import VppPGInterface
from vpp_interface import VppInterface
from vpp_papi import VppEnum
from vpp_pg_interface import VppPGInterface
from vpp_interface import VppInterface
from vpp_papi import VppEnum
@@
-18,8
+17,7
@@
class L2_VTR_OP:
L2_TRANSLATE_2_2 = 8
L2_TRANSLATE_2_2 = 8
-@six.add_metaclass(abc.ABCMeta)
-class VppSubInterface(VppPGInterface):
+class VppSubInterface(VppPGInterface, metaclass=abc.ABCMeta):
@property
def parent(self):
@property
def parent(self):
@@
-60,7
+58,7
@@
class VppSubInterface(VppPGInterface):
pass
@abc.abstractmethod
pass
@abc.abstractmethod
- def create_ndp_req(self):
+ def create_ndp_req(self
, addr=None
):
pass
def resolve_arp(self):
pass
def resolve_arp(self):
@@
-156,8
+154,8
@@
class VppDot1QSubint(VppSubInterface):
packet = VppPGInterface.create_arp_req(self)
return self.add_dot1_layer(packet)
packet = VppPGInterface.create_arp_req(self)
return self.add_dot1_layer(packet)
- def create_ndp_req(self):
- packet = VppPGInterface.create_ndp_req(self)
+ def create_ndp_req(self
, addr=None
):
+ packet = VppPGInterface.create_ndp_req(self
, addr
)
return self.add_dot1_layer(packet)
# called before sending packet
return self.add_dot1_layer(packet)
# called before sending packet
@@
-198,8
+196,8
@@
class VppDot1ADSubint(VppSubInterface):
packet = VppPGInterface.create_arp_req(self)
return self.add_dot1_layer(packet)
packet = VppPGInterface.create_arp_req(self)
return self.add_dot1_layer(packet)
- def create_ndp_req(self):
- packet = VppPGInterface.create_ndp_req(self)
+ def create_ndp_req(self
, addr=None
):
+ packet = VppPGInterface.create_ndp_req(self
, addr
)
return self.add_dot1_layer(packet)
def add_dot1_layer(self, packet):
return self.add_dot1_layer(packet)
def add_dot1_layer(self, packet):
@@
-230,6
+228,6
@@
class VppP2PSubint(VppSubInterface):
packet = VppPGInterface.create_arp_req(self)
return packet
packet = VppPGInterface.create_arp_req(self)
return packet
- def create_ndp_req(self):
- packet = VppPGInterface.create_ndp_req(self)
+ def create_ndp_req(self
, addr=None
):
+ packet = VppPGInterface.create_ndp_req(self
, addr
)
return packet
return packet