From 7fc6a349db7a1a84ed61404e428427909664d27d Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Tue, 14 Dec 2010 16:05:39 -0800
Subject: [PATCH] updates per review

---
 bin/nova-api                   |  9 +++------
 bin/nova-combined              |  3 ---
 bin/nova-scheduler             |  2 +-
 nova/rpc.py                    |  1 -
 nova/tests/service_unittest.py | 13 -------------
 run_tests.py                   |  5 -----
 6 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/bin/nova-api b/bin/nova-api
index 21048666..3f433ea6 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -36,6 +36,7 @@ from nova import flags
 from nova import utils
 from nova import wsgi
 
+
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
 flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
@@ -43,14 +44,10 @@ flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
 flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
-def main():
+if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     server = wsgi.Server()
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
     server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
     server.wait()
-
-
-if __name__ == '__main__':
-    utils.default_flagfile()
-    main()
diff --git a/bin/nova-combined b/bin/nova-combined
index e82b9c9b..5f635b3a 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -40,9 +40,6 @@ from nova import utils
 from nova import wsgi
 
 
-FLAGS = flags.FLAGS
-flags.DEFINE_integer('api_port', 8773, 'API port')
-
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
 flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index a46dd8dd..59cb060d 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -17,7 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" Starter script for Nova Scheduler."""
+"""Starter script for Nova Scheduler."""
 
 import eventlet
 eventlet.monkey_patch()
diff --git a/nova/rpc.py b/nova/rpc.py
index b5df4904..6a3f552d 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -188,7 +188,6 @@ class AdapterConsumer(TopicConsumer):
         node_func = getattr(self.proxy, str(method))
         node_args = dict((str(k), v) for k, v in args.iteritems())
         # NOTE(vish): magic is fun!
-        # pylint: disable-msg=W0142
         try:
             rval = node_func(context=ctxt, **node_args)
             if msg_id:
diff --git a/nova/tests/service_unittest.py b/nova/tests/service_unittest.py
index c94af4a2..6bdc7071 100644
--- a/nova/tests/service_unittest.py
+++ b/nova/tests/service_unittest.py
@@ -91,8 +91,6 @@ class ServiceTestCase(test.TestCase):
         self.mox.StubOutWithMock(rpc,
                                  'AdapterConsumer',
                                  use_mock_anything=True)
-        #self.mox.StubOutWithMock(
-        #        service.task, 'LoopingCall', use_mock_anything=True)
         rpc.AdapterConsumer(connection=mox.IgnoreArg(),
                             topic=topic,
                             proxy=mox.IsA(service.Service)).AndReturn(
@@ -106,17 +104,6 @@ class ServiceTestCase(test.TestCase):
         rpc.AdapterConsumer.attach_to_eventlet()
         rpc.AdapterConsumer.attach_to_eventlet()
 
-        # Stub out looping call a bit needlessly since we don't have an easy
-        # way to cancel it (yet) when the tests finishes
-        #service.task.LoopingCall(mox.IgnoreArg()).AndReturn(
-        #                service.task.LoopingCall)
-        #service.task.LoopingCall.start(interval=mox.IgnoreArg(),
-        #                               now=mox.IgnoreArg())
-        #service.task.LoopingCall(mox.IgnoreArg()).AndReturn(
-        #                service.task.LoopingCall)
-        #service.task.LoopingCall.start(interval=mox.IgnoreArg(),
-        #                               now=mox.IgnoreArg())
-
         service_create = {'host': host,
                           'binary': binary,
                           'topic': topic,
diff --git a/run_tests.py b/run_tests.py
index 6d7830a2..9f370841 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -46,7 +46,6 @@ import __main__
 import os
 import sys
 
-
 from twisted.scripts import trial as trial_script
 
 from nova import flags
@@ -66,8 +65,6 @@ from nova.tests.rpc_unittest import *
 from nova.tests.scheduler_unittest import *
 from nova.tests.service_unittest import *
 from nova.tests.twistd_unittest import *
-from nova.tests.validator_unittest import *
-from nova.tests.virt_unittest import *
 from nova.tests.virt_unittest import *
 from nova.tests.volume_unittest import *
 
@@ -85,8 +82,6 @@ if __name__ == '__main__':
     config = OptionsClass()
     argv = config.parseOptions()
 
-    argv = FLAGS(sys.argv)
-
     FLAGS.verbose = True
 
     # TODO(termie): these should make a call instead of doing work on import