diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-14 11:28:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-14 11:28:19 +0000 |
| commit | 6c476224f62770679f779dc6c13be3879b3a5ed8 (patch) | |
| tree | e295279418ec65349cd327b4ffa882972f097504 | |
| parent | 4ae8d7e743b9267fb79eff303652decfac961992 (diff) | |
| parent | c5ae9dd2789570ad0c885aa88ae08e0a24e41d52 (diff) | |
| download | neutron-6c476224f62770679f779dc6c13be3879b3a5ed8.tar.gz | |
Merge "Only fetch port_id from SG binding table" into stable/juno
| -rw-r--r-- | neutron/db/securitygroups_rpc_base.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py index 6c34cb85bf..2f6e2b7fdb 100644 --- a/neutron/db/securitygroups_rpc_base.py +++ b/neutron/db/securitygroups_rpc_base.py @@ -163,8 +163,7 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin): 'sg_member_ips': {}} rules_in_db = self._select_rules_for_ports(context, ports) remote_security_group_info = {} - for (binding, rule_in_db) in rules_in_db: - port_id = binding['port_id'] + for (port_id, rule_in_db) in rules_in_db: remote_gid = rule_in_db.get('remote_group_id') security_group_id = rule_in_db.get('security_group_id') ethertype = rule_in_db['ethertype'] @@ -229,7 +228,7 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin): sgr_sgid = sg_db.SecurityGroupRule.security_group_id - query = context.session.query(sg_db.SecurityGroupPortBinding, + query = context.session.query(sg_binding_port, sg_db.SecurityGroupRule) query = query.join(sg_db.SecurityGroupRule, sgr_sgid == sg_binding_sgid) @@ -432,8 +431,7 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin): def security_group_rules_for_ports(self, context, ports): rules_in_db = self._select_rules_for_ports(context, ports) - for (binding, rule_in_db) in rules_in_db: - port_id = binding['port_id'] + for (port_id, rule_in_db) in rules_in_db: port = ports[port_id] direction = rule_in_db['direction'] rule_dict = { |