Merge "Change lock device id from PowerVC-Lock to Lock"

This commit is contained in:
Jenkins 2014-10-14 07:30:41 +00:00 committed by Gerrit Code Review
commit d2d4e304be
2 changed files with 2 additions and 2 deletions

View File

@ -663,7 +663,7 @@ class PowerVCNeutronAgent(object):
def _delete_local_port(self, local_port, db_port): def _delete_local_port(self, local_port, db_port):
# complex logic here on how to handle it # complex logic here on how to handle it
# some possible cases for this local port: # some possible cases for this local port:
# 1) device_id = PowerVC-Lock occurs when lock IP address done. # 1) device_id = Lock occurs when lock IP address done.
# Delete the local port # Delete the local port
# 2) device_owner = network:router_interface (see issue 173350). # 2) device_owner = network:router_interface (see issue 173350).
# re-create the PVC port # re-create the PVC port

View File

@ -8,7 +8,7 @@ Created on Aug 2, 2013
# Device owner value for Neutron ports we create # Device owner value for Neutron ports we create
POWERVC_DEVICE_OWNER = 'network:IBM SmartCloud' POWERVC_DEVICE_OWNER = 'network:IBM SmartCloud'
POWERVC_LOCKDEVICE_ID = 'PowerVC-Lock' POWERVC_LOCKDEVICE_ID = 'Lock'
RSVD_PORT_PREFIX = 'pvc:' RSVD_PORT_PREFIX = 'pvc:'
# Mapping enum values # Mapping enum values