← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-security

« back to all changes in this revision

Viewing changes to nova/rootwrap/network.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/rootwrap/network.py
15
15
#    License for the specific language governing permissions and limitations
16
16
#    under the License.
17
17
 
18
 
 
19
18
from nova.rootwrap import filters
20
19
 
 
20
 
21
21
filterlist = [
22
22
    # nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i..
23
23
    # nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'..
40
40
 
41
41
    # nova/network/linux_net.py: 'ip[6]tables-save' % (cmd,), '-t', ...
42
42
    filters.CommandFilter("/sbin/iptables-save", "root"),
 
43
    filters.CommandFilter("/usr/sbin/iptables-save", "root"),
43
44
    filters.CommandFilter("/sbin/ip6tables-save", "root"),
 
45
    filters.CommandFilter("/usr/sbin/ip6tables-save", "root"),
44
46
 
45
47
    # nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
46
48
    filters.CommandFilter("/sbin/iptables-restore", "root"),
 
49
    filters.CommandFilter("/usr/sbin/iptables-restore", "root"),
47
50
    filters.CommandFilter("/sbin/ip6tables-restore", "root"),
 
51
    filters.CommandFilter("/usr/sbin/ip6tables-restore", "root"),
48
52
 
49
53
    # nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
50
54
    # nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
51
55
    filters.CommandFilter("/usr/bin/arping", "root"),
 
56
    filters.CommandFilter("/sbin/arping", "root"),
52
57
 
53
58
    # nova/network/linux_net.py: 'route', '-n'
54
59
    # nova/network/linux_net.py: 'route', 'del', 'default', 'gw'