openstack
/
dragonflow
Code Issues Proposed changes

Merge "Change vague HTTP_PORT to METADATA_HTTP_PORT"

This commit is contained in:
Jenkins 2017-02-09 03:10:23 +00:00 committed by Gerrit Code Review
parent 6c4c47d76d 70c3abe638
commit 42329b6af1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dragonflow/controller/common/constants.py
View File

@ -118,7 +118,7 @@ GLOBAL_INIT_AGING_COOKIE = 0x1
# contact 169.254.169.254:80, despite of where we actually listen to the
# service. This will be modified by flows.
METADATA_SERVICE_IP = '169.254.169.254'
HTTP_PORT = 80
METADATA_HTTP_PORT = 80
DHCP_CLIENT_PORT = 68
DHCP_SERVER_PORT = 67

6
dragonflow/controller/metadata_service_app.py
View File

@ -187,7 +187,7 @@ class MetadataServiceApp(df_base_app.DFlowApp):
eth_type=ethernet.ether.ETH_TYPE_IP,
ipv4_dst=const.METADATA_SERVICE_IP,
ip_proto=ipv4.inet.IPPROTO_TCP,
tcp_dst=const.HTTP_PORT,
tcp_dst=const.METADATA_HTTP_PORT,
)
inst = [parser.OFPInstructionGotoTable(
const.SERVICES_CLASSIFICATION_TABLE)]
@ -226,7 +226,7 @@ class MetadataServiceApp(df_base_app.DFlowApp):
actions = []
if self._ip != const.METADATA_SERVICE_IP:
actions.append(parser.OFPActionSetField(ipv4_dst=self._ip))
if self._port != const.HTTP_PORT:
if self._port != const.METADATA_HTTP_PORT:
actions.append(parser.OFPActionSetField(tcp_dst=self._port))
actions.append(parser.OFPActionSetField(reg7=self._ofport))
return actions
@ -300,7 +300,7 @@ class MetadataServiceApp(df_base_app.DFlowApp):
n_bits=32,
),
parser.NXFlowSpecLoad(
src=const.HTTP_PORT,
src=const.METADATA_HTTP_PORT,
dst=('tcp_src', 0),
n_bits=16,
),