← Back to branch summary

~niedbalski/ubuntu/vivid/neutron/fixes-1447803

« back to all changes in this revision

Viewing changes to neutron/agent/linux/iptables_manager.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-10-03 18:45:23 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20141003184523-4mt6dy1q3j8n30c9
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1323729
* New upstream release candidate:
  - d/p/*: Refreshed.
  - d/control: Add python-requests-mock to BD's.
  - d/control: Align versioned requirements with upstream.
* Transition linuxbridge and openvswitch plugin users to modular
  layer 2 plugin (LP: #1323729):
  - d/control: Mark removed plugin packages as transitional, depend
    on neutron-plugin-ml2, mark oldlibs/extra.
  - d/neutron-plugin-{linuxbridge,openvswitch}.install: Drop.
  - d/control: Depend on neutron-plugin-ml2 for linuxbridge
    agent package.
  - d/neutron-plugin-linuxbridge-agent.upstart: Use ml2 plugin
    configuration files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/agent/linux/iptables_manager.py
13
13
#    See the License for the specific language governing permissions and
14
14
#    limitations under the License.
15
15
#
16
 
# @author: Juliano Martinez, Locaweb.
17
16
# based on
18
 
#   https://github.com/openstack/nova/blob/master/nova/network/linux_net.py
 
17
# https://github.com/openstack/nova/blob/master/nova/network/linux_net.py
19
18
 
20
19
"""Implements iptables rules using linux utilities."""
21
20
 
321
320
                {'nat': IptablesTable(binary_name=self.wrap_name)})
322
321
            builtin_chains[4].update({'nat': ['PREROUTING',
323
322
                                      'OUTPUT', 'POSTROUTING']})
 
323
            self.ipv4.update(
 
324
                {'raw': IptablesTable(binary_name=self.wrap_name)})
 
325
            builtin_chains[4].update({'raw': ['PREROUTING',
 
326
                                      'OUTPUT']})
324
327
 
325
328
        for ip_version in builtin_chains:
326
329
            if ip_version == 4: