Merge lp:~sandy-walsh/nova/xs_pause into lp:~tr3buchet/nova/xs_pause

[Sandy Walsh]

Trey ... this is merged with new trunk from this morning and includes my admin-api branch.

Looks like we'll have to ping-pong between two branches with merge-props since I can't push to your branch.

[Trey Morris (tr3buchet)]

i suppose by approving this in a review it'll allow our branches to merge?

review: Approve

[Trey Morris (tr3buchet)]

i guess not, i have to do it manually. and mark it as merged somehow

[Trey Morris (tr3buchet)]

note: you have to click on the foot print looking icon next to the status to update status to merged.

=== modified file 'Authors'
--- Authors	2010-12-07 21:29:14 +0000
+++ Authors	2010-12-09 14:59:00 +0000
@@ -21,8 +21,10 @@
 Paul Voccio <[e-mail]>
 Rick Clark <[e-mail]>
 Ryan Lucio <[e-mail]>
+Sandy Walsh <[e-mail]>
 Soren Hansen <[e-mail]>
 Todd Willey <[e-mail]>
+Trey Morris <[e-mail]>
 Vishvananda Ishaya <[e-mail]>
 Youcef Laribi <[e-mail]>
 Zhixue Wu <[e-mail]>

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-12-03 20:21:18 +0000
+++ nova/api/ec2/cloud.py	2010-12-09 14:59:00 +0000
@@ -753,7 +753,6 @@
             ramdisk_id=kwargs.get('ramdisk_id'),
             display_name=kwargs.get('display_name'),
             description=kwargs.get('display_description'),
-            user_data=kwargs.get('user_data', ''),
             key_name=kwargs.get('key_name'),
             security_group=kwargs.get('security_group'),
             generate_hostname=internal_id_to_ec2_id)

=== modified file 'nova/api/openstack/__init__.py'
--- nova/api/openstack/__init__.py	2010-12-02 19:29:37 +0000
+++ nova/api/openstack/__init__.py	2010-12-09 14:59:00 +0000
@@ -48,6 +48,10 @@
     'nova.api.openstack.auth.BasicApiAuthManager',
     'The auth mechanism to use for the OpenStack API implemenation')
 
+flags.DEFINE_bool('allow_admin_api',
+    False,
+    'When True, this API service will accept admin operations.')
+
 
 class API(wsgi.Middleware):
     """WSGI entry point for all OpenStack API requests."""
@@ -183,6 +187,10 @@
         mapper.resource("sharedipgroup", "sharedipgroups",
                         controller=sharedipgroups.Controller())
 
+        if FLAGS.allow_admin_api:
+            logging.debug("Including admin operations in API.")
+            # TODO: Place routes for admin operations here.
+
         super(APIRouter, self).__init__(mapper)
 
 

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2010-12-07 18:06:49 +0000
+++ nova/compute/api.py	2010-12-09 14:59:00 +0000
@@ -55,9 +55,8 @@
 
     def create_instances(self, context, instance_type, image_id, min_count=1,
                          max_count=1, kernel_id=None, ramdisk_id=None,
-                         display_name='', description='', user_data='',
-                         key_name=None, key_data=None,
-                         security_group='default',
+                         display_name='', description='', key_name=None,
+                         key_data=None, security_group='default',
                          generate_hostname=generate_default_hostname):
         """Create the number of instances requested if quote and
         other arguments check out ok."""
@@ -158,8 +157,8 @@
                      {"method": "setup_fixed_ip",
                       "args": {"address": address}})
 
-            logging.debug("Casting to scheduler for %s/%s's instance %s" %
-                          (context.project_id, context.user_id, instance_id))
+            logging.debug("Casting to scheduler for %s/%s's instance %s",
+                          context.project_id, context.user_id, instance_id)
             rpc.cast(context,
                      FLAGS.scheduler_topic,
                      {"method": "run_instance",
@@ -169,6 +168,12 @@
         return instances
 
     def ensure_default_security_group(self, context):
+        """ Create security group for the security context if it
+        does not already exist
+
+        :param context: the security context
+
+        """
         try:
             db.security_group_get_by_name(context, context.project_id,
                                           'default')
@@ -177,7 +182,7 @@
                       'description': 'default',
                       'user_id': context.user_id,
                       'project_id': context.project_id}
-            group = db.security_group_create(context, values)
+            db.security_group_create(context, values)
 
     def update_instance(self, context, instance_id, **kwargs):
         """Updates the instance in the datastore.

=== added file 'nova/tests/api/openstack/test_adminapi.py'
--- nova/tests/api/openstack/test_adminapi.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/openstack/test_adminapi.py	2010-12-09 14:59:00 +0000
@@ -0,0 +1,61 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack LLC.
+# 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.
+
+import unittest
+
+import stubout
+import webob
+
+import nova.api
+from nova import flags
+from nova.tests.api.openstack import fakes
+
+FLAGS = flags.FLAGS
+
+
+class AdminAPITest(unittest.TestCase):
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+        fakes.FakeAuthManager.auth_data = {}
+        fakes.FakeAuthDatabase.data = {}
+        fakes.stub_out_networking(self.stubs)
+        fakes.stub_out_rate_limiting(self.stubs)
+        fakes.stub_out_auth(self.stubs)
+        self.allow_admin = FLAGS.allow_admin_api
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+        FLAGS.allow_admin_api = self.allow_admin
+
+    def test_admin_enabled(self):
+        FLAGS.allow_admin_api = True
+        # We should still be able to access public operations.
+        req = webob.Request.blank('/v1.0/flavors')
+        res = req.get_response(nova.api.API('os'))
+        self.assertEqual(res.status_int, 200)
+        # TODO: Confirm admin operations are available.
+
+    def test_admin_disabled(self):
+        FLAGS.allow_admin_api = False
+        # We should still be able to access public operations.
+        req = webob.Request.blank('/v1.0/flavors')
+        res = req.get_response(nova.api.API('os'))
+        self.assertEqual(res.status_int, 200)
+        # TODO: Confirm admin operations are unavailable.
+
+if __name__ == '__main__':
+    unittest.main()

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2010-10-25 10:21:09 +0000
+++ tools/pip-requires	2010-12-09 14:59:00 +0000
@@ -20,3 +20,4 @@
 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
 greenlet==0.3.1
 nose
+bzr