whitepaper: 352/169 — wave4 MEDIUM (hadoop/hbase/nova/neutron/openstack) + fix odl-0002 dup
This commit is contained in:
parent
9934133dcf
commit
835ae73b0f
82 changed files with 5931 additions and 6 deletions
30
defects/neutron/patch/neutron-0001.patch
Normal file
30
defects/neutron/patch/neutron-0001.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
--- a/neutron/agent/linux/iptables_firewall.py
|
||||
+++ b/neutron/agent/linux/iptables_firewall.py
|
||||
@@ -73,7 +73,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
|
||||
self.unfiltered_ports = {}
|
||||
- self.trusted_ports = []
|
||||
+ self.trusted_ports = set()
|
||||
self.ipconntrack = ip_conntrack.get_conntrack(
|
||||
self.iptables.get_rules_for_table, self.filtered_ports,
|
||||
self.unfiltered_ports, namespace=namespace,
|
||||
@@ -151,7 +151,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
|
||||
def process_trusted_ports(self, port_ids):
|
||||
"""Process ports that are trusted and shouldn't be filtered."""
|
||||
for port in port_ids:
|
||||
if port not in self.trusted_ports:
|
||||
jump_rule = self._generate_trusted_port_rules(port)
|
||||
self._add_rules_to_chain_v4v6(
|
||||
'FORWARD', jump_rule, jump_rule, comment=ic.TRUSTED_ACCEPT)
|
||||
self._add_nat_short_ciruit(port)
|
||||
- self.trusted_ports.append(port)
|
||||
+ self.trusted_ports.add(port)
|
||||
|
||||
def remove_trusted_ports(self, port_ids):
|
||||
for port in port_ids:
|
||||
if port in self.trusted_ports:
|
||||
jump_rule = self._generate_trusted_port_rules(port)
|
||||
self._remove_rule_from_chain_v4v6(
|
||||
'FORWARD', jump_rule, jump_rule)
|
||||
self._remove_nat_short_ciruit(port)
|
||||
- self.trusted_ports.remove(port)
|
||||
+ self.trusted_ports.discard(port)
|
||||
8
defects/neutron/patch/neutron-0002.patch
Normal file
8
defects/neutron/patch/neutron-0002.patch
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
--- a/neutron/db/l3_dvrscheduler_db.py
|
||||
+++ b/neutron/db/l3_dvrscheduler_db.py
|
||||
@@ -255,7 +255,7 @@ class L3_DVRsch_db_mixin(l3agent_sch_db.L3AgentSchedulerDbMixin):
|
||||
related_router_ids |= connected_dvr_router_ids
|
||||
- related_router_ids = [r_id for r_id in related_router_ids
|
||||
- if r_id not in list(router_ids)]
|
||||
+ related_router_ids = [r_id for r_id in related_router_ids
|
||||
+ if r_id not in router_ids]
|
||||
Loading…
Add table
Add a link
Reference in a new issue