~zulcss/ubuntu/precise/quantum/trunk

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/nexus/cisco_nexus_snippets.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short, Soren Hansen
  • Date: 2012-09-07 18:50:09 UTC
  • mfrom: (2.1.11)
  • Revision ID: package-import@ubuntu.com-20120907185009-n6lh5tkcci19jz1h
Tags: 2012.2~rc1~20120907.1154-0ubuntu1
[ Adam Gandelman ]
* debian/control: Add missing python-keystone dependency.
* wrap-and-sort.

[ Chuck Short ]
* debian/rules:
  - Run testsuite on build.
  - Use get-orig-source.
  - Add python-amqplib, python-anyjson, python-httplib2, python-iso8601,
    python-kombu, python-lxml, python-netadr, python-pyudev to build depends
    and run time deps.
  - Add python-mock, python-mox, and python-unitest2 to build deps.
  - Add adduser as a dep to quantum-common.
* debian/control: Bump standards version to 3.9.3
* debian/quantum-common.install: Add missing configuration files.
  (LP: #988999)
* debian/quantum-plugin-linuxbridge.install: Make isntallable.
* Add manpages: gratitously ripped from debian.
* Fix up lintian warnings. (LP: #1025203), (LP: #1021921)
* Add metaplugin plugin.
* debian/patches/fix-namespace.patch: Dropped it was causing
  python namespace issues.
  (LP: #1045064)
* debian/*.upstart:
  - Specify configuration file and log directory.
  - Start on the right transition.
* debian/rules:
  - Allow to disable testsuite.
  - Dont fail if the testsuite fails.
* debian/patches/fix-quantum-configuration.patch: Fix configuration files.
* Add packaging for quantum-plugin-l3 and quantum-plugin-l3-agent
* Add packaging for quantum-plugin-dhcp-agent and quantum-plugin-dchp-agent
* debian/patches/fix-ubuntu-tests.patch: Fix testsuite failures.

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Add python-configobj as a build and run time dependency. Recently added
  tests need it, and the Cisco plugin has needed it for a while.
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
125
125
              <interface>%s</interface>
126
126
              <__XML__MODE_if-ethernet-switch>
127
127
                <switchport></switchport>
128
 
                <no>
129
128
                <switchport>
130
129
                  <trunk>
131
130
                    <allowed>
132
131
                      <vlan>
133
 
                        <__XML__BLK_Cmd_switchport_trunk_allowed_allow-vlans>
134
 
                          <allow-vlans>%s</allow-vlans>
135
 
                        </__XML__BLK_Cmd_switchport_trunk_allowed_allow-vlans>
 
132
                        <remove>
 
133
                          <vlan>%s</vlan>
 
134
                        </remove>
136
135
                      </vlan>
137
136
                    </allowed>
138
137
                  </trunk>
139
138
                </switchport>
140
 
               </no>
141
139
              </__XML__MODE_if-ethernet-switch>
142
140
            </ethernet>
143
141
          </interface>