From 5f1c6af61342a3d3baabaf2bab5c3cc32f3f1ca6 Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Tue, 22 Oct 2013 14:54:32 +0400 Subject: [PATCH] Update DEB-specs to 2013.2 version --- debian/changelog | 54 +++++++++++++++++-- debian/control | 54 ++++++++++--------- debian/patches/bump-sqlalchemy-version.patch | 11 ++-- .../disable-ml2-notification-tests.patch | 27 ++++------ debian/patches/disable-udev-tests.patch | 17 ++---- .../patches/fix-quantum-configuration.patch | 11 ++-- debian/patches/remove-jsonrpclib.patch | 5 +- debian/rules | 8 ++- debian/tests/bigswitch-plugin | 19 +++++++ debian/tests/brocade-plugin | 19 +++++++ debian/tests/cisco-plugin | 19 +++++++ debian/tests/control | 6 ++- debian/tests/hyperv-plugin | 19 +++++++ debian/tests/linuxbridge-plugin | 19 +++++++ debian/tests/midonet-plugin | 19 +++++++ debian/tests/nec-plugin | 19 +++++++ debian/tests/neutron-daemons | 1 - debian/tests/nicira-plugin | 19 +++++++ debian/tests/openvswitch-plugin | 19 +++++++ debian/tests/plumgrid-plugin | 19 +++++++ debian/tests/ryu-plugin | 19 +++++++ 21 files changed, 325 insertions(+), 78 deletions(-) create mode 100644 debian/tests/bigswitch-plugin create mode 100644 debian/tests/brocade-plugin create mode 100644 debian/tests/cisco-plugin create mode 100644 debian/tests/hyperv-plugin create mode 100644 debian/tests/linuxbridge-plugin create mode 100644 debian/tests/midonet-plugin create mode 100644 debian/tests/nec-plugin create mode 100644 debian/tests/nicira-plugin create mode 100644 debian/tests/openvswitch-plugin create mode 100644 debian/tests/plumgrid-plugin create mode 100644 debian/tests/ryu-plugin diff --git a/debian/changelog b/debian/changelog index 36f3a4377..47fa9b981 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,56 @@ -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 Wed, 11 Sep 2013 11:04:37 -0400 + -- Chuck Short 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 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 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 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 Thu, 03 Oct 2013 15:18:04 +0100 neutron (1:2013.2~b3-0ubuntu6) saucy; urgency=low diff --git a/debian/control b/debian/control index 5d9ed9b70..96516cc49 100644 --- a/debian/control +++ b/debian/control @@ -6,43 +6,44 @@ XSBC-Original-Maintainer: Chuck Short 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 @@ -386,26 +387,27 @@ Package: python-neutron 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/debian/patches/bump-sqlalchemy-version.patch b/debian/patches/bump-sqlalchemy-version.patch index 556f51d6d..52f60e700 100644 --- a/debian/patches/bump-sqlalchemy-version.patch +++ b/debian/patches/bump-sqlalchemy-version.patch @@ -1,16 +1,11 @@ -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 - diff --git a/debian/patches/disable-ml2-notification-tests.patch b/debian/patches/disable-ml2-notification-tests.patch index d042302cc..8441d092f 100644 --- a/debian/patches/disable-ml2-notification-tests.patch +++ b/debian/patches/disable-ml2-notification-tests.patch @@ -1,29 +1,24 @@ -Description: Disable failing ml2 plugin tests. -Author: James Page -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 diff --git a/debian/patches/disable-udev-tests.patch b/debian/patches/disable-udev-tests.patch index 1601ab9a0..3793c77ef 100644 --- a/debian/patches/disable-udev-tests.patch +++ b/debian/patches/disable-udev-tests.patch @@ -1,13 +1,6 @@ -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 -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): @@ -15,7 +8,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 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): @@ -23,11 +16,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 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 --git a/debian/patches/fix-quantum-configuration.patch b/debian/patches/fix-quantum-configuration.patch index a23b9dfe2..b19bd0ea3 100644 --- a/debian/patches/fix-quantum-configuration.patch +++ b/debian/patches/fix-quantum-configuration.patch @@ -1,6 +1,5 @@ -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 @@ -10,7 +9,7 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1 # 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 @@ -19,7 +18,7 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1 # 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 @@ -28,7 +27,7 @@ diff -Naurp neutron-2013.2.a125.g4b15f10.orig/etc/neutron.conf neutron-2013.2.a1 # =========== 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 --git a/debian/patches/remove-jsonrpclib.patch b/debian/patches/remove-jsonrpclib.patch index 9354ac7d0..fbf3af6b9 100644 --- a/debian/patches/remove-jsonrpclib.patch +++ b/debian/patches/remove-jsonrpclib.patch @@ -1,6 +1,5 @@ -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 diff --git a/debian/rules b/debian/rules index 5c69355ab..60e37da0f 100755 --- a/debian/rules +++ b/debian/rules @@ -17,5 +17,11 @@ get-orig-source: 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 diff --git a/debian/tests/bigswitch-plugin b/debian/tests/bigswitch-plugin new file mode 100644 index 000000000..07504152a --- /dev/null +++ b/debian/tests/bigswitch-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/brocade-plugin b/debian/tests/brocade-plugin new file mode 100644 index 000000000..9b8725afe --- /dev/null +++ b/debian/tests/brocade-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/cisco-plugin b/debian/tests/cisco-plugin new file mode 100644 index 000000000..87062ef9c --- /dev/null +++ b/debian/tests/cisco-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/control b/debian/tests/control index a314cd5ee..84fa96e59 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,4 +1,6 @@ -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 diff --git a/debian/tests/hyperv-plugin b/debian/tests/hyperv-plugin new file mode 100644 index 000000000..5f31e6f13 --- /dev/null +++ b/debian/tests/hyperv-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/linuxbridge-plugin b/debian/tests/linuxbridge-plugin new file mode 100644 index 000000000..aa82c5f24 --- /dev/null +++ b/debian/tests/linuxbridge-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/midonet-plugin b/debian/tests/midonet-plugin new file mode 100644 index 000000000..18644c705 --- /dev/null +++ b/debian/tests/midonet-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/nec-plugin b/debian/tests/nec-plugin new file mode 100644 index 000000000..c656e083f --- /dev/null +++ b/debian/tests/nec-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/neutron-daemons b/debian/tests/neutron-daemons index 4f87c971a..336fdacad 100644 --- a/debian/tests/neutron-daemons +++ b/debian/tests/neutron-daemons @@ -5,7 +5,6 @@ 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 diff --git a/debian/tests/nicira-plugin b/debian/tests/nicira-plugin new file mode 100644 index 000000000..1c7df3757 --- /dev/null +++ b/debian/tests/nicira-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/openvswitch-plugin b/debian/tests/openvswitch-plugin new file mode 100644 index 000000000..01dcaf23c --- /dev/null +++ b/debian/tests/openvswitch-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/plumgrid-plugin b/debian/tests/plumgrid-plugin new file mode 100644 index 000000000..cf7311ac5 --- /dev/null +++ b/debian/tests/plumgrid-plugin @@ -0,0 +1,19 @@ +#!/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 diff --git a/debian/tests/ryu-plugin b/debian/tests/ryu-plugin new file mode 100644 index 000000000..a3260a5a8 --- /dev/null +++ b/debian/tests/ryu-plugin @@ -0,0 +1,19 @@ +#!/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 -- 2.45.2