summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-08-16 13:34:17 -0500
committerJoe Gordon <jogo@cloudscaling.com>2012-08-17 15:59:32 -0500
commitb0392d3017abc2f991ab774e310d0ae7840e64f8 (patch)
tree56e88133cd31853c8d38a09cc894930aaacd89c7 /nova
parenta10be151ad9f62bb916498c8dae42e4b54dfc779 (diff)
OpenStack capitalization added to HACKING.rst
Along with capitalization fixes to comments in code Change-Id: I72ddc582001f80d954ca5a121903c689f40d08d1
Diffstat (limited to 'nova')
-rw-r--r--nova/common/eventlet_backdoor.py2
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py2
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py2
-rw-r--r--nova/scheduler/filters/trusted_filter.py2
-rw-r--r--nova/tests/api/openstack/compute/test_flavors.py2
-rw-r--r--nova/tests/test_metadata.py4
-rw-r--r--nova/virt/powervm/operator.py2
-rw-r--r--nova/virt/xenapi/vm_utils.py2
8 files changed, 9 insertions, 9 deletions
diff --git a/nova/common/eventlet_backdoor.py b/nova/common/eventlet_backdoor.py
index b67608691..f8fccf269 100644
--- a/nova/common/eventlet_backdoor.py
+++ b/nova/common/eventlet_backdoor.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright (c) 2012 Openstack, LLC.
+# Copyright (c) 2012 OpenStack, LLC.
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py b/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py
index 130c4fe59..85856ed6a 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py b/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py
index e523362cc..0200861b2 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py
index a7c711b4e..d4085b7f4 100644
--- a/nova/scheduler/filters/trusted_filter.py
+++ b/nova/scheduler/filters/trusted_filter.py
@@ -1,7 +1,7 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright (c) 2012 Intel, Inc.
-# Copyright (c) 2011-2012 Openstack, LLC.
+# Copyright (c) 2011-2012 OpenStack, LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index a5cd2bbef..2f9493a05 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -794,7 +794,7 @@ class DisabledFlavorsWithRealDBTest(test.TestCase):
self.assertEqual(flavor['name'], self.disabled_type['name'])
# FIXME(sirp): the disabled field is currently namespaced so that we
- # don't impact the Openstack API. Eventually this should probably be
+ # don't impact the OpenStack API. Eventually this should probably be
# made a first-class attribute in the next OSAPI version.
self.assert_('OS-FLV-DISABLED:disabled' in flavor)
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index 13be9e056..e06515e39 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -235,9 +235,9 @@ class MetadataTestCase(test.TestCase):
self.assertTrue(md._check_version('2009-04-04', '2009-04-04'))
-class OpenstackMetadataTestCase(test.TestCase):
+class OpenStackMetadataTestCase(test.TestCase):
def setUp(self):
- super(OpenstackMetadataTestCase, self).setUp()
+ super(OpenStackMetadataTestCase, self).setUp()
self.instance = INSTANCES[0]
fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs,
spectacular=True)
diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py
index 110fae4fb..9503038f2 100644
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@@ -100,7 +100,7 @@ class PowerVMOperator(object):
"""
lpar_instances = self._operator.list_lpar_instances()
# We filter out instances that haven't been created
- # via Openstack. Notice that this is fragile and it can
+ # via OpenStack. Notice that this is fragile and it can
# be improved later.
instances = [instance for instance in lpar_instances
if re.search(r'^instance-[0-9]{8}$', instance)]
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index ac936d9c4..c5cf81780 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -2,7 +2,7 @@
# Copyright (c) 2010 Citrix Systems, Inc.
# Copyright 2011 Piston Cloud Computing, Inc.
-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
#
# 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