Change -> openstack herd, Edit/correct Description, update test deps, add test phase to 2013.2*, testing support from (good ol') Chicago

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

10 files changed, 470 insertions, 30 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index c44dba470e45..65ff4ef10e75 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.17 2013/11/14 04:28:47 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.18 2013/11/22 04:38:40 idella4 Exp $
+
+*neutron-2013.2-r1 (22 Nov 2013)
+
+  22 Nov 2013; Ian Delaney <idella4@gentoo.org>
+  +files/neutron-2013.2-json-tests.patch, +files/neutron-2013.2-nicira.patch,
+  +files/neutron-2013.2-sphinx_mapping.patch, +neutron-2013.2-r1.ebuild,
+  metadata.xml, neutron-2013.2.9999.ebuild, neutron-2013.2.ebuild,
+  neutron-9999.ebuild:
+  Change -> openstack herd, Edit/correct Description, update test deps, add test
+  phase to 2013.2*, testing support from (good ol') Chicago
 
   14 Nov 2013; Matthew Thode <prometheanfire@gentoo.org>
   -neutron-2012.2.4-r7.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index fb9ca20e0b78..296869b18bbc 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX neutron-2013.2-json-tests.patch 4178 SHA256 d4ffa978eccc09f8061432aacc9e64b72feb9b74ef19f1b5421b54ef2c1d03d8 SHA512 919d4deb82803e9426fbcc0f51933f93c6bdaa486fb9427986567360b6a86bc59f340fe3b797ba88bd916a89cdfc11e07da5ec48cd4ff9ab59dcd418fc179243 WHIRLPOOL 35cff6e57678e5162b1e3d8603d560569bc17b1298d8e204ceac8402bbc68d0539f0d38eba7656918450fe5fd013a337a1d287f50698f995c3f26a01c9efd494
+AUX neutron-2013.2-nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
+AUX neutron-2013.2-sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
 AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
 AUX neutron-confd-2 75 SHA256 0fce0e6f6cec493b9b0bcb96fa3211ba47a6420b9ea675ef65979fd9505121c7 SHA512 e64116f6cab81a2ee56d797f8144dbc8b214fb627bc8d6c3045488b1fec694cee8e8f3f3fbd327fb28f704cdfae40ea468d8a212c819abd45e809a1fa56b9670 WHIRLPOOL fb027c386c99448c29b265adc234abbc4d23a8be015690fd024b1f39ccc18dd64a1ab57c6cc26a054d576a0bbbed797058b19db90abf0318ae79dddc4efd2056
 AUX neutron-initd 1610 SHA256 58f26e65b4f81ec3d4b0a670f06d9e5dddb35d2ad0dc5376587e654064059d81 SHA512 abd4170e7d7b720cd2aa7b4a65bd2fb4fdba0c11f976eb516a086e9e0e40a92428f4bcf5b3095ee8c31a0839a9d28a703fc42c0baf21bcf280867a805e86f19f WHIRLPOOL 7702f2df1e6fbebc8cc7fffb2590d9a2d3d7d496f0f5b62e72ab2c35fa226dad96492626c9ed5f5c59a33c1e9f06501f7625f037efe1926e22de0ad023d20669
@@ -10,25 +13,16 @@ DIST neutron-2013.2.tar.gz 4385581 SHA256 3ebfa6e8a6790e8b55604712a5e467ded7d76b
 DIST quantum-2013.1.4.tar.gz 1178442 SHA256 3bd26ae7dabe6093a3cbe701ac8d7022fbdbe1d8231ab1c6866de388684e272c SHA512 48ce3aa8467eefe4ef07b03dee293c7eae1800736abadd56d0bf7b559506044bea3fefba0dac6fb20783f808baada70c52ebc388137ae80b41271dcde824243d WHIRLPOOL a5456fe6fb48192a4f4d97c85b7b235093f549965b36971802302998de7d8ed76fd7f393a659371b8057aafcc4594ac246159663dfcdb5251c786eeede6d66fd
 EBUILD neutron-2013.1.4.ebuild 4573 SHA256 1d9e681f2f074e12c28590912aeb312c91170274b6ea8f2454e379426dfbaf6e SHA512 599a16e39992a7256fcbc43cc50f39e7c78970a26b9df735e82d5fb4fb14ba89d8f9a53119ca3c5aee277dad501f84ba2c73df6a13f0d05934058f167b79c886 WHIRLPOOL 0d586adee734d9bcd2575d3e86a013e8e4888f35b32623b0f2ff569c88453088a460606a31bb4f42f43a2722c80a3d7af76b4fd7d9d00b3519ce6125fa028668
 EBUILD neutron-2013.1.9999.ebuild 4477 SHA256 d6f042d111485e21b95d48663a70f3a92cf66560eeca98c46c03a50623276b00 SHA512 a2f757629575ae392cd622de5dc1cda7ba9cf5484ed89ce54819a0bdf863946f5c83a6cf9a1434465fa170f443b6b31ad881c06cfd07c9e201e6ce3ee7959915 WHIRLPOOL 308614fc319fa89c00ba902a3620a986f72be8fe13a4e17c36436ac792fac13430bc49e648a27cc8d0c2b0049bbc11507535a691d38ac3594a2ed0b895e86100
-EBUILD neutron-2013.2.9999.ebuild 4762 SHA256 59e5bdd788fe1b02dd030d2888cbe32eed47a1e25663f3caca4d0b66e5349b0a SHA512 551931cab3428b672dbaf97d70dde17a9e50d732c3cfa36ce8ee160a03ae713533914277996bd4b5ee51ff642aaaa41c1b26edddb4ab70ad607a695c2026a458 WHIRLPOOL 5216e8531129e9c3bf8a55fd2b72168fab62e134b342756ade736b0fe775ce43446b8f97c6da91e4b0990b9c535a4727270ad021d7b0bb7bef6eceadb1579738
-EBUILD neutron-2013.2.ebuild 4749 SHA256 5124ed8f5f3811d287dc0918b693a9dd0d4f64b1429ec91e392bf4496795223f SHA512 fe84d67e5bb96ab562cda9f8b2353e75df4bb264bfeac28a9b88e87d7910a85e249fdfe48af37051d005d34997104e0e6d66ee3a2b762040f84fb0c190fc6dc9 WHIRLPOOL ebcb19e3024d2faf4d99ee99812efdac506defc8650e9e7d42907e814108dae00a04b79f3308a0fad1f6d6063e205f39a49ab3ee5e67b0bfcbe46c39f3b0d894
-EBUILD neutron-9999.ebuild 4423 SHA256 857cd3177f9c6cfd20d5d93d56713bdbe4e6d907fb522518ed780864fe12f9c2 SHA512 dd22e052a1ad5b269f47c181dfe9e01daf58e5213654203062e009e5dc25006c5d9e0a9d83bcf33e0641ed649c505e90c59d2a0d05ed1585562a4e381660f518 WHIRLPOOL 40d6ad579c9dcafa3da95553c0a1f8e6be09df930764071a87a80053b0252e0d6fb1c50151da2e83bb8435f480b75452e0d2f5e9fba140b9af4b556d3602d09e
-MISC ChangeLog 7506 SHA256 94ac1601c17ef473be5fa0e8aec54512c893f9d23c4021f45d0eca1fc7de203b SHA512 19c0e6fad187ec1bcab2af8df3a2eb2df86fef3b650f828dadde84500d8ff97858ec489ef282580cade22c005b0ed7aacd9f1d5684a339951e42a7f20a20fffa WHIRLPOOL e4666c37657aad6e687dc90343c1693e58d6805d2b666238ce0b827410f8639c7bf2189021ff1f2f279c6385ae0133f5433512fc5d9d23439a45acf2814c7ada
-MISC metadata.xml 1172 SHA256 afbc9be698ec774a49fc53222bb9895ce39a03733608c764dc07590d7a918991 SHA512 d19ec3124132d8b7408de986825c070aa6796b25959e3e13a08598f1dbb1afcf14afe4afbacf8bfdc5a6e24bbc69be7b412af9b0e4d6f207c0659418da16847d WHIRLPOOL d236b792aaf656dd909452ef32f4a3a1e174a4cf291a7e286cb38139a3798f5348caf8b8cb43cd447aa8033c98921d4ca299f325c80c85bbf238a076812c5b19
+EBUILD neutron-2013.2-r1.ebuild 5662 SHA256 1c9f91116858b8c5a5e6aa235979ff9b6c6edddaede65e670ba5a49d9af430b6 SHA512 c268978243fc52802e7826e8d56212f06b022b1f695667be8949be89124ec65b0c16226529ef95caab3a5fd697a5d89b013f3dfd63dfa6a9e4b104e411363cdd WHIRLPOOL a6c99a9fda654d3215448e27cd845a020b1dbd5759c3ca0878fdff4a7cfc22e503bb8a24e90bf7b0e6a91a18f17c7346ac25a6349da881fec86f9d37218bdcb4
+EBUILD neutron-2013.2.9999.ebuild 5359 SHA256 040a8b27c49a5cb2dfaedd2f6f195bf0ab48b18c6c9fdc1c102166e52f484f83 SHA512 e589b30521a48e6a576eee3f24143cf8e9650e7797734cfa53c68e9beb5c84d27fb525c5219228f6805cc84c5abd27e1ccd34ddad9f53dc0159d107eaa411a5e WHIRLPOOL 935ee2cbd09b60df7bcd3e89ef79f4f64c1ab182c29f3a1800a74961b08f1c4708e75cc59ecf8d7981e86441eceabba02945bd7b9a6ee8aeabaa60e6d2c59918
+EBUILD neutron-2013.2.ebuild 4731 SHA256 01b3061bc4c7e010689bc6afe4eec2667ada9779366998079ff8ecf733c920e5 SHA512 0d722b0fd4a262bc616ab8cac10a555fbe6d57035055fb645e1d40d99b6b52cb51f16e0cb71e769cbd98d4a74b720fe63f6e6d9366ced5f4f61e34ba27cc87cd WHIRLPOOL 1f997cf307c90f54d02685f2601c63d5cd908b1d96b9bbc5710ed89bfabf883caea9b3686db71d55f375e90cf92cdc8e244730ea5251894e4ec30be046df2f7f
+EBUILD neutron-9999.ebuild 4405 SHA256 572e72f812240221e000c890bb4fb1c7d7f8d75b894f8fe92459cebc2bf535c5 SHA512 e4eb4b1b01de3faf6a503988888e653fc1410254de48a2ef8cf466488d555cc4b9f1af214cd9ac3dfd9e12bc15cf2a3d88025f950c7426e6cb4fcda88ad40152 WHIRLPOOL 92603532008dc57cfc4bdda69bb9b21f15cbd19c9c96232553f83eae3b12c56b6476f494ed1565e8e41d7c51c80e21a09cd07cdb5a5f11db8ef8c59cf75d1c56
+MISC ChangeLog 7964 SHA256 f0e53ac3522fd58697e25366fb8be841b72fba49cb1222c9556f5b208658a579 SHA512 4ddf93d9fd0d9d12e9ca3f1702a9310895c0fcc4a4ac9d4929d6dd44154d32930cb502f8f979cff395a18303aa99e56e1468ab41906a7ecc7b036c00bcd9ad73 WHIRLPOOL 18ab12fe18e83d0ac84361f0a2c295ef2c1e60c90cc39dd8296edb76adb528ba4f4785530ba88be986703ef7ffa3e43964e28a4b3bb4fcfc4507ed8b0581749c
+MISC metadata.xml 1175 SHA256 95ceaccefb744f80032d97a4cc13c43c13d7e4116d6810d5779df5be3ebe11ce SHA512 74a46511f82bef78397bfaef2901606c6f468f532bbd7112fc8196b69362a4666fafbda8023a281514ada958cd2b4ba567f11dfa071d0b76bc94e456d96ed287 WHIRLPOOL 783aa30c05484b68b2a8f1ebcfd39294a21731cfa9587c0e1cd07ff291416d10912066e23c0572ac63a125f9836374c73b91775858c863abb0779eb13356ca11
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJShFIVAAoJECRx6z5ArFrDAAQP/iFzp36TX0IfI4bZD3qk+22y
-qqZXWPvV8p1glVsc6aAQqXp3JIcploOnzzB1w3T0k/+ZazJrB2BkHAk/XBm4Epzt
-wQ/m8eUNcC1aHrTEhZqng8VCrU0kQbR6Vnwo5RnKWi2dxepEN5sew/0Eq/Ft4h/X
-xU1zKq4a/VtnazZzH+QQ2vK31W+B0oacYoss6BQK+1Pq2kxN+lKL1So+S14hrmF4
-zuPt8GECaZ8P7Je08iLsx1GuXqmiJFWM/MMZRSoC2Yvj0/uy9A/7VLYExj+YB5KN
-PXw21CM1hi1NYxhbFNAFxqbLiM+VKR9a9+WlIG0V4KTtxLA4G8tg72EJkACo8Lje
-R3P07jHlfGWaSGCm+qwlJz0tZBEewWaOubVINaQVTH6ZzioqdxcXHm6zELizos5o
-qVobMnfbY9qKYdzZ1UrqTEv5A6DsxND2KbWhV/iD+p+Sc/PjToepECdhq2zxFCEV
-TA5D3X6SoGDmuiGXsQA7hLYJWaMG3HHQeACnQmyhIeJ+vPlpJD9r81xQGliAiarK
-46HrpKSedgtr96KIBHFnIVfT37uiXUXQj9BUGXJCsyouPhuO8HgMukWlTfkDVcK8
-gjIDNbUBOGjFs9LTa2d+Mea58KdMqd/T+nKDu9eQgvW9z662VWig9riu/M8klAYc
-mcsXiC4Pji54q/WR3fFr
-=+1tY
+iEYEAREIAAYFAlKO3+QACgkQso7CE7gHKw0O+QCcCbp2O6okxlrsxS62rQio3kJF
+YmgAoME4dZCFGlHezklA+2YvHyirPzzF
+=1k27
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch b/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch
new file mode 100644
index 000000000000..ebf33da1d407
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch
@@ -0,0 +1,82 @@
+https://github.com/openstack/neutron/commit/d26dfed7d47926425bb55893da45f650d6549b9a
+diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+index ba76786..fa2c2c0 100644
+--- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
++++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+@@ -97,11 +97,6 @@ def setUp(self):
+         super(TestLinuxBridgeAgent, self).setUp()
+         cfg.CONF.set_override('rpc_backend',
+                               'neutron.openstack.common.rpc.impl_fake')
+-        self.lbmgr_patcher = mock.patch('neutron.plugins.linuxbridge.agent.'
+-                                        'linuxbridge_neutron_agent.'
+-                                        'LinuxBridgeManager')
+-        self.lbmgr_mock = self.lbmgr_patcher.start()
+-        self.addCleanup(self.lbmgr_patcher.stop)
+         self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
+         self.execute = self.execute_p.start()
+         self.addCleanup(self.execute_p.stop)
+@@ -113,8 +108,6 @@ def setUp(self):
+         self.get_mac.return_value = '00:00:00:00:00:01'
+ 
+     def test_update_devices_failed(self):
+-        lbmgr_instance = self.lbmgr_mock.return_value
+-        lbmgr_instance.update_devices.side_effect = RuntimeError
+         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
+                                                                      0,
+                                                                      None)
+@@ -125,17 +118,18 @@ def info_mock(msg):
+                 raise_exception[0] += 1
+             else:
+                 raise RuntimeError()
+-
+-        with mock.patch.object(linuxbridge_neutron_agent.LOG, 'info') as log:
+-            log.side_effect = info_mock
+-            with testtools.ExpectedException(RuntimeError):
+-                agent.daemon_loop()
+-            self.assertEqual(3, log.call_count)
++        with mock.patch.object(agent.br_mgr,
++                               "update_devices") as update_devices:
++            update_devices.side_effect = RuntimeError
++            with mock.patch.object(linuxbridge_neutron_agent.LOG,
++                                   'info') as log:
++                log.side_effect = info_mock
++                with testtools.ExpectedException(RuntimeError):
++                    agent.daemon_loop()
++                self.assertEqual(3, log.call_count)
+ 
+     def test_process_network_devices_failed(self):
+         device_info = {'current': [1, 2, 3]}
+-        lbmgr_instance = self.lbmgr_mock.return_value
+-        lbmgr_instance.update_devices.return_value = device_info
+         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
+                                                                      0,
+                                                                      None)
+@@ -147,15 +141,18 @@ def info_mock(msg):
+             else:
+                 raise RuntimeError()
+ 
+-        with contextlib.nested(
+-            mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'),
+-            mock.patch.object(agent, 'process_network_devices')
+-        ) as (log, process_network_devices):
+-            log.side_effect = info_mock
+-            process_network_devices.side_effect = RuntimeError
+-            with testtools.ExpectedException(RuntimeError):
+-                agent.daemon_loop()
+-            self.assertEqual(3, log.call_count)
++        with mock.patch.object(agent.br_mgr,
++                               "update_devices") as update_devices:
++            update_devices.side_effect = device_info
++            with contextlib.nested(
++                mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'),
++                mock.patch.object(agent, 'process_network_devices')
++            ) as (log, process_network_devices):
++                log.side_effect = info_mock
++                process_network_devices.side_effect = RuntimeError
++                with testtools.ExpectedException(RuntimeError):
++                    agent.daemon_loop()
++                self.assertEqual(3, log.call_count)
+ 
+ 
+ class TestLinuxBridgeManager(base.BaseTestCase):
+
diff --git a/sys-cluster/neutron/files/neutron-2013.2-nicira.patch b/sys-cluster/neutron/files/neutron-2013.2-nicira.patch
new file mode 100644
index 000000000000..58461f91df87
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-2013.2-nicira.patch
@@ -0,0 +1,164 @@
+https://review.openstack.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff;h=a52ef6ecf19b8b015465ddda2a3ca087f0e12122
+index 04dbfef..77f233a 100755 (executable)
+
+
+--- a/neutron/plugins/nicira/vshield/tasks/tasks.py
++++ b/neutron/plugins/nicira/vshield/tasks/tasks.py
+@@ -15,8 +15,6 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
+-from __future__ import print_function
+-
+ import collections
+ import uuid
+ 
+@@ -167,6 +165,9 @@ class TaskManager():
+         # A dict to store resource -> resource's tasks
+         self._tasks = {}
+ 
++        # Current task being executed in main thread
++        self._main_thread_exec_task = None
++
+         # New request event
+         self._req = event.Event()
+ 
+@@ -311,8 +312,10 @@ class TaskManager():
+                     continue
+ 
+                 try:
++                    self._main_thread_exec_task = task
+                     self._execute(task)
+                 finally:
++                    self._main_thread_exec_task = None
+                     if task.status is None:
+                         # The thread is killed during _execute(). To guarantee
+                         # the task been aborted correctly, put it to the queue.
+@@ -348,20 +351,19 @@ class TaskManager():
+         self._thread = None
+ 
+     def has_pending_task(self):
+-        if self._tasks_queue:
+-            return True
+-
+-        if self._tasks:
++        if self._tasks_queue or self._tasks or self._main_thread_exec_task:
+             return True
+-
+-        return False
++        else:
++            return False
+ 
+     def show_pending_tasks(self):
+         for task in self._tasks_queue:
+-            print(str(task))
++            LOG.info(str(task))
+         for resource, tasks in self._tasks.iteritems():
+             for task in tasks:
+-                print(str(task))
++                LOG.info(str(task))
++        if self._main_thread_exec_task:
++            LOG.info(str(self._main_thread_exec_task))
+ 
+     def count(self):
+         count = 0
+
+
+diff --git a/neutron/tests/unit/nicira/test_edge_router.py b/neutron/tests/unit/nicira/test_edge_router.py
+
+index 41efeed..a360b71 100644 (file)
+
+
+--- a/neutron/tests/unit/nicira/test_edge_router.py
++++ b/neutron/tests/unit/nicira/test_edge_router.py
+@@ -135,7 +135,8 @@ class ServiceRouterTest(test_nicira_plugin.NiciraL3NatTest,
+     def tearDown(self):
+         plugin = NeutronManager.get_plugin()
+         manager = plugin.vcns_driver.task_manager
+-        for i in range(20):
++        # wait max ~10 seconds for all tasks to be finished
++        for i in range(100):
+             if not manager.has_pending_task():
+                 break
+             greenthread.sleep(0.1)
+@@ -183,8 +184,8 @@ class ServiceRouterTestCase(ServiceRouterTest, NvpRouterTestCase):
+             for k, v in expected_value_1:
+                 self.assertEqual(router['router'][k], v)
+ 
+-            # wait ~1 seconds for router status update
+-            for i in range(2):
++            # wait max ~10 seconds for router status update
++            for i in range(20):
+                 greenthread.sleep(0.5)
+                 res = self._show('routers', router['router']['id'])
+                 if res['router']['status'] == 'ACTIVE':
+
+
+diff --git a/neutron/tests/unit/nicira/test_vcns_driver.py b/neutron/tests/unit/nicira/test_vcns_driver.py
+
+index b0d69a4..ddc0c33 100644 (file)
+
+
+--- a/neutron/tests/unit/nicira/test_vcns_driver.py
++++ b/neutron/tests/unit/nicira/test_vcns_driver.py
+@@ -253,6 +253,31 @@ class VcnsDriverTaskManagerTestCase(base.BaseTestCase):
+     def test_task_manager_stop_4(self):
+         self._test_task_manager_stop(False, False, 1)
+ 
++    def test_task_pending_task(self):
++        def _exec(task):
++            task.userdata['executing'] = True
++            while not task.userdata['tested']:
++                greenthread.sleep(0)
++            task.userdata['executing'] = False
++            return TaskStatus.COMPLETED
++
++        userdata = {
++            'executing': False,
++            'tested': False
++        }
++        manager = ts.TaskManager().start(100)
++        task = ts.Task('name', 'res', _exec, userdata=userdata)
++        manager.add(task)
++
++        while not userdata['executing']:
++            greenthread.sleep(0)
++        self.assertTrue(manager.has_pending_task())
++
++        userdata['tested'] = True
++        while userdata['executing']:
++            greenthread.sleep(0)
++        self.assertFalse(manager.has_pending_task())
++
+ 
+ class VcnsDriverTestCase(base.BaseTestCase):
+ 
+@@ -298,6 +323,10 @@ class VcnsDriverTestCase(base.BaseTestCase):
+         self.edge_id = None
+         self.result = None
+ 
++    def tearDown(self):
++        self.vcns_driver.task_manager.stop()
++        super(VcnsDriverTestCase, self).tearDown()
++
+     def _deploy_edge(self):
+         task = self.vcns_driver.deploy_edge(
+             'router-id', 'myedge', 'internal-network', {}, wait_for_exec=True)
+@@ -355,12 +384,13 @@ class VcnsDriverTestCase(base.BaseTestCase):
+         self.assertTrue(jobdata.get('edge_deploy_result'))
+ 
+     def test_deploy_edge_fail(self):
+-        self.vcns_driver.deploy_edge(
++        task1 = self.vcns_driver.deploy_edge(
+             'router-1', 'myedge', 'internal-network', {}, wait_for_exec=True)
+-        task = self.vcns_driver.deploy_edge(
++        task2 = self.vcns_driver.deploy_edge(
+             'router-2', 'myedge', 'internal-network', {}, wait_for_exec=True)
+-        task.wait(TaskState.RESULT)
+-        self.assertEqual(task.status, TaskStatus.ERROR)
++        task1.wait(TaskState.RESULT)
++        task2.wait(TaskState.RESULT)
++        self.assertEqual(task2.status, TaskStatus.ERROR)
+ 
+     def test_get_edge_status(self):
+         self._deploy_edge()
diff --git a/sys-cluster/neutron/files/neutron-2013.2-sphinx_mapping.patch b/sys-cluster/neutron/files/neutron-2013.2-sphinx_mapping.patch
new file mode 100644
index 000000000000..d7367d6a6e52
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-2013.2-sphinx_mapping.patch
@@ -0,0 +1,16 @@
+diff -ur neutron-2013.2.orig/doc/source/conf.py neutron-2013.2/doc/source/conf.py
+--- doc/source/conf.py	2013-10-17 22:01:20.000000000 +0800
++++ doc/source/conf.py	2013-11-15 19:42:42.701213324 +0800
+@@ -238,12 +238,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+-                       'nova': ('http://nova.openstack.org', None),
+-                       'swift': ('http://swift.openstack.org', None),
+-                       'glance': ('http://glance.openstack.org', None),
+-                       'horizon': ('http://horizon.openstack.org', None),
+-                       'keystone': ('http://keystone.openstack.org', None),
+-                      }
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml
index 0637de22a8f9..cbb14677b53b 100644
--- a/sys-cluster/neutron/metadata.xml
+++ b/sys-cluster/neutron/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
+  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
diff --git a/sys-cluster/neutron/neutron-2013.2-r1.ebuild b/sys-cluster/neutron/neutron-2013.2-r1.ebuild
new file mode 100644
index 000000000000..9a8e7365ac0d
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2013.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2-r1.ebuild,v 1.1 2013/11/22 04:38:40 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A virtual network service for Openstack."
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dhcp doc +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? ( >=dev-python/cliff-1.4.3[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			dev-python/subunit[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+			>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+			dev-python/configobj[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+			dev-python/mimeparse[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+		>=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		dev-python/jsonrpclib[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		net-misc/bridge-utils
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=( "${FILESDIR}"/${P}-sphinx_mapping.patch \
+		"${FILESDIR}"/${P}-json-tests.patch \
+		"${FILESDIR}"/${P}-nicira.patch )
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	#it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "neutron"
+	newinitd "${FILESDIR}/neutron-initd" "neutron"
+
+	use server && dosym /etc/init.d/neutron /etc/init.d/neutron-server
+	use dhcp && dosym /etc/init.d/neutron /etc/init.d/neutron-dhcp-agent
+	use l3 && dosym /etc/init.d/neutron /etc/init.d/neutron-l3-agent
+	use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
+	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
+
+	diropts -m 750
+	dodir /var/log/neutron /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+
+	doins "etc/api-paste.ini"
+	doins "etc/dhcp_agent.ini"
+	doins "etc/l3_agent.ini"
+	doins "etc/policy.json"
+	doins "etc/neutron.conf"
+	doins "etc/rootwrap.conf"
+	insinto /etc
+	doins -r "etc/neutron/"
+
+	#remove the etc stuff from usr...
+	rm -R "${D}/usr/etc/"
+
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/sys-cluster/neutron/neutron-2013.2.9999.ebuild b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
index f56544e9244a..a71872895c5c 100644
--- a/sys-cluster/neutron/neutron-2013.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.4 2013/11/11 03:15:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.5 2013/11/22 04:38:40 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-2
 
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8   
-RESTRICT="test"
-DESCRIPTION="Quantum is a virtual network service for Openstack."
+DESCRIPTION="A virtual network service for Openstack."
 HOMEPAGE="https://launchpad.net/neutron"
 EGIT_REPO_URI="https://github.com/openstack/neutron.git"
 EGIT_BRANCH="stable/havana"
@@ -35,7 +33,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
 				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
 				>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
-				dev-python/configobj[${PYTHON_USEDEP}] )"
+				dev-python/configobj[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				dev-python/mimeparse[${PYTHON_USEDEP}] )"
+
 RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
@@ -83,6 +85,21 @@ src_prepare() {
 	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
 }
 
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	# Move tests out that attempt net connection
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/neutron-confd" "neutron"
diff --git a/sys-cluster/neutron/neutron-2013.2.ebuild b/sys-cluster/neutron/neutron-2013.2.ebuild
index 0aad3604d826..0c9b967ad7b5 100644
--- a/sys-cluster/neutron/neutron-2013.2.ebuild
+++ b/sys-cluster/neutron/neutron-2013.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.ebuild,v 1.3 2013/11/11 03:15:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.ebuild,v 1.4 2013/11/22 04:38:40 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8   
 RESTRICT="test"
-DESCRIPTION="Quantum is a virtual network service for Openstack."
+DESCRIPTION="A virtual network service for Openstack."
 HOMEPAGE="https://launchpad.net/neutron"
 SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
 
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index ec2e0f0a41f9..b48da9007dde 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.7 2013/09/27 00:41:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.8 2013/11/22 04:38:39 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -9,7 +9,7 @@ inherit distutils-r1 git-2
 
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8   
 RESTRICT="test"
-DESCRIPTION="Quantum is a virtual network service for Openstack."
+DESCRIPTION="A virtual network service for Openstack."
 HOMEPAGE="https://launchpad.net/neutron"
 EGIT_REPO_URI="https://github.com/openstack/neutron.git"