summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2013-05-27 18:15:26 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-05-31 17:41:00 +0900
commitd86f04015a3c81ea7df909588b4cc22253d56dbc (patch)
tree2e86d6298cce5ce5ff924feaa13ec5ef89be44a8
parentf09407e4d6660a34a35aca12fb28d7e0a942eb72 (diff)
of1.0: use tun_id instead of tun_id_
Since there is no name conflict with tun_id, no reason to use tun_id_ instead of tun_id. This is needed for OF message conversion from/to json later. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/ofproto_v1_0_parser.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py
index 8e7b883d..8bca9e9a 100644
--- a/ryu/ofproto/ofproto_v1_0_parser.py
+++ b/ryu/ofproto/ofproto_v1_0_parser.py
@@ -543,9 +543,9 @@ class NXActionResubmitTable(NXActionResubmitBase):
@NXActionHeader.register_nx_action_subtype(
ofproto_v1_0.NXAST_SET_TUNNEL, ofproto_v1_0.NX_ACTION_SET_TUNNEL_SIZE)
class NXActionSetTunnel(NXActionHeader):
- def __init__(self, tun_id_):
+ def __init__(self, tun_id):
super(NXActionSetTunnel, self).__init__()
- self.tun_id = tun_id_
+ self.tun_id = tun_id
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_0.NX_ACTION_SET_TUNNEL_PACK_STR, buf,
@@ -646,9 +646,9 @@ class NXActionRegLoad(NXActionHeader):
@NXActionHeader.register_nx_action_subtype(
ofproto_v1_0.NXAST_SET_TUNNEL64, ofproto_v1_0.NX_ACTION_SET_TUNNEL64_SIZE)
class NXActionSetTunnel64(NXActionHeader):
- def __init__(self, tun_id_):
+ def __init__(self, tun_id):
super(NXActionSetTunnel64, self).__init__()
- self.tun_id = tun_id_
+ self.tun_id = tun_id
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_0.NX_ACTION_SET_TUNNEL64_PACK_STR, buf,