From: Arvind Somya <asomya@cisco.com>
Date: Fri, 29 Mar 2013 17:06:17 +0000 (-0400)
Subject: Fix for Cisco plugin physical device config error
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a12046cd21618fc1a9bc12983e96cd8607012141;p=openstack-build%2Fneutron-build.git

Fix for Cisco plugin physical device config error

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
---

diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
index 5bad67b90..a2f79269d 100644
--- 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>