s/onset_files/injected_files/g

2 files changed, 54 insertions, 54 deletions

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 7027c7ea3..253b84be9 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -834,13 +834,13 @@ class TestServerInstanceCreation(test.TestCase):
         class MockComputeAPI(object):
 
             def __init__(self):
-                self.onset_files = None
+                self.injected_files = None
 
             def create(self, *args, **kwargs):
-                if 'onset_files' in kwargs:
-                    self.onset_files = kwargs['onset_files']
+                if 'injected_files' in kwargs:
+                    self.injected_files = kwargs['injected_files']
                 else:
-                    self.onset_files = None
+                    self.injected_files = None
                 return [{'id': '1234', 'display_name': 'fakeinstance'}]
 
             def set_admin_password(self, *args, **kwargs):
@@ -920,46 +920,46 @@ class TestServerInstanceCreation(test.TestCase):
         request = self._get_create_request_json(body_dict)
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
-        return request, response, compute_api.onset_files
+        return request, response, compute_api.injected_files
 
     def _create_instance_with_personality_xml(self, personality):
         body_dict = self._create_personality_request_dict(personality)
         request = self._get_create_request_xml(body_dict)
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
-        return request, response, compute_api.onset_files
+        return request, response, compute_api.injected_files
 
     def test_create_instance_with_no_personality(self):
-        request, response, onset_files = \
+        request, response, injected_files = \
                 self._create_instance_with_personality_json(personality=None)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [])
+        self.assertEquals(injected_files, [])
 
     def test_create_instance_with_no_personality_xml(self):
-        request, response, onset_files = \
+        request, response, injected_files = \
                 self._create_instance_with_personality_xml(personality=None)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [])
+        self.assertEquals(injected_files, [])
 
     def test_create_instance_with_personality(self):
         path = '/my/file/path'
         contents = '#!/bin/bash\necho "Hello, World!"\n'
         b64contents = base64.b64encode(contents)
         personality = [(path, b64contents)]
-        request, response, onset_files = \
+        request, response, injected_files = \
             self._create_instance_with_personality_json(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [(path, contents)])
+        self.assertEquals(injected_files, [(path, contents)])
 
     def test_create_instance_with_personality_xml(self):
         path = '/my/file/path'
         contents = '#!/bin/bash\necho "Hello, World!"\n'
         b64contents = base64.b64encode(contents)
         personality = [(path, b64contents)]
-        request, response, onset_files = \
+        request, response, injected_files = \
             self._create_instance_with_personality_xml(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [(path, contents)])
+        self.assertEquals(injected_files, [(path, contents)])
 
     def test_create_instance_with_personality_no_path(self):
         personality = [('/remove/this/path',
@@ -970,7 +970,7 @@ class TestServerInstanceCreation(test.TestCase):
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(compute_api.onset_files, None)
+        self.assertEquals(compute_api.injected_files, None)
 
     def _test_create_instance_with_personality_no_path_xml(self):
         personality = [('/remove/this/path',
@@ -981,7 +981,7 @@ class TestServerInstanceCreation(test.TestCase):
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(compute_api.onset_files, None)
+        self.assertEquals(compute_api.injected_files, None)
 
     def test_create_instance_with_personality_no_contents(self):
         personality = [('/test/path',
@@ -992,7 +992,7 @@ class TestServerInstanceCreation(test.TestCase):
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(compute_api.onset_files, None)
+        self.assertEquals(compute_api.injected_files, None)
 
     def test_create_instance_with_personality_not_a_list(self):
         personality = [('/test/path', base64.b64encode('test\ncontents\n'))]
@@ -1003,16 +1003,16 @@ class TestServerInstanceCreation(test.TestCase):
         compute_api, response = \
             self._run_create_instance_with_mock_compute_api(request)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(compute_api.onset_files, None)
+        self.assertEquals(compute_api.injected_files, None)
 
     def test_create_instance_with_personality_with_non_b64_content(self):
         path = '/my/file/path'
         contents = '#!/bin/bash\necho "Oh no!"\n'
         personality = [(path, contents)]
-        request, response, onset_files = \
+        request, response, injected_files = \
             self._create_instance_with_personality_json(personality)
         self.assertEquals(response.status_int, 400)
-        self.assertEquals(onset_files, None)
+        self.assertEquals(injected_files, None)
 
     def test_create_instance_with_three_personalities(self):
         files = [
@@ -1023,19 +1023,19 @@ class TestServerInstanceCreation(test.TestCase):
         personality = []
         for path, content in files:
             personality.append((path, base64.b64encode(content)))
-        request, response, onset_files = \
+        request, response, injected_files = \
             self._create_instance_with_personality_json(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, files)
+        self.assertEquals(injected_files, files)
 
     def test_create_instance_personality_empty_content(self):
         path = '/my/file/path'
         contents = ''
         personality = [(path, contents)]
-        request, response, onset_files = \
+        request, response, injected_files = \
             self._create_instance_with_personality_json(personality)
         self.assertEquals(response.status_int, 200)
-        self.assertEquals(onset_files, [(path, contents)])
+        self.assertEquals(injected_files, [(path, contents)])
 
     def test_create_instance_admin_pass_json(self):
         request, response, dummy = \
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index d94381aa2..c65bc459d 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -200,66 +200,66 @@ class QuotaTestCase(test.TestCase):
                                             image_id='fake',
                                             metadata=metadata)
 
-    def test_allowed_onset_files(self):
+    def test_allowed_injected_files(self):
         self.assertEqual(
-                quota.allowed_onset_files(self.context),
-                FLAGS.quota_max_onset_files)
+                quota.allowed_injected_files(self.context),
+                FLAGS.quota_max_injected_files)
 
-    def _create_with_onset_files(self, files):
+    def _create_with_injected_files(self, files):
         api = compute.API(image_service=self.StubImageService())
         api.create(self.context, min_count=1, max_count=1,
                 instance_type='m1.small', image_id='fake',
-                onset_files=files)
+                injected_files=files)
 
-    def test_no_onset_files(self):
+    def test_no_injected_files(self):
         api = compute.API(image_service=self.StubImageService())
         api.create(self.context, instance_type='m1.small', image_id='fake')
 
-    def test_max_onset_files(self):
+    def test_max_injected_files(self):
         files = []
-        for i in xrange(FLAGS.quota_max_onset_files):
+        for i in xrange(FLAGS.quota_max_injected_files):
             files.append(('/my/path%d' % i, 'config = test\n'))
-        self._create_with_onset_files(files)  # no QuotaError
+        self._create_with_injected_files(files)  # no QuotaError
 
-    def test_too_many_onset_files(self):
+    def test_too_many_injected_files(self):
         files = []
-        for i in xrange(FLAGS.quota_max_onset_files + 1):
+        for i in xrange(FLAGS.quota_max_injected_files + 1):
             files.append(('/my/path%d' % i, 'my\ncontent%d\n' % i))
         self.assertRaises(quota.QuotaError,
-                          self._create_with_onset_files, files)
+                          self._create_with_injected_files, files)
 
-    def test_allowed_onset_file_content_bytes(self):
+    def test_allowed_injected_file_content_bytes(self):
         self.assertEqual(
-                quota.allowed_onset_file_content_bytes(self.context),
-                FLAGS.quota_max_onset_file_content_bytes)
+                quota.allowed_injected_file_content_bytes(self.context),
+                FLAGS.quota_max_injected_file_content_bytes)
 
-    def test_max_onset_file_content_bytes(self):
-        max = FLAGS.quota_max_onset_file_content_bytes
+    def test_max_injected_file_content_bytes(self):
+        max = FLAGS.quota_max_injected_file_content_bytes
         content = ''.join(['a' for i in xrange(max)])
         files = [('/test/path', content)]
-        self._create_with_onset_files(files)  # no QuotaError
+        self._create_with_injected_files(files)  # no QuotaError
 
-    def test_too_many_onset_file_content_bytes(self):
-        max = FLAGS.quota_max_onset_file_content_bytes
+    def test_too_many_injected_file_content_bytes(self):
+        max = FLAGS.quota_max_injected_file_content_bytes
         content = ''.join(['a' for i in xrange(max + 1)])
         files = [('/test/path', content)]
         self.assertRaises(quota.QuotaError,
-                          self._create_with_onset_files, files)
+                          self._create_with_injected_files, files)
 
-    def test_allowed_onset_file_path_bytes(self):
+    def test_allowed_injected_file_path_bytes(self):
         self.assertEqual(
-                quota.allowed_onset_file_path_bytes(self.context),
-                FLAGS.quota_max_onset_file_path_bytes)
+                quota.allowed_injected_file_path_bytes(self.context),
+                FLAGS.quota_max_injected_file_path_bytes)
 
-    def test_max_onset_file_path_bytes(self):
-        max = FLAGS.quota_max_onset_file_path_bytes
+    def test_max_injected_file_path_bytes(self):
+        max = FLAGS.quota_max_injected_file_path_bytes
         path = ''.join(['a' for i in xrange(max)])
         files = [(path, 'config = quotatest')]
-        self._create_with_onset_files(files)  # no QuotaError
+        self._create_with_injected_files(files)  # no QuotaError
 
-    def test_too_many_onset_file_path_bytes(self):
-        max = FLAGS.quota_max_onset_file_path_bytes
+    def test_too_many_injected_file_path_bytes(self):
+        max = FLAGS.quota_max_injected_file_path_bytes
         path = ''.join(['a' for i in xrange(max + 1)])
         files = [(path, 'config = quotatest')]
         self.assertRaises(quota.QuotaError,
-                          self._create_with_onset_files, files)
+                          self._create_with_injected_files, files)