openstack
/
neutron
Code Issues Proposed changes

Merge "tests: Use constants for icmp and arp in conn_testers"

This commit is contained in:
Jenkins 2016-02-16 15:58:56 +00:00 committed by Gerrit Code Review
parent 5ccd44d3c3 66503bd90d
commit 3dec972fcd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/common/constants.py
View File

@ -47,6 +47,7 @@ PAGINATION_INFINITE = 'infinite'
SORT_DIRECTION_ASC = 'asc'
SORT_DIRECTION_DESC = 'desc'
ETHERTYPE_NAME_ARP = 'arp'
ETHERTYPE_IPV6 = 0x86DD
# Protocol names and numbers for Security Groups/Firewalls

5
neutron/tests/common/conn_testers.py
View File

@ -20,6 +20,7 @@ from oslo_log import log as logging
from neutron.agent import firewall
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import constants
from neutron.tests.common import machine_fixtures
from neutron.tests.common import net_helpers
@ -52,8 +53,8 @@ class ConnectionTester(fixtures.Fixture):
UDP = net_helpers.NetcatTester.UDP
TCP = net_helpers.NetcatTester.TCP
ICMP = 'icmp'
ARP = 'arp'
ICMP = constants.PROTO_NAME_ICMP
ARP = constants.ETHERTYPE_NAME_ARP
INGRESS = firewall.INGRESS_DIRECTION
EGRESS = firewall.EGRESS_DIRECTION