Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: A 16-8-8 and a 8-8-8-8 versions of an ip4_fib_t
[vpp.git]
/
test
/
vpp_pppoe_interface.py
diff --git
a/test/vpp_pppoe_interface.py
b/test/vpp_pppoe_interface.py
index
fbb78bc
..
505ac4c
100644
(file)
--- a/
test/vpp_pppoe_interface.py
+++ b/
test/vpp_pppoe_interface.py
@@
-1,7
+1,7
@@
from vpp_interface import VppInterface
import socket
from vpp_interface import VppInterface
import socket
-from
util import mactobinary
+from
vpp_papi import mac_pton
class VppPppoeInterface(VppInterface):
class VppPppoeInterface(VppInterface):
@@
-12,29
+12,31
@@
class VppPppoeInterface(VppInterface):
def __init__(self, test, client_ip, client_mac,
session_id, decap_vrf_id=0):
""" Create VPP PPPoE4 interface """
def __init__(self, test, client_ip, client_mac,
session_id, decap_vrf_id=0):
""" Create VPP PPPoE4 interface """
- s
elf._test = test
+ s
uper(VppPppoeInterface, self).__init__(test)
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
self.decap_vrf_id = decap_vrf_id
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
self.decap_vrf_id = decap_vrf_id
+ self.vpp_sw_if_index = -1
def add_vpp_config(self):
def add_vpp_config(self):
- cip = socket.inet_pton(socket.AF_INET, self.client_ip)
- cmac = mactobinary(self.client_mac)
r = self.test.vapi.pppoe_add_del_session(
r = self.test.vapi.pppoe_add_del_session(
-
cip, c
mac,
+
self.client_ip, self.client_
mac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id)
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id)
- self.
_sw_if_index = r.sw_if_index
- s
uper(VppPppoeInterface, self).__init__(self._test)
+ self.
set_sw_if_index(r.sw_if_index)
+ s
elf.vpp_sw_if_index = r.sw_if_index
self.generate_remote_hosts()
def remove_vpp_config(self):
self.generate_remote_hosts()
def remove_vpp_config(self):
- cip = socket.inet_pton(socket.AF_INET, self.client_ip)
- cmac = mactobinary(self.client_mac)
self.unconfig()
self.unconfig()
-
r =
self.test.vapi.pppoe_add_del_session(
-
cip, c
mac,
+ self.test.vapi.pppoe_add_del_session(
+
self.client_ip, self.client_
mac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_add=0)
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_add=0)
+
+ def set_unnumbered(self, swif_iface):
+ self.test.vapi.sw_interface_set_unnumbered(
+ swif_iface,
+ self.vpp_sw_if_index)