openstack
/
deb-networking-cisco
Code Issues Proposed changes

Merge "cisco nexus ML2: L3 agent HA interfaces-VLAN not created on Nexus switch."

This commit is contained in:
Jenkins 2015-11-24 02:45:07 +00:00 committed by Gerrit Code Review
parent 49376aeb39 93b5f91041
commit e0024707c2
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
networking_cisco/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py
View File

@ -448,7 +448,8 @@ class CiscoNexusMechanismDriver(api.MechanismDriver):
def _is_supported_deviceowner(self, port):
return (port['device_owner'].startswith('compute') or
port['device_owner'] == n_const.DEVICE_OWNER_DHCP)
port['device_owner'] == n_const.DEVICE_OWNER_DHCP or
port['device_owner'] == n_const.DEVICE_OWNER_ROUTER_HA_INTF)
def _is_status_active(self, port):
return port['status'] == n_const.PORT_STATUS_ACTIVE

17
networking_cisco/tests/unit/ml2/drivers/cisco/nexus/test_cisco_nexus.py
View File

@ -63,6 +63,7 @@ NO_VXLAN_ID = 0
MCAST_GROUP = '255.1.1.1'
DEVICE_OWNER_COMPUTE = 'compute:test'
DEVICE_OWNER_DHCP = n_const.DEVICE_OWNER_DHCP
DEVICE_OWNER_ROUTER_HA_INTF = n_const.DEVICE_OWNER_ROUTER_HA_INTF
NEXUS_SSH_PORT = '22'
PORT_STATE = n_const.PORT_STATUS_ACTIVE
NETWORK_TYPE = 'vlan'
@ -196,6 +197,15 @@ class TestCiscoNexusDevice(testlib_api.SqlTestCase):
NO_VXLAN_ID,
None,
DEVICE_OWNER_DHCP),
'test_config_router_ha_intf': TestConfigObj(
NEXUS_IP_ADDRESS,
HOST_NAME_1,
NEXUS_PORT_1,
INSTANCE_1,
VLAN_ID_1,
NO_VXLAN_ID,
None,
DEVICE_OWNER_ROUTER_HA_INTF),
'test_vxlan_config1': TestConfigObj(
NEXUS_IP_ADDRESS,
HOST_NAME_1,
@ -541,6 +551,13 @@ class TestCiscoNexusDevice(testlib_api.SqlTestCase):
self._create_delete_port(
TestCiscoNexusDevice.test_configs['test_config_dhcp'])
def test_create_delete_router_ha_intf(self):
"""Tests creation and deletion of ports with device_owner
of router_ha_interface.
"""
self._create_delete_port(
TestCiscoNexusDevice.test_configs['test_config_router_ha_intf'])
def test_connect_failure(self):
"""Verifies exception handling during ncclient connect. """