Merge lp:~corey.bryant/ubuntu/trusty/neutron/fix-for-1273877 into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

This is for neutron packing updates for https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1273877.

  * Renamed Nicira NVP plugin to VMware NSX:
    - debian/neutron-plugin-*.install: Update path and file for rename
    - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin
    - debian/control:
      + Change neutron-plugin-nicira to transtional package
      + Add neutron-plugin-vmware package which breaks/replaces
        neutron-plugin-nicira package.

[Chuck Short (zulcss)]

Needs to reference the bug in the the debian/changelog (LP: #1273877) is fine.

review: Needs Fixing

[lp:~corey.bryant/ubuntu/trusty/neutron/fix-for-1273877]

237. By Corey Bryant on 2014-02-24

* Renamed Nicira NVP plugin to VMware NSX (LP: #1273877):
  - debian/neutron-plugin-*.install: Update path and file for rename
  - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin
  - debian/control:
    + Change neutron-plugin-nicira to transtional package
    + Add neutron-plugin-vmware package which breaks/replaces
      neutron-plugin-nicira package.
*

[Corey Bryant (corey.bryant)]

> Needs to reference the bug in the the debian/changelog (LP: #1273877) is fine.

Should be all set now, thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-18 17:27:06 +0000
+++ debian/changelog	2014-02-24 15:46:04 +0000
@@ -1,11 +1,23 @@
 neutron (1:2014.1~b2-0ubuntu7) UNRELEASED; urgency=medium
 
+  [ Chuck Short ]
   * debian/rules: Re-enabled tests. 
   * debian/patches/requirements.patch: Dropped no longer needed.
   * debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed.
   * debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed.
 
- -- Chuck Short <[e-mail]>  Thu, 06 Feb 2014 16:33:21 -0500
+  [ Corey Bryant ]
+  * debian/patches/sql-alchemy-0.8.3-compat.patch: Revert prior drop.
+  * Renamed Nicira NVP plugin to VMware NSX (LP: #1273877):
+    - debian/neutron-plugin-*.install: Update path and file for rename
+    - debian/tests/*-plugin: Replace nicira-plugin with vmware-plugin
+    - debian/control:
+      + Change neutron-plugin-nicira to transtional package
+      + Add neutron-plugin-vmware package which breaks/replaces
+        neutron-plugin-nicira package.
+  * 
+
+ -- Corey Bryant <[e-mail]>  Mon, 24 Feb 2014 10:31:13 -0500
 
 neutron (1:2014.1~b2-0ubuntu6) trusty; urgency=medium
 
 
=== modified file 'debian/control'
--- debian/control	2013-12-19 15:00:13 +0000
+++ debian/control	2014-02-24 15:46:04 +0000
@@ -273,27 +273,36 @@
  .
  This package provides the Metaplugin plugin.
 
+Package: neutron-plugin-vmware
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ )
+Replaces: neutron-plugin-nicira ( << 1:2014.1~b2-0ubuntu7~ )
+Description: Neutron is a virtual network service for Openstack - VMware plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the VMware NSX plugin
+
 Package: neutron-plugin-nicira
+Depends: neutron-plugin-vmware, ${misc:Depends}
 Architecture: all
-Provides: neutron-plugin
-Depends:
- neutron-common (= ${source:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
 Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
 Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
-Description: Neutron is a virtual network service for Openstack - Nicira plugin
- Neutron is a virtual network service for Openstack, and a part of
- Netstack. Just like OpenStack Nova provides an API to dynamically
- request and configure virtual servers, Neutron provides an API to
- dynamically request and configure virtual networks. These networks
- connect "interfaces" from other OpenStack services (e.g., virtual NICs
- from Nova VMs). The Neutron API supports extensions to provide
- advanced network capabilities (e.g., QoS, ACLs, network monitoring,
- etc.)
- .
- This package provides the Nicira NVP plugin
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: neutron-l3-agent
 Architecture: all
 
=== removed file 'debian/neutron-plugin-nicira.install'
--- debian/neutron-plugin-nicira.install	2014-01-15 18:46:48 +0000
+++ debian/neutron-plugin-nicira.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira
-usr/bin/neutron-check-nvp-config usr/bin
-usr/bin/neutron-check-nsx-config usr/bin
 
=== added file 'debian/neutron-plugin-vmware.install'
--- debian/neutron-plugin-vmware.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-vmware.install	2014-02-24 15:46:04 +0000
@@ -0,0 +1,3 @@
+etc/neutron/plugins/vmware/* etc/neutron/plugins/vmware
+usr/bin/neutron-check-nvp-config usr/bin
+usr/bin/neutron-check-nsx-config usr/bin
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-18 17:27:06 +0000
+++ debian/patches/series	2014-02-24 15:46:04 +0000
@@ -2,5 +2,6 @@
 disable-udev-tests.patch
 disable-failing-metaplugin-tests.patch
 #disable-failing-cisco-test.patch
+sql-alchemy-0.8.3-compat.patch
 skip-lb-test.patch
 skip-ipv6-tests.patch
 
=== added file 'debian/patches/sql-alchemy-0.8.3-compat.patch'
--- debian/patches/sql-alchemy-0.8.3-compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sql-alchemy-0.8.3-compat.patch	2014-02-24 15:46:04 +0000
@@ -0,0 +1,67 @@
+Description: Fix sqlalchemy 0.8.3 compat
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff --git a/neutron/openstack/common/db/sqlalchemy/session.py b/neutron/openstack/common/db/sqlalchemy/session.py
+index 3279343..113424c 100644
+--- a/neutron/openstack/common/db/sqlalchemy/session.py
++++ b/neutron/openstack/common/db/sqlalchemy/session.py
+@@ -441,6 +441,11 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # 1 column - (IntegrityError) column c1 is not unique
+ # N columns - (IntegrityError) column c1, c2, ..., N are not unique
+ #
++# sqlite since 3.7.16:
++# 1 column - (IntegrityError) UNIQUE constraint failed: k1
++#
++# N columns - (IntegrityError) UNIQUE constraint failed: k1, k2
++#
+ # postgres:
+ # 1 column - (IntegrityError) duplicate key value violates unique
+ #               constraint "users_c1_key"
+@@ -453,9 +458,10 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # N columns - (IntegrityError) (1062, "Duplicate entry 'values joined
+ #               with -' for key 'name_of_our_constraint'")
+ _DUP_KEY_RE_DB = {
+-    "sqlite": re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
+-    "postgresql": re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),
+-    "mysql": re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$")
++    "sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
++              re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")),
++    "postgresql": (re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),),
++    "mysql": (re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$"),)
+ }
+ 
+ 
+@@ -480,10 +486,14 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name):
+     if engine_name not in ["mysql", "sqlite", "postgresql"]:
+         return
+ 
+-    m = _DUP_KEY_RE_DB[engine_name].match(integrity_error.message)
+-    if not m:
++    for pattern in _DUP_KEY_RE_DB[engine_name]:
++        match = pattern.match(integrity_error.message)
++        if match:
++            break
++    else:
+         return
+-    columns = m.group(1)
++
++    columns = match.group(1)
+ 
+     if engine_name == "sqlite":
+         columns = columns.strip().split(", ")
+diff --git a/run_tests.sh b/run_tests.sh
+index cc17124..06934e9 100755
+--- a/run_tests.sh
++++ b/run_tests.sh
+@@ -162,7 +162,7 @@ function run_pep8 {
+ }
+ 
+ 
+-TESTRTESTS="python setup.py testr"
++TESTRTESTS="python -m neutron.openstack.common.lockutils python setup.py testr"
+ 
+ if [ $never_venv -eq 0 ]
+ then
+-- 
+1.8.5.2
+
 
=== modified file 'debian/tests/control'
--- debian/tests/control	2013-10-03 22:05:30 +0000
+++ debian/tests/control	2014-02-24 15:46:04 +0000
@@ -1,5 +1,5 @@
 Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin
- hyperv-plugin brocade-plugin plumgrid-plugin nicira-plugin openvswitch-plugin
+ hyperv-plugin brocade-plugin plumgrid-plugin vmware-plugin openvswitch-plugin
  linuxbridge-plugin ryu-plugin midonet-plugin
 Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent,
  neutron-lbaas-agent, python-neutron, rabbitmq-server
 
=== removed file 'debian/tests/nicira-plugin'
--- debian/tests/nicira-plugin	2013-09-13 12:34:20 +0000
+++ debian/tests/nicira-plugin	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-#----------------------
-# Testing nicira-plugin
-#----------------------
-set -e
-apt-get -y install neutron-plugin-nicira
-
-# update plugin path
-sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nicira\/nvp\.ini\"/g' /etc/default/neutron-server
-sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf
-service neutron-server restart  > /dev/null 2>&1
-if pidof -x neutron-server > /dev/null; then
-    apt-get -y remove --purge neutron-plugin-nicira
-    echo "OK"
-else
-    echo "ERROR: NICIRA PLUGIN IS NOT RUNNING"
-    apt-get -y remove --purge neutron-plugin-nicira
-    exit 1
-fi
 
=== added file 'debian/tests/vmware-plugin'
--- debian/tests/vmware-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/vmware-plugin	2014-02-24 15:46:04 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#----------------------
+# Testing vmware-plugin
+#----------------------
+set -e
+apt-get -y install neutron-plugin-vmware
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/vmware\/nsx\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-vmware
+    echo "OK"
+else
+    echo "ERROR: VMWARE PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-vmware
+    exit 1
+fi