]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 4bd386f)
Fix for Cisco plugin physical device config error
authorArvind Somya <asomya@cisco.com>
Fri, 29 Mar 2013 17:06:17 +0000 (13:06 -0400)
committerArvind Somya <asomya@cisco.com>
Fri, 29 Mar 2013 17:09:05 +0000 (13:09 -0400)
This patch fixes a bug with the Cisco plugin where subsequent vlan id's
would overwrite the existing trunking config on a switch interface.

Change-Id: I5e97c00062f687838e60e5dc9470f4a62289676b
Fixes: Bug #1161946
quantum/plugins/cisco/nexus/cisco_nexus_snippets.py patch | blob | history

diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
index 5bad67b90814d846bedf9ea329478e72ff98fc12..a2f79269d925d0bec274de96904d131284ea119d 100644 (file)
--- a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
+++ b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
@@ -75,9 +75,9 @@ CMD_VLAN_INT_SNIPPET = """
                   <trunk>
                     <allowed>
                       <vlan>
-                        <__XML__BLK_Cmd_switchport_trunk_allowed_allow-vlans>
-                          <allow-vlans>%s</allow-vlans>
-                        </__XML__BLK_Cmd_switchport_trunk_allowed_allow-vlans>
+                        <add>
+                          <add_vlans>%s</add_vlans>
+                        </add>
                       </vlan>
                     </allowed>
                   </trunk>