-neutron (1:2013.2~b3-0ubuntu6~cloud0) precise-havana; urgency=low
+neutron (1:2013.2-0ubuntu1~cloud0) precise-havana; urgency=low
- * New upstream release for the Ubuntu Cloud Archive.
+ * New usptream release candidate for the Ubuntu Cloud Archive.
- -- Chuck Short <zulcss@ubuntu.com> Wed, 11 Sep 2013 11:04:37 -0400
+ -- Chuck Short <zulcss@ubuntu.com> Wed, 16 Oct 2013 16:33:52 -0400
+
+neutron (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
+
+ * New upstream release candidate (LP: #1240665).
+
+ -- Chuck Short <zulcss@ubuntu.com> Wed, 16 Oct 2013 15:37:02 -0400
+
+neutron (1:2013.2~rc2-0ubuntu1) saucy; urgency=low
+
+ * New upstream release candidate (LP: #1239156).
+
+ -- James Page <james.page@ubuntu.com> Sat, 12 Oct 2013 16:51:28 +0100
+
+neutron (1:2013.2~rc1-0ubuntu2) saucy; urgency=low
+
+ * d/tests/control,neutron-server: Limit neutron-server tests to core
+ neutron daemons to avoid tests failures for plugin agents which don't
+ start correctly without additional configuration.
+
+ -- James Page <james.page@ubuntu.com> Thu, 03 Oct 2013 23:05:05 +0100
+
+neutron (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
+
+ [ Yolanda Robla ]
+ * debian/tests: added testing agents
+
+ [ Chuck Short ]
+ * debian/patches/disable-udev-tests.patch: Refreshed.
+ * debian/patches/disable-ml2-notification-tests.patch: Refreshed.
+ * debian/control:
+ - Dropped python-setuptools-git python-netifaces, and python-nose from
+ build dependencies.
+ - Dropped python-configobj, python-gflags from binary dependencies.
+ - Added build python-requests python-six, and python-jinja2 build
+ dependencies.
+ - Added versioned dependencies for python-amqplib,
+ python-pbr, python-novaclient, python-cliff,
+ python-testtools, and python-eventlet.
+ - Bumped versioned depends for python-stevedore, pyhton-novaclient,
+ python-oslo.config, and testrepository
+
+ [ James Page ]
+ * New upstream release candidate:
+ - d/patches: Refreshed.
+ * d/rules: unpatch/patch neutron.conf around test execution to ensure that
+ as many tests as possible actually pass.
+
+ -- James Page <james.page@ubuntu.com> Thu, 03 Oct 2013 15:18:04 +0100
neutron (1:2013.2~b3-0ubuntu6) saucy; urgency=low
Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
Build-Depends-Indep:
alembic (>= 0.4.1),
- python-amqplib,
+ python-amqplib (>= 0.6.1),
python-anyjson (>= 0.3.3),
python-babel,
- python-cliff,
+ python-cliff (>= 1.4),
python-configobj,
python-coverage,
python-d2to1,
- python-eventlet,
+ python-eventlet (>= 0.13.0),
python-fixtures (>= 0.3.12),
+ python-greenlet (>= 0.3.2),
python-httplib2,
python-iso8601,
- python-keystoneclient (>= 0.2.0),
+ python-jinja2,
+ python-keystoneclient (>= 1:0.2.0),
python-kombu (>= 2.5.12),
python-lxml,
python-mock (>= 1.0b1),
python-mox,
python-netaddr,
- python-netifaces,
- python-neutronclient (>= 2.2.3),
- python-nose,
- python-novaclient,
- python-oslo.config (>= 1:1.2.0),
+ python-neutronclient (>= 1:2.2.3),
+ python-novaclient (>= 2.12.0),
+ python-oslo.config (>= 1:1.2.0a3),
python-paste,
python-pastedeploy,
- python-pbr,
+ python-pbr (>= 0.5.21),
python-pyudev,
+ python-requests (>= 1.1),
python-routes,
python-setuptools,
- python-setuptools-git,
python-simplejson,
+ python-six,
python-sqlalchemy,
- python-stevedore (>= 0.9),
- python-testtools,
+ python-stevedore (>= 0.10),
+ python-testtools (>= 0.9.32),
python-webob,
python-webtest,
subunit,
- testrepository ( >= 0.0.8)
+ testrepository ( >= 0.0.17)
XS-Python-Version: >= 2.6
Standards-Version: 3.9.4
Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/havana/files
Architecture: all
Section: python
Depends:
- python-amqplib,
+ alembic (>= 0.6.0),
+ python-amqplib (>= 0.6.1),
python-anyjson (>= 0.3.3),
- python-configobj,
- python-eventlet,
- python-gflags,
+ python-babel,
+ python-eventlet (>= 0.13.0),
+ python-greenlet (>= 0.3.12),
python-httplib2,
python-iso8601,
- python-keystoneclient (>= 0.2.0),
+ python-jinja2,
+ python-keystoneclient (>= 1:0.3.0),
python-kombu (>= 2.5.12),
- python-lxml,
python-netaddr,
- python-neutronclient (>= 0.1.0.1-0ubuntu1),
- python-oslo.config (>= 1:1.2.0),
+ python-neutronclient (>= 1:2.2.3),
+ python-oslo.config (>= 1:1.2.0a3),
python-paste,
python-pastedeploy,
- python-pyudev,
+ python-requests (>= 1.1),
python-routes,
- python-simplejson,
- python-sqlalchemy,
- python-stevedore (>= 0.9),
+ python-six,
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
python-webob,
${misc:Depends},
${python:Depends}
-diff --git a/requirements.txt b/requirements.txt
-index 828d4d5..4b8dc9a 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -14,7 +14,7 @@ iso8601>=0.1.4
+@@ -17,7 +17,7 @@ Jinja2
kombu>=2.4.8
netaddr
- python-neutronclient>=2.2.3,<3
+ python-neutronclient>=2.3.0,<3
-SQLAlchemy>=0.7.8,<=0.7.99
+SQLAlchemy>=0.7.8,<=0.8.99
WebOb>=1.2.3,<1.3
- python-keystoneclient>=0.3.0
+ python-keystoneclient>=0.3.2
alembic>=0.4.1
---
-1.8.3.2
-
-Description: Disable failing ml2 plugin tests.
-Author: James Page <james.page@ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1204456
-Forwared: not-needed
-
--- a/neutron/tests/unit/ml2/test_agent_scheduler.py
+++ b/neutron/tests/unit/ml2/test_agent_scheduler.py
-@@ -19,18 +19,12 @@ from neutron.tests.unit.openvswitch import test_agent_scheduler
-
+@@ -19,18 +19,19 @@ from neutron.tests.unit.openvswitch impo
+
class Ml2AgentSchedulerTestCase(
test_agent_scheduler.OvsAgentSchedulerTestCase):
- plugin_str = test_ml2_plugin.PLUGIN_NAME
-- l3_plugin = ('neutron.services.l3_router.'
-- 'l3_router_plugin.L3RouterPlugin')
--
+ pass
-
+ l3_plugin = ('neutron.services.l3_router.'
+ 'l3_router_plugin.L3RouterPlugin')
+
+
class Ml2L3AgentNotifierTestCase(
test_agent_scheduler.OvsL3AgentNotifierTestCase):
- plugin_str = test_ml2_plugin.PLUGIN_NAME
-- l3_plugin = ('neutron.services.l3_router.'
-- 'l3_router_plugin.L3RouterPlugin')
--
+ pass
-
+ l3_plugin = ('neutron.services.l3_router.'
+ 'l3_router_plugin.L3RouterPlugin')
+
+
class Ml2DhcpAgentNotifierTestCase(
test_agent_scheduler.OvsDhcpAgentNotifierTestCase):
-- plugin_str = test_ml2_plugin.PLUGIN_NAME
+ pass
+ plugin_str = test_ml2_plugin.PLUGIN_NAME
-Description: Disable tests that can fail on buildds
- udev is not universally available on Ubuntu buildds; specifically
- tests that user linux bridge are skipped for this reason.
-Author: James Page <james.page@ubuntu.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-@@ -32,6 +32,7 @@ from neutron.tests import base
+@@ -45,6 +45,7 @@ class FakeIpDevice(object):
class TestLinuxBridge(base.BaseTestCase):
def setUp(self):
super(TestLinuxBridge, self).setUp()
self.addCleanup(cfg.CONF.reset)
interface_mappings = {'physnet1': 'eth1'}
-@@ -139,6 +140,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+@@ -160,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest
class TestLinuxBridgeManager(base.BaseTestCase):
def setUp(self):
super(TestLinuxBridgeManager, self).setUp()
self.interface_mappings = {'physnet1': 'eth1'}
self.root_helper = cfg.CONF.AGENT.root_helper
-@@ -639,6 +639,7 @@ class TestLinuxBridgeManager(base.BaseTestCase):
-
+@@ -639,6 +641,7 @@ class TestLinuxBridgeManager(base.BaseTe
+
class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
def setUp(self):
-+ self.skipTest("udev not consistently available in Ubuntu buildds")
++ self.skipTest("udev not consistently available in Ubuntu buildds")
cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN')
self.addCleanup(cfg.CONF.reset)
super(TestLinuxBridgeRpcCallbacks, self).setUp()
-diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a125.g4b15f10/etc/neutron.conf
---- neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf 2013-07-31 16:46:21.000000000 +0000
-+++ neutron-2013.2.a125.g4b15f10/etc/neutron.conf 2013-07-31 18:57:31.867679844 +0000
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
@@ -7,7 +7,7 @@
# Where to store Neutron state files. This directory must be writable by the
# Where to store lock files
lock_path = $state_path/lock
-@@ -45,7 +45,7 @@ bind_port = 9696
+@@ -45,7 +45,7 @@ lock_path = $state_path/lock
# api_extensions_path =
# Neutron plugin provider module
# Advanced service modules
# service_plugins =
-@@ -294,7 +294,7 @@ notification_topics = notifications
+@@ -294,7 +294,7 @@ notification_driver = neutron.openstack.
# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
# root filter facility.
# Change to "sudo" to skip the filtering and just run the comand directly
# =========== items for agent management extension =============
# seconds between nodes reporting state to server, should be less than
-@@ -324,7 +324,7 @@ signing_dir = $state_path/keystone-signi
+@@ -318,7 +318,7 @@ signing_dir = $state_path/keystone-signi
# connection = mysql://root:pass@127.0.0.1:3306/neutron
# Replace 127.0.0.1 above with the IP address of the database used by the
# main neutron server. (Leave it as is if the database runs on this host.)
-diff -Naurp neutron-2013.2.b3.orig/requirements.txt neutron-2013.2.b3/requirements.txt
---- neutron-2013.2.b3.orig/requirements.txt 2013-09-06 11:22:40.000000000 -0400
-+++ neutron-2013.2.b3/requirements.txt 2013-09-10 14:38:32.777451580 -0400
+--- a/requirements.txt
++++ b/requirements.txt
@@ -12,7 +12,6 @@ greenlet>=0.3.2
httplib2
requests>=1.1
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
- ./run_tests.sh -N -P --concurrency=1 || true
+ # Unpatch quantum configuration to fixup tests which conflict
+ # with a core_plugin being set.
+ patch -p1 -R < debian/patches/fix-quantum-configuration.patch
+ # Set a reasonable level of concurrency
+ ./run_tests.sh -N -P --concurrency=4 || true
+ # Patch configuration file after testing
+ patch -p1 < debian/patches/fix-quantum-configuration.patch
endif
--- /dev/null
+#!/bin/bash
+#-------------------------
+# Testing bigswitch-plugin
+#-------------------------
+set -e
+apt-get -y install neutron-plugin-bigswitch
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/bigswitch\/restproxy\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.bigswitch\.plugin\.NeutronRestProxyV2/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-bigswitch
+ echo "OK"
+else
+ echo "ERROR: BIGSWITCH PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-bigswitch
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#-----------------------
+# Testing brocade-plugin
+#-----------------------
+set -e
+apt-get -y install neutron-plugin-brocade
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/brocade\/brocade\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.brocade\.NeutronPlugin\.BrocadePluginV2/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-brocade
+ echo "OK"
+else
+ echo "ERROR: BROCADE PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-brocade
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#---------------------
+# Testing cisco-plugin
+#---------------------
+set -e
+apt-get -y install neutron-plugin-cisco
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/cisco\/cisco_plugins\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.cisco\.network_plugin\.PluginV2/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-cisco
+ echo "OK"
+else
+ echo "ERROR: CISCO PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-cisco
+ exit 1
+fi
-Tests: neutron-daemons python-neutron
+Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin
+ hyperv-plugin brocade-plugin plumgrid-plugin nicira-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
+ neutron-lbaas-agent, python-neutron, rabbitmq-server
Restrictions: needs-root
--- /dev/null
+#!/bin/bash
+#----------------------
+# Testing hyperv-plugin
+#----------------------
+set -e
+apt-get -y install neutron-plugin-hyperv
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/hyperv\/hyperv_neutron_plugin\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.hyperv\.hyperv_neutron_plugin\.HyperVNeutronPlugin/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-hyperv
+ echo "OK"
+else
+ echo "ERROR: HYPERV PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-hyperv
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#---------------------------
+# Testing linuxbridge-plugin
+#---------------------------
+set -e
+apt-get -y install neutron-plugin-linuxbridge
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/linuxbridge\/linuxbridge_conf\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.linuxbridge\.lb_neutron_plugin\.LinuxBridgePluginV2/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-linuxbridge
+ echo "OK"
+else
+ echo "ERROR: LINUXBRIDGE PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-linuxbridge
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#-----------------------
+# Testing midonet-plugin
+#-----------------------
+set -e
+apt-get -y install neutron-plugin-midonet
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/midonet\/midonet\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.midonet\.MidonetPluginV2/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-midonet
+ echo "OK"
+else
+ echo "ERROR: MIDONET PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-midonet
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#-------------------
+# Testing nec-plugin
+#-------------------
+set -e
+apt-get -y install neutron-plugin-nec
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nec\/nec\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nec\.nec_plugin\.NECPluginV2/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-nec
+ echo "OK"
+else
+ echo "ERROR: NEC PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-nec
+ exit 1
+fi
set -e
DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent')
for daemon in "${DAEMONS[@]}"; do
- apt-get install -y neutron-common $daemon
if pidof -x $daemon > /dev/null; then
echo "OK"
else
--- /dev/null
+#!/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
--- /dev/null
+#!/bin/bash
+#---------------------------
+# Testing openvswitch-plugin
+#---------------------------
+set -e
+apt-get -y install neutron-plugin-openvswitch
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/openvswitch\/ovs_neutron_plugin\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/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-openvswitch
+ echo "OK"
+else
+ echo "ERROR: OPENVSWITCH PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-openvswitch
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#------------------------
+# Testing plumgrid-plugin
+#------------------------
+set -e
+apt-get -y install neutron-plugin-plumgrid
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/plumgrid\/plumgrid\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.plumgrid\.plumgrid_plugin\.plumgrid_plugin\.NeutronPluginPLUMgridV2/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-plumgrid
+ echo "OK"
+else
+ echo "ERROR: PLUMGRID PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-plumgrid
+ exit 1
+fi
--- /dev/null
+#!/bin/bash
+#-------------------
+# Testing ryu-plugin
+#-------------------
+set -e
+apt-get -y install neutron-plugin-ryu
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/ryu\/ryu\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.ryu\.ryu_neutron_plugin\.RyuNeutronPluginV2/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-ryu
+ echo "OK"
+else
+ echo "ERROR: RYU PLUGIN IS NOT RUNNING"
+ apt-get -y remove --purge neutron-plugin-ryu
+ exit 1
+fi
Code Review / openstack-build / neutron-build.git / commitdiff