summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorwatanabe.fumitaka <watanabe.fumitaka@nttcom.co.jp>2013-09-03 13:33:36 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-09-03 14:00:47 +0900
commit183736604941a991df6fd9cc8701a17d561341d5 (patch)
tree8cf9407e7a93544b3def2889ee2a571ce26a4a8d
parent62170fba87eb53bb4bcebe48097f7aaf72c62fbf (diff)
rest_firewall: bug fix of dict keyError
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/app/rest_firewall.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ryu/app/rest_firewall.py b/ryu/app/rest_firewall.py
index ef4136aa..c547cb0e 100644
--- a/ryu/app/rest_firewall.py
+++ b/ryu/app/rest_firewall.py
@@ -629,7 +629,7 @@ class Firewall(object):
for flow_stat in flow_stats:
if (flow_stat[REST_PRIORITY] != STATUS_FLOW_PRIORITY
and flow_stat[REST_PRIORITY] != ARP_FLOW_PRIORITY):
- vid = flow_stat[REST_MATCH][REST_DL_VLAN]
+ vid = flow_stat[REST_MATCH].get(REST_DL_VLAN, VLANID_NONE)
if vlan_id == REST_ALL or vlan_id == vid:
rule = self._to_rest_rule(flow_stat)
rules.setdefault(vid, {})
@@ -666,7 +666,7 @@ class Firewall(object):
cookie = flow_stat[REST_COOKIE]
ruleid = Firewall._cookie_to_ruleid(cookie)
priority = flow_stat[REST_PRIORITY]
- dl_vlan = flow_stat[REST_MATCH][REST_DL_VLAN]
+ dl_vlan = flow_stat[REST_MATCH].get(REST_DL_VLAN, VLANID_NONE)
if (priority != STATUS_FLOW_PRIORITY
and priority != ARP_FLOW_PRIORITY):