Merge lp:~thedac/ubuntu/vivid/neutron-fwaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-fwaas

[Corey Bryant]

[Corey Bryant (corey.bryant)]

review: Approve

[Corey Bryant (corey.bryant)]

review: Approve

[Corey Bryant (corey.bryant)]

I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.

Unmerged revisions

9. By David Ames on 2015-08-04

Import upstream version 2015.1.1

=== modified file 'ChangeLog'
--- ChangeLog	2015-04-30 17:40:32 +0000
+++ ChangeLog	2015-08-04 16:55:56 +0000
@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+2015.1.1
+--------
+
+* Updated from global requirements
+* Updated from global requirements
+* Bump pre-release to 2015.1.1
+* Make iptables firewall work with L3 plugin without DVR support
+
 2015.1.0
 --------
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2015-04-30 17:40:32 +0000
+++ PKG-INFO	2015-08-04 16:55:56 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neutron-fwaas
-Version: 2015.1.0
+Version: 2015.1.1
 Summary: OpenStack Networking FWaaS
 Home-page: http://www.openstack.org/
 Author: OpenStack

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-30 17:40:32 +0000
+++ debian/changelog	2015-08-04 16:55:56 +0000
@@ -1,3 +1,10 @@
+neutron-fwaas (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (cdcd5a7) (LP: #1481008):
+    - [cdcd5a7] Make iptables firewall work with L3 plugin without DVR support
+
+ -- David Ames <[e-mail]>  Tue, 04 Aug 2015 08:40:49 -0700
+
 neutron-fwaas (2015.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release for OpenStack Kilo. (LP: #1449744) 

=== modified file 'neutron_fwaas.egg-info/PKG-INFO'
--- neutron_fwaas.egg-info/PKG-INFO	2015-04-30 17:40:32 +0000
+++ neutron_fwaas.egg-info/PKG-INFO	2015-08-04 16:55:56 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neutron-fwaas
-Version: 2015.1.0
+Version: 2015.1.1
 Summary: OpenStack Networking FWaaS
 Home-page: http://www.openstack.org/
 Author: OpenStack

=== modified file 'neutron_fwaas.egg-info/pbr.json'
--- neutron_fwaas.egg-info/pbr.json	2015-04-30 17:40:32 +0000
+++ neutron_fwaas.egg-info/pbr.json	2015-08-04 16:55:56 +0000
@@ -1,1 +1,1 @@
-{"is_release": true, "git_version": "3313166"}
\ No newline at end of file
+{"is_release": true, "git_version": "23441f6"}
\ No newline at end of file

=== modified file 'neutron_fwaas.egg-info/requires.txt'
--- neutron_fwaas.egg-info/requires.txt	2015-04-10 09:38:51 +0000
+++ neutron_fwaas.egg-info/requires.txt	2015-08-04 16:55:56 +0000
@@ -1,13 +1,13 @@
-pbr>=0.6,!=0.7,<1.0
-eventlet>=0.16.1,!=0.17.0
+pbr!=0.7,<1.0,>=0.6
+eventlet!=0.17.0,>=0.16.1
 httplib2>=0.7.5
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<=0.9.99,>=0.9.7
 alembic>=0.7.2
 six>=1.9.0
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.db>=1.7.0,<1.8.0  # Apache-2.0
-oslo.log>=1.0.0,<1.1.0  # Apache-2.0
-oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
-oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0

=== modified file 'neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py'
--- neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py	2015-03-30 11:19:40 +0000
+++ neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py	2015-08-04 16:55:56 +0000
@@ -73,7 +73,7 @@
         namespace and a fip so this is provided back as a list - so in that
         scenario rules can be applied on both.
         """
-        if not router_info.router['distributed']:
+        if not router_info.router.get('distributed'):
             return [{'ipt': router_info.iptables_manager,
                      'if_prefix': INTERNAL_DEV_PREFIX}]
         ipt_mgrs = []

=== modified file 'neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py'
--- neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py	2015-04-10 09:38:51 +0000
+++ neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py	2015-08-04 16:55:56 +0000
@@ -93,7 +93,10 @@
         apply_list = []
         while router_count > 0:
             iptables_inst = mock.Mock()
-            router_inst = {'distributed': distributed}
+            if distributed is not None:
+                router_inst = {'distributed': distributed}
+            else:
+                router_inst = {}
             v4filter_inst = mock.Mock()
             v6filter_inst = mock.Mock()
             v4filter_inst.chains = []
@@ -203,6 +206,10 @@
     def test_create_firewall_with_rules(self):
         self._setup_firewall_with_rules(self.firewall.create_firewall)
 
+    def test_create_firewall_with_rules_without_distributed_attr(self):
+        self._setup_firewall_with_rules(self.firewall.create_firewall,
+                                        distributed=None)
+
     def test_create_firewall_with_rules_two_routers(self):
         self._setup_firewall_with_rules(self.firewall.create_firewall,
                                         router_count=2)
@@ -210,8 +217,12 @@
     def test_update_firewall_with_rules(self):
         self._setup_firewall_with_rules(self.firewall.update_firewall)
 
-    def test_delete_firewall(self):
-        apply_list = self._fake_apply_list()
+    def test_update_firewall_with_rules_without_distributed_attr(self):
+        self._setup_firewall_with_rules(self.firewall.update_firewall,
+                                        distributed=None)
+
+    def _test_delete_firewall(self, distributed=False):
+        apply_list = self._fake_apply_list(distributed=distributed)
         firewall = self._fake_firewall_no_rule()
         self.firewall.delete_firewall('legacy', apply_list, firewall)
         ingress_chain = 'iv4%s' % firewall['id']
@@ -221,6 +232,12 @@
                  mock.call.remove_chain('fwaas-default-policy')]
         apply_list[0].iptables_manager.ipv4['filter'].assert_has_calls(calls)
 
+    def test_delete_firewall(self):
+        self._test_delete_firewall()
+
+    def test_delete_firewall_without_distributed_attr(self):
+        self._test_delete_firewall(distributed=None)
+
     def test_create_firewall_with_admin_down(self):
         apply_list = self._fake_apply_list()
         rule_list = self._fake_rules_v4(FAKE_FW_ID, apply_list)

=== modified file 'requirements.txt'
--- requirements.txt	2015-04-30 17:40:32 +0000
+++ requirements.txt	2015-08-04 16:55:56 +0000
@@ -1,20 +1,20 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 
-eventlet>=0.16.1,!=0.17.0
+eventlet!=0.17.0,>=0.16.1
 httplib2>=0.7.5
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<=0.9.99,>=0.9.7
 alembic>=0.7.2
 six>=1.9.0
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.db>=1.7.0,<1.8.0  # Apache-2.0
-oslo.log>=1.0.0,<1.1.0  # Apache-2.0
-oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
-oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 
 # This project does depend on neutron as a library, but the
 # openstack tooling does not play nicely with projects that

=== modified file 'setup.cfg'
--- setup.cfg	2015-02-16 14:11:17 +0000
+++ setup.cfg	2015-08-04 16:55:56 +0000
@@ -1,6 +1,6 @@
 [metadata]
 name = neutron-fwaas
-version = 2015.1
+version = 2015.1.1
 summary = OpenStack Networking FWaaS
 description-file = 
 	README.rst

=== modified file 'setup.py'
--- setup.py	2015-01-14 10:11:07 +0000
+++ setup.py	2015-08-04 16:55:56 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

=== modified file 'test-requirements.txt'
--- test-requirements.txt	2015-04-10 09:38:51 +0000
+++ test-requirements.txt	2015-08-04 16:55:56 +0000
@@ -1,23 +1,23 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
-cliff>=1.10.0,<1.11.0  # Apache-2.0
+cliff<1.11.0,>=1.10.0 # Apache-2.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
-mock>=1.0
+fixtures<1.3.0,>=0.3.14
+mock<1.1.0,>=1.0
 python-subunit>=0.0.18
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
-oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36
 testscenarios>=0.4
 WebOb>=1.2.3
 WebTest>=2.0
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
 psycopg2
 MySQL-python