Merged trunk

3 files changed, 37 insertions, 134 deletions

diff --git a/bin/nova-compute b/bin/nova-compute
index 4738abd4b..e0c12354f 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -19,81 +19,14 @@
 
 """
   Twistd daemon for the nova compute nodes.
-  Receives messages via AMQP, manages pool of worker threads
-  for async tasks.
 """
 
-import logging
-import os
-import sys
-
-# NOTE(termie): kludge so that we can run this from the bin directory in the
-#               checkout without having to screw with paths
-NOVA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'nova')
-if os.path.exists(NOVA_PATH):
-    sys.path.insert(0, os.path.dirname(NOVA_PATH))
-
-from twisted.internet import task
-from twisted.application import service
-
-from nova import flags
-from nova import rpc
 from nova import twistd
-from nova.compute import node
-from nova.objectstore import image # For the images_path flag
-
-
-FLAGS = flags.FLAGS
-# NOTE(termie): This file will necessarily be re-imported under different
-#               context when the twistd.serve() call is made below so any
-#               flags we define here will have to be conditionally defined,
-#               flags defined by imported modules are safe.
-if 'compute_report_state_interval' not in FLAGS:
-    flags.DEFINE_integer('compute_report_state_interval', 10,
-                         'seconds between nodes reporting state to cloud',
-                         lower_bound=1)
-logging.getLogger().setLevel(logging.DEBUG)
-
-def main():
-    logging.warn('Starting compute node')
-    n = node.Node()
-    d = n.adopt_instances()
-    d.addCallback(lambda x: logging.info('Adopted %d instances', x))
-
-    conn = rpc.Connection.instance()
-    consumer_all = rpc.AdapterConsumer(
-            connection=conn,
-            topic='%s' % FLAGS.compute_topic,
-            proxy=n)
-
-    consumer_node = rpc.AdapterConsumer(
-            connection=conn,
-            topic='%s.%s' % (FLAGS.compute_topic, FLAGS.node_name),
-            proxy=n)
-
-    bin_name = os.path.basename(__file__)
-    pulse = task.LoopingCall(n.report_state, FLAGS.node_name, bin_name)
-    pulse.start(interval=FLAGS.compute_report_state_interval, now=False)
-
-    consumer_all.attach_to_twisted()
-    consumer_node.attach_to_twisted()
-
-    # This is the parent service that twistd will be looking for when it
-    # parses this file, return it so that we can get it into globals below
-    application = service.Application(bin_name)
-    n.setServiceParent(application)
-    return application
+from nova.compute import service
 
 
-# NOTE(termie): When this script is executed from the commandline what it will
-#               actually do is tell the twistd application runner that it
-#               should run this file as a twistd application (see below).
 if __name__ == '__main__':
     twistd.serve(__file__)
 
-# NOTE(termie): When this script is loaded by the twistd application runner
-#               this code path will be executed and twistd will expect a
-#               variable named 'application' to be available, it will then
-#               handle starting it and stopping it.
 if __name__ == '__builtin__':
-    application = main()
+    application = service.ComputeService.create()
diff --git a/bin/nova-network b/bin/nova-network
new file mode 100755
index 000000000..52d6cb70a
--- /dev/null
+++ b/bin/nova-network
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+  Twistd daemon for the nova network nodes.
+"""
+
+from nova import twistd
+from nova.network import service
+
+
+if __name__ == '__main__':
+    twistd.serve(__file__)
+
+if __name__ == '__builtin__':
+    application = service.NetworkService.create()
diff --git a/bin/nova-volume b/bin/nova-volume
index 7d4b65205..f7a8fad37 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -18,77 +18,15 @@
 #    under the License.
 
 """
-    Tornado Storage daemon manages AoE volumes via AMQP messaging.
+  Twistd daemon for the nova volume nodes.
 """
 
-import logging
-import os
-import sys
-
-# NOTE(termie): kludge so that we can run this from the bin directory in the
-#               checkout without having to screw with paths
-NOVA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'nova')
-if os.path.exists(NOVA_PATH):
-    sys.path.insert(0, os.path.dirname(NOVA_PATH))
-
-from twisted.internet import task
-from twisted.application import service
-
-from nova import flags
-from nova import rpc
 from nova import twistd
-from nova.volume import storage
-
-
-FLAGS = flags.FLAGS
-# NOTE(termie): This file will necessarily be re-imported under different
-#               context when the twistd.serve() call is made below so any
-#               flags we define here will have to be conditionally defined,
-#               flags defined by imported modules are safe.
-if 'volume_report_state_interval' not in FLAGS:
-    flags.DEFINE_integer('volume_report_state_interval', 10,
-                         'seconds between nodes reporting state to cloud',
-                         lower_bound=1)
-
-
-def main():
-    logging.warn('Starting volume node')
-    bs = storage.BlockStore()
-
-    conn = rpc.Connection.instance()
-    consumer_all = rpc.AdapterConsumer(
-            connection=conn,
-            topic='%s' % FLAGS.storage_topic,
-            proxy=bs)
-
-    consumer_node = rpc.AdapterConsumer(
-            connection=conn,
-            topic='%s.%s' % (FLAGS.storage_topic, FLAGS.node_name),
-            proxy=bs)
-
-    bin_name = os.path.basename(__file__)
-    pulse = task.LoopingCall(bs.report_state, FLAGS.node_name, bin_name)
-    pulse.start(interval=FLAGS.volume_report_state_interval, now=False)
-
-    consumer_all.attach_to_twisted()
-    consumer_node.attach_to_twisted()
-
-    # This is the parent service that twistd will be looking for when it
-    # parses this file, return it so that we can get it into globals below
-    application = service.Application(bin_name)
-    bs.setServiceParent(application)
-    return application
+from nova.volume import service
 
 
-# NOTE(termie): When this script is executed from the commandline what it will
-#               actually do is tell the twistd application runner that it
-#               should run this file as a twistd application (see below).
 if __name__ == '__main__':
     twistd.serve(__file__)
 
-# NOTE(termie): When this script is loaded by the twistd application runner
-#               this code path will be executed and twistd will expect a
-#               variable named 'application' to be available, it will then
-#               handle starting it and stopping it.
 if __name__ == '__builtin__':
-    application = main()
+    application = service.VolumeService.create()