From e67d9faf2bf732b72c4f72efdd9e99821654cf7b Mon Sep 17 00:00:00 2001 From: "watanabe.fumitaka" Date: Tue, 7 Jan 2014 20:27:29 +0900 Subject: [PATCH] firewall: correct acquisition result of DENY rule When blocked packet logging is enabled, GET rest command shows DENY rules as 'ALLOW' before. This patch improves it. Signed-off-by: WATANABE Fumitaka Signed-off-by: FUJITA Tomonori --- ryu/app/rest_firewall.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ryu/app/rest_firewall.py b/ryu/app/rest_firewall.py index 8b5a885c..4710b0b0 100644 --- a/ryu/app/rest_firewall.py +++ b/ryu/app/rest_firewall.py @@ -870,7 +870,7 @@ class Firewall(object): rule = {REST_RULE_ID: ruleid} rule.update({REST_PRIORITY: flow[REST_PRIORITY]}) rule.update(Match.to_rest(flow)) - rule.update(Action.to_rest(flow)) + rule.update(Action.to_rest(self.dp, flow)) return rule @@ -988,9 +988,10 @@ class Action(object): return action @staticmethod - def to_rest(openflow): + def to_rest(dp, openflow): if REST_ACTION in openflow: - if len(openflow[REST_ACTION]) > 0: + action_allow = 'OUTPUT:%d' % dp.ofproto.OFPP_NORMAL + if openflow[REST_ACTION] == [action_allow]: action = {REST_ACTION: REST_ACTION_ALLOW} else: action = {REST_ACTION: REST_ACTION_DENY}