stricter zone_id checking

bin/nova-vncproxy

@@ -63,6 +63,19 @@ flags.DEFINE_flag(flags.HelpshortFlag())
 flags.DEFINE_flag(flags.HelpXMLFlag())
 
 
+def handle_flash_socket_policy(socket):
+    LOG.info(_("Received connection on flash socket policy port"))
+
+    fd = socket.makefile('rw')
+    expected_command = "<policy-file-request/>"
+    if expected_command in fd.read(len(expected_command) + 1):
+        LOG.info(_("Received valid flash socket policy request"))
+        fd.write('<?xml version="1.0"?><cross-domain-policy><allow-'
+                 'access-from domain="*" to-ports="%d" /></cross-'
+                 'domain-policy>' % (FLAGS.vncproxy_port))
+        fd.flush()
+    socket.close()
+
 if __name__ == "__main__":
     utils.default_flagfile()
     FLAGS(sys.argv)
@@ -101,4 +114,6 @@ if __name__ == "__main__":
                          host=FLAGS.vncproxy_host,
                          port=FLAGS.vncproxy_port)
     server.start()
+    server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host)
+
     server.wait()

nova/scheduler/zone_aware_scheduler.py

@@ -178,12 +178,14 @@ class ZoneAwareScheduler(driver.Scheduler):
         to adjust the weights returned from the child zones. Alters
         child_results in place.
         """
-        for zone, result in child_results:
+        for zone_id, result in child_results:
             if not result:
                 continue
 
+            assert isinstance(zone_id, int)
+
             for zone_rec in zones:
-                if zone_rec['id'] != zone:
+                if zone_rec['id'] != zone_id:
                     continue
 
                 for item in result:
@@ -196,7 +198,7 @@ class ZoneAwareScheduler(driver.Scheduler):
                         item['raw_weight'] = raw_weight
                     except KeyError:
                         LOG.exception(_("Bad child zone scaling values "
-                                        "for Zone: %(zone)s") % locals())
+                                        "for Zone: %(zone_id)s") % locals())
 
     def schedule_run_instance(self, context, instance_id, request_spec,
                               *args, **kwargs):

nova/wsgi.py

@@ -67,6 +67,7 @@ class Server(object):
         self.host = host or "0.0.0.0"
         self.port = port or 0
         self._server = None
+        self._tcp_server = None
         self._socket = None
         self._pool = eventlet.GreenPool(pool_size or self.default_pool_size)
         self._logger = logging.getLogger("eventlet.wsgi.server")
@@ -106,6 +107,17 @@ class Server(object):
         """
         LOG.info(_("Stopping WSGI server."))
         self._server.kill()
+        if self._tcp_server is not None:
+            LOG.info(_("Stopping raw TCP server."))
+            self._tcp_server.kill()
+
+    def start_tcp(self, listener, port, host='0.0.0.0', key=None, backlog=128):
+        """Run a raw TCP server with the given application."""
+        arg0 = sys.argv[0]
+        LOG.info(_('Starting TCP server %(arg0)s on %(host)s:%(port)s')
+                 % locals())
+        socket = eventlet.listen((host, port), backlog=backlog)
+        self._tcp_server = self._pool.spawn_n(self._run_tcp, listener, socket)
 
     def wait(self):
         """Block, until the server has stopped.
@@ -120,6 +132,15 @@ class Server(object):
         except greenlet.GreenletExit:
             LOG.info(_("WSGI server has stopped."))
 
+    def _run_tcp(self, listener, socket):
+        """Start a raw TCP server in a new green thread."""
+        while True:
+            try:
+                new_sock, address = socket.accept()
+                self._pool.spawn_n(listener, new_sock)
+            except (SystemExit, KeyboardInterrupt):
+                pass
+
 
 class Request(webob.Request):
     pass

run_tests.sh

@@ -114,7 +114,7 @@ if [ $just_pep8 -eq 1 ]; then
 fi
 
 if [ $recreate_db -eq 1 ]; then
-    rm tests.sqlite
+    rm -f tests.sqlite
 fi
 
 run_tests || exit