diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-07-17 06:57:33 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-07-17 19:31:58 +0900 |
| commit | ad184686a89c8362a5b991f71d1283c93ce408fc (patch) | |
| tree | be3ee2e78f5276fcfdf404a39e2d25ea49b2b85a | |
| parent | f8b75c92a81e5c557a635bad6a7b6d03c8af485d (diff) | |
nxm: remove import ofproto
Use ofproto_v1_0 explicitly instead.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/nx_match.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ryu/ofproto/nx_match.py b/ryu/ofproto/nx_match.py index 3fe55665..b9f9695f 100644 --- a/ryu/ofproto/nx_match.py +++ b/ryu/ofproto/nx_match.py @@ -22,7 +22,6 @@ from ryu import exception from ryu.lib import mac from . import ofproto_parser from . import ofproto_v1_0 -from . import ofproto import logging LOG = logging.getLogger('ryu.ofproto.nx_match') @@ -309,19 +308,19 @@ class ClsRule(object): def match_tuple(self): assert self.flow_format() == ofproto_v1_0.NXFF_OPENFLOW10 - wildcards = ofproto.OFPFW_ALL + wildcards = ofproto_v1_0.OFPFW_ALL if not self.wc.wildcards & FWW_IN_PORT: - wildcards &= ~ofproto.OFPFW_IN_PORT + wildcards &= ~ofproto_v1_0.OFPFW_IN_PORT if self.flow.dl_src != mac.DONTCARE: - wildcards &= ~ofproto.OFPFW_DL_SRC + wildcards &= ~ofproto_v1_0.OFPFW_DL_SRC if self.flow.dl_dst != mac.DONTCARE: - wildcards &= ~ofproto.OFPFW_DL_DST + wildcards &= ~ofproto_v1_0.OFPFW_DL_DST if not self.wc.wildcards & FWW_DL_TYPE: - wildcards &= ~ofproto.OFPFW_DL_TYPE + wildcards &= ~ofproto_v1_0.OFPFW_DL_TYPE # FIXME: Add support for dl_vlan, fl_vlan_pcp, nw_tos, nw_proto, # nw_src, nw_dst, tp_src and dp_dst to self |