rename onset_files to personality_files all the way down to compute manager

5 files changed, 33 insertions, 32 deletions

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index ea13116fa..8f6d8de66 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -140,15 +140,15 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPNotFound())
         return exc.HTTPAccepted()
 
-    def _get_onset_files_from_personality(self, personality):
+    def _get_personality_files(self, personality):
         """
-        Create a list of onset files from the personality request attribute
+        Create a list of personality files from the personality attribute
 
-        At this time, onset_files must be formatted as a list of
+        At this time, personality_files must be formatted as a list of
         (file_path, file_content) pairs for compatibility with the
         underlying compute service.
         """
-        onset_files = []
+        personality_files = []
         for item in personality:
             try:
                 path = item['path']
@@ -160,8 +160,8 @@ class Controller(wsgi.Controller):
             except TypeError:
                 msg = 'Personality content for %s cannot be decoded' % path
                 raise exc.HTTPBadRequest(explanation=msg)
-            onset_files.append((path, contents))
-        return onset_files
+            personality_files.append((path, contents))
+        return personality_files
 
     def create(self, req):
         """ Creates a new server for a given user """
@@ -191,7 +191,7 @@ class Controller(wsgi.Controller):
                 metadata.append({'key': k, 'value': v})
 
         personality = env['server'].get('personality', [])
-        onset_files = self._get_onset_files_from_personality(personality)
+        personality_files = self._get_personality_files(personality)
 
         instances = self.compute_api.create(
             context,
@@ -204,7 +204,7 @@ class Controller(wsgi.Controller):
             key_name=key_pair['name'],
             key_data=key_pair['public_key'],
             metadata=metadata,
-            onset_files=onset_files)
+            personality_files=personality_files)
         return _translate_keys(instances[0])
 
     def update(self, req, id):
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 44e583cd4..13938dcde 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -106,7 +106,7 @@ class API(base.Base):
                display_name='', display_description='',
                key_name=None, key_data=None, security_group='default',
                availability_zone=None, user_data=None, metadata=[],
-               onset_files=None):
+               personality_files=None):
         """Create the number of instances requested if quota and
         other arguments check out ok.
         """
@@ -144,9 +144,9 @@ class API(base.Base):
                 LOG.warn(msg)
                 raise quota.QuotaError(msg, "MetadataLimitExceeded")
 
-        if onset_files is not None:
-            onset_files = \
-                self._check_personality_file_quota(context, onset_files)
+        if personality_files is not None:
+            personality_files = \
+                self._check_personality_file_quota(context, personality_files)
 
         image = self.image_service.show(context, image_id)
         if kernel_id is None:
@@ -242,7 +242,7 @@ class API(base.Base):
                       "args": {"topic": FLAGS.compute_topic,
                                "instance_id": instance_id,
                                "availability_zone": availability_zone,
-                               "onset_files": onset_files}})
+                               "personality_files": personality_files}})
 
         for group_id in security_groups:
             self.trigger_security_group_members_refresh(elevated, group_id)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index d659712ad..1a392dda8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -174,7 +174,7 @@ class ComputeManager(manager.Manager):
         """Launch a new instance with specified options."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
-        instance_ref.onset_files = kwargs.get('onset_files', [])
+        instance_ref.onset_files = kwargs.get('personality_files', [])
         if instance_ref['name'] in self.driver.list_instances():
             raise exception.Error(_("Instance has already been created"))
         LOG.audit(_("instance %s: starting..."), instance_id,
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 53cfa3a6e..bf934113a 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -241,13 +241,13 @@ class ServersTest(test.TestCase):
         class FakeComputeAPI(object):
 
             def __init__(self):
-                self.onset_files = None
+                self.personality_files = None
 
             def create(self, *args, **kwargs):
-                if 'onset_files' in kwargs:
-                    self.onset_files = kwargs['onset_files']
+                if 'personality_files' in kwargs:
+                    self.personality_files = kwargs['personality_files']
                 else:
-                    self.onset_files = None
+                    self.personality_files = None
                 return [{'id': '1234', 'display_name': 'fakeinstance'}]
 
         def make_stub_method(canned_return):
@@ -271,32 +271,33 @@ class ServersTest(test.TestCase):
         req = webob.Request.blank('/v1.0/servers')
         req.method = 'POST'
         req.body = json.dumps(body)
-        return req, req.get_response(fakes.wsgi_app()), compute_api.onset_files
+        return (req, req.get_response(fakes.wsgi_app()),
+                compute_api.personality_files)
 
     def test_create_instance_with_no_personality(self):
-        request, response, onset_files = \
+        request, response, personality_files = \
                 self._create_instance_with_personality(personality=None)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [])
+        self.assertEquals(personality_files, [])
 
     def test_create_instance_with_personality(self):
         path = '/my/file/path'
         contents = '#!/bin/bash\necho "Hello, World!"\n'
         b64contents = base64.b64encode(contents)
         personality = [self._personality_dict(path, b64contents)]
-        request, response, onset_files = \
+        request, response, personality_files = \
             self._create_instance_with_personality(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [(path, contents)]) 
+        self.assertEquals(personality_files, [(path, contents)])
 
     def test_create_instance_with_personality_with_non_b64_content(self):
         path = '/my/file/path'
         contents = '#!/bin/bash\necho "Oh no!"\n'
         personality = [self._personality_dict(path, contents)]
-        request, response, onset_files = \
+        request, response, personality_files = \
             self._create_instance_with_personality(personality)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(onset_files, None)
+        self.assertEquals(personality_files, None)
 
     def test_create_instance_with_three_personalities(self):
         files = [
@@ -308,28 +309,28 @@ class ServersTest(test.TestCase):
         for path, content in files:
             personality.append(self._personality_dict(
                     path, base64.b64encode(content)))
-        request, response, onset_files = \
+        request, response, personality_files = \
             self._create_instance_with_personality(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, files)
+        self.assertEquals(personality_files, files)
 
     def test_create_instance_personality_empty_content(self):
         path = '/my/file/path'
         contents = ''
         personality = [self._personality_dict(path, contents)]
-        request, response, onset_files = \
+        request, response, personality_files = \
             self._create_instance_with_personality(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [(path, contents)])
+        self.assertEquals(personality_files, [(path, contents)])
 
     def test_create_instance_personality_not_a_list(self):
         path = '/my/file/path'
         contents = 'myfilecontents'
         personality = self._personality_dict(path, contents)
-        request, response, onset_files = \
+        request, response, personality_files = \
             self._create_instance_with_personality(personality)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(onset_files, None)
+        self.assertEquals(personality_files, None)
 
     def test_update_no_body(self):
         req = webob.Request.blank('/v1.0/servers/1')
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 16a083788..b26dec61a 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -186,7 +186,7 @@ class QuotaTestCase(test.TestCase):
         api = compute.API()
         api.create(self.context, min_count=1, max_count=1,
                 instance_type='m1.small', image_id='fake',
-                onset_files=files)
+                personality_files=files)
 
     def test_no_personality_files(self):
         api = compute.API()