Signed-off-by: IWASE Yusuke <[email protected]>
---
ryu/ofproto/nx_match.py | 6 +++---
ryu/ofproto/ofproto_parser.py | 3 +--
ryu/ofproto/ofproto_v1_0_parser.py | 10 +++++-----
ryu/ofproto/ofproto_v1_2_parser.py | 9 ++++-----
ryu/ofproto/ofproto_v1_3_parser.py | 15 ++++++---------
ryu/ofproto/ofproto_v1_4_parser.py | 9 +++------
ryu/ofproto/ofproto_v1_5_parser.py | 16 ++++++----------
ryu/ofproto/oxx_fields.py | 1 -
8 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/ryu/ofproto/nx_match.py b/ryu/ofproto/nx_match.py
index dae24b6..86d39a8 100644
--- a/ryu/ofproto/nx_match.py
+++ b/ryu/ofproto/nx_match.py
@@ -20,9 +20,9 @@ import struct
from ryu import exception
from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
-from . import ofproto_parser
-from . import ofproto_v1_0
-from . import inet
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_v1_0
+from ryu.ofproto import inet
import logging
LOG = logging.getLogger('ryu.ofproto.nx_match')
diff --git a/ryu/ofproto/ofproto_parser.py b/ryu/ofproto/ofproto_parser.py
index 360e938..ed726ff 100644
--- a/ryu/ofproto/ofproto_parser.py
+++ b/ryu/ofproto/ofproto_parser.py
@@ -20,14 +20,13 @@ import base64
import collections
import logging
import struct
-import sys
import functools
from ryu import exception
from ryu import utils
from ryu.lib import stringify
-from . import ofproto_common
+from ryu.ofproto import ofproto_common
LOG = logging.getLogger('ryu.ofproto.ofproto_parser')
diff --git a/ryu/ofproto/ofproto_v1_0_parser.py
b/ryu/ofproto/ofproto_v1_0_parser.py
index 9f0e4ff..4b00db1 100644
--- a/ryu/ofproto/ofproto_v1_0_parser.py
+++ b/ryu/ofproto/ofproto_v1_0_parser.py
@@ -22,14 +22,14 @@ import struct
import binascii
import six
-from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, msg_str_attr
+from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase
from ryu.lib import addrconv
from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
-from . import ofproto_common
-from . import ofproto_parser
-from . import ofproto_v1_0 as ofproto
-from . import nx_match
+from ryu.ofproto import ofproto_common
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_v1_0 as ofproto
+from ryu.ofproto import nx_match
from ryu import utils
import logging
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py
b/ryu/ofproto/ofproto_v1_2_parser.py
index 4b38341..28debf8 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -20,16 +20,15 @@ Decoder/Encoder implementations of OpenFlow 1.2.
import six
import struct
-import itertools
from ryu.lib import addrconv
from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
from ryu import utils
-from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, msg_str_attr
-from . import ether
-from . import ofproto_parser
-from . import ofproto_v1_2 as ofproto
+from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase
+from ryu.ofproto import ether
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_v1_2 as ofproto
import logging
LOG = logging.getLogger('ryu.ofproto.ofproto_v1_2_parser')
diff --git a/ryu/ofproto/ofproto_v1_3_parser.py
b/ryu/ofproto/ofproto_v1_3_parser.py
index c2b2754..950f039 100644
--- a/ryu/ofproto/ofproto_v1_3_parser.py
+++ b/ryu/ofproto/ofproto_v1_3_parser.py
@@ -42,18 +42,17 @@ The following extensions are not implemented yet.
import six
import struct
-import itertools
from ryu.lib import addrconv
from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
from ryu import utils
-from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, msg_str_attr
-from . import ether
-from . import nicira_ext
-from . import ofproto_parser
-from . import ofproto_common
-from . import ofproto_v1_3 as ofproto
+from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase
+from ryu.ofproto import ether
+from ryu.ofproto import nx_actions
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_common
+from ryu.ofproto import ofproto_v1_3 as ofproto
import logging
LOG = logging.getLogger('ryu.ofproto.ofproto_v1_3_parser')
@@ -6084,8 +6083,6 @@ class OFPSetAsync(MsgBase):
self.flow_removed_mask[0], self.flow_removed_mask[1])
-from ryu.ofproto import nx_actions
-
nx_actions.generate(
'ryu.ofproto.ofproto_v1_3',
'ryu.ofproto.ofproto_v1_3_parser'
diff --git a/ryu/ofproto/ofproto_v1_4_parser.py
b/ryu/ofproto/ofproto_v1_4_parser.py
index e6ec341..d3fc87c 100644
--- a/ryu/ofproto/ofproto_v1_4_parser.py
+++ b/ryu/ofproto/ofproto_v1_4_parser.py
@@ -20,17 +20,14 @@ Decoder/Encoder implementations of OpenFlow 1.4.
import six
import struct
-import itertools
from ryu.lib import addrconv
-from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
from ryu import utils
from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, MsgInMsgBase,
msg_str_attr
-from . import ether
-from . import ofproto_parser
-from . import ofproto_common
-from . import ofproto_v1_4 as ofproto
+from ryu.ofproto import ether
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_v1_4 as ofproto
_MSG_PARSERS = {}
diff --git a/ryu/ofproto/ofproto_v1_5_parser.py
b/ryu/ofproto/ofproto_v1_5_parser.py
index fbcf65a..aa03e5a 100644
--- a/ryu/ofproto/ofproto_v1_5_parser.py
+++ b/ryu/ofproto/ofproto_v1_5_parser.py
@@ -20,18 +20,16 @@ Decoder/Encoder implementations of OpenFlow 1.5.
import six
import struct
-import itertools
from ryu.lib import addrconv
-from ryu.lib import mac
from ryu.lib.pack_utils import msg_pack_into
from ryu import utils
-from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, MsgInMsgBase,
msg_str_attr
-from . import ether
-from . import nicira_ext
-from . import ofproto_parser
-from . import ofproto_common
-from . import ofproto_v1_5 as ofproto
+from ryu.ofproto.ofproto_parser import StringifyMixin, MsgBase, MsgInMsgBase
+from ryu.ofproto import ether
+from ryu.ofproto import nx_actions
+from ryu.ofproto import ofproto_parser
+from ryu.ofproto import ofproto_common
+from ryu.ofproto import ofproto_v1_5 as ofproto
_MSG_PARSERS = {}
@@ -6598,8 +6596,6 @@ class OFPBundleAddMsg(MsgInMsgBase):
self.buf += tail_buf
-from . import nx_actions
-
nx_actions.generate(
'ryu.ofproto.ofproto_v1_5',
'ryu.ofproto.ofproto_v1_5_parser'
diff --git a/ryu/ofproto/oxx_fields.py b/ryu/ofproto/oxx_fields.py
index 1e4c7c5..e1e47aa 100644
--- a/ryu/ofproto/oxx_fields.py
+++ b/ryu/ofproto/oxx_fields.py
@@ -23,7 +23,6 @@
# value and mask are on-wire bytes.
# mask is None if no mask.
-import itertools
import six
import struct
--
1.9.1
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
