Merge lp:~justin-fathomdb/nova/bug744150 into lp:~hudson-openstack/nova/trunk

[justinsb]

Fix bug #744150 by starting nova-api on an unused port.

[justinsb (justin-fathomdb)]

Starts nova-api on an unassigned port (in tests), so that we can run two unit tests at once.

[termie (termie)]

lgtm

review: Approve

[Todd Willey (xtoddx)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

soren, since you reported this bug, can you weigh in on whether it should go in?

[justinsb (justin-fathomdb)]

I suggest it won't affect anyone in production, just our test suite, so we
live with running one test at once until diablo opens.

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/service.py

[Brian Waldon (bcwaldon)]

@justinsb: Looks good once that conflict is resolved.

review: Needs Fixing

[Soren Hansen (soren)]

Yay! (apart from the conflicts, of course)

review: Approve

[Rick Harris (rconradharris)]

Looks great, just need to resolve the conflicts.

justinsb: Think you'll have time to tackle that in the near future?

review: Needs Fixing

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/service.py

=== modified file 'nova/service.py'
--- nova/service.py	2011-04-20 19:08:22 +0000
+++ nova/service.py	2011-05-20 04:04:31 +0000
@@ -240,6 +240,10 @@
     def wait(self):
         self.wsgi_app.wait()
 
+    def get_socket_info(self, api_name):
+        """Returns the (host, port) that an API was started on."""
+        return self.wsgi_app.socket_info[api_name]
+
 
 class ApiService(WsgiService):
     """Class for our nova-api service."""
@@ -318,8 +322,10 @@
         logging.debug(_('App Config: %(api)s\n%(config)r') % locals())
         logging.info(_('Running %s API'), api)
         app = wsgi.load_paste_app(paste_config_file, api)
-        apps.append((app, getattr(FLAGS, '%s_listen_port' % api),
-                     getattr(FLAGS, '%s_listen' % api)))
+        apps.append((app,
+                     getattr(FLAGS, '%s_listen_port' % api),
+                     getattr(FLAGS, '%s_listen' % api),
+                     api))
     if len(apps) == 0:
         logging.error(_('No known API applications configured in %s.'),
                       paste_config_file)

=== modified file 'nova/tests/integrated/integrated_helpers.py'
--- nova/tests/integrated/integrated_helpers.py	2011-03-30 01:13:04 +0000
+++ nova/tests/integrated/integrated_helpers.py	2011-05-20 04:04:31 +0000
@@ -160,7 +160,7 @@
         #self.start_service('network')
         self.start_service('scheduler')
 
-        self.auth_url = self._start_api_service()
+        self._start_api_service()
 
         self.context = IntegratedUnitTestContext(self.auth_url)
 
@@ -174,8 +174,10 @@
         if not api_service:
             raise Exception("API Service was None")
 
-        auth_url = 'http://localhost:8774/v1.1'
-        return auth_url
+        self.api_service = api_service
+
+        host, port = api_service.get_socket_info('osapi')
+        self.auth_url = 'http://%s:%s/v1.1' % (host, port)
 
     def tearDown(self):
         self.context.cleanup()
@@ -184,6 +186,11 @@
     def _get_flags(self):
         """An opportunity to setup flags, before the services are started."""
         f = {}
+
+        # Auto-assign ports to allow concurrent tests
+        f['ec2_listen_port'] = 0
+        f['osapi_listen_port'] = 0
+
         f['image_service'] = 'nova.image.fake.FakeImageService'
         f['fake_network'] = True
         return f

=== modified file 'nova/wsgi.py'
--- nova/wsgi.py	2011-04-27 21:03:05 +0000
+++ nova/wsgi.py	2011-05-20 04:04:31 +0000
@@ -59,13 +59,16 @@
 
     def __init__(self, threads=1000):
         self.pool = eventlet.GreenPool(threads)
+        self.socket_info = {}
 
-    def start(self, application, port, host='0.0.0.0', backlog=128):
+    def start(self, application, port, host='0.0.0.0', key=None, backlog=128):
         """Run a WSGI server with the given application."""
         arg0 = sys.argv[0]
         logging.audit(_('Starting %(arg0)s on %(host)s:%(port)s') % locals())
         socket = eventlet.listen((host, port), backlog=backlog)
         self.pool.spawn_n(self._run, application, socket)
+        if key:
+            self.socket_info[key] = socket.getsockname()
 
     def wait(self):
         """Wait until all servers have completed running."""