diff options
| author | sridhargaddam <sridhar.gaddam@enovance.com> | 2014-11-19 10:03:02 +0000 |
|---|---|---|
| committer | sridhargaddam <sridhar.gaddam@enovance.com> | 2015-01-15 14:34:00 +0000 |
| commit | 845f4618f4818d3f536eda1dde8d9b9d860f0417 (patch) | |
| tree | f1b1ec2f3bf1885a2869d4fe7342634a775091dd /neutronclient/neutron/v2_0/securitygroup.py | |
| parent | fe3d363b2ca67f130a4df83563177cdc45fde792 (diff) | |
| download | python-neutronclient-845f4618f4818d3f536eda1dde8d9b9d860f0417.tar.gz | |
Fix KeyError when filtering SG rule listing
extend_list API of ListSecurityGroupRule class assumes that the data
includes security_group_id and remote_group_id fields, which may not
be the case when we filter on other fields. This patch addresses this
issue.
Closes-Bug: #1359230
Change-Id: Icb38e6e926ae441116ac4a895650f80c24d373a6
Diffstat (limited to 'neutronclient/neutron/v2_0/securitygroup.py')
| -rw-r--r-- | neutronclient/neutron/v2_0/securitygroup.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/neutronclient/neutron/v2_0/securitygroup.py b/neutronclient/neutron/v2_0/securitygroup.py index a1a2bf5..7f27eac 100644 --- a/neutronclient/neutron/v2_0/securitygroup.py +++ b/neutronclient/neutron/v2_0/securitygroup.py @@ -134,7 +134,8 @@ class ListSecurityGroupRule(neutronV20.ListCommand): sec_group_ids = set() for rule in data: for key in self.replace_rules: - sec_group_ids.add(rule[key]) + if key in rule: + sec_group_ids.add(rule[key]) sec_group_ids = list(sec_group_ids) def _get_sec_group_list(sec_group_ids): @@ -164,7 +165,8 @@ class ListSecurityGroupRule(neutronV20.ListCommand): for sg in secgroups if sg['name']]) for rule in data: for key in self.replace_rules: - rule[key] = sg_dict.get(rule[key], rule[key]) + if key in rule: + rule[key] = sg_dict.get(rule[key], rule[key]) def setup_columns(self, info, parsed_args): parsed_args.columns = self.replace_columns(parsed_args.columns, |