x/python-ganttclient
Code Issues Proposed changes

updates per review

Browse Source
This commit is contained in:
termie
2010-12-14 16:05:39 -08:00
parent af7fa95816
commit 7fc6a349db
6 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/nova-api
View File

@@ -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()

3
bin/nova-combined
View File

@@ -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')

2
bin/nova-scheduler
View File

@@ -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()

1
nova/rpc.py
View File

@@ -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:

13
nova/tests/service_unittest.py
View File

@@ -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,

5
run_tests.py
View File

@@ -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