Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
plugins: http_static. Migrate to use api string type.
[vpp.git]
/
test
/
vpp_pppoe_interface.py
diff --git
a/test/vpp_pppoe_interface.py
b/test/vpp_pppoe_interface.py
index
fbb78bc
..
9be9232
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,7
+12,7
@@
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.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
@@
-20,20
+20,19
@@
class VppPppoeInterface(VppInterface):
def add_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
def add_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
- cmac = mac
tobinary
(self.client_mac)
+ cmac = mac
_pton
(self.client_mac)
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id)
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id)
- self._sw_if_index = r.sw_if_index
- super(VppPppoeInterface, self).__init__(self._test)
+ self.set_sw_if_index(r.sw_if_index)
self.generate_remote_hosts()
def remove_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
self.generate_remote_hosts()
def remove_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET, self.client_ip)
- cmac = mac
tobinary
(self.client_mac)
+ cmac = mac
_pton
(self.client_mac)
self.unconfig()
self.unconfig()
-
r =
self.test.vapi.pppoe_add_del_session(
+ self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,