summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-03-15 14:42:01 -0700
committerJoe Gordon <jogo@cloudscaling.com>2012-03-15 14:58:50 -0700
commit6c3fd5ada0fb286af173ac65f20bf36049b0372f (patch)
tree4f32d74ea628d8db598c2eac0028a9861f58c9f8
parenta123f26a3f99bd0382ca48706dbfa363e11a9619 (diff)
Fix OpenStack Capitalization
Openstack => OpenStack Change-Id: I13921ae3fcc40a85ace84a32e52a1507b802f691
-rw-r--r--nova/api/metadata/__init__.py2
-rw-r--r--nova/api/openstack/compute/consoles.py2
-rw-r--r--nova/api/openstack/compute/contrib/admin_actions.py2
-rw-r--r--nova/api/openstack/compute/contrib/cloudpipe.py2
-rw-r--r--nova/api/openstack/compute/contrib/deferred_delete.py2
-rw-r--r--nova/api/openstack/compute/contrib/extended_server_attributes.py2
-rw-r--r--nova/api/openstack/compute/contrib/extended_status.py2
-rw-r--r--nova/api/openstack/compute/contrib/flavorextradata.py2
-rw-r--r--nova/api/openstack/compute/contrib/flavorextraspecs.py2
-rw-r--r--nova/api/openstack/compute/contrib/hosts.py2
-rw-r--r--nova/api/openstack/compute/contrib/keypairs.py2
-rw-r--r--nova/api/openstack/compute/contrib/rescue.py2
-rw-r--r--nova/api/openstack/compute/contrib/virtual_interfaces.py2
-rw-r--r--nova/api/openstack/compute/contrib/virtual_storage_arrays.py4
-rw-r--r--nova/api/openstack/compute/contrib/volumes.py4
-rw-r--r--nova/api/openstack/compute/contrib/volumetypes.py4
-rw-r--r--nova/api/openstack/compute/image_metadata.py2
-rw-r--r--nova/api/openstack/compute/ips.py2
-rw-r--r--nova/api/openstack/compute/server_metadata.py2
-rw-r--r--nova/api/openstack/compute/views/limits.py2
-rw-r--r--nova/api/openstack/volume/types.py2
-rw-r--r--nova/api/openstack/wsgi.py2
22 files changed, 25 insertions, 25 deletions
diff --git a/nova/api/metadata/__init__.py b/nova/api/metadata/__init__.py
index f09dfc326..cf0e1e320 100644
--- a/nova/api/metadata/__init__.py
+++ b/nova/api/metadata/__init__.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Openstack, LLC.
+# Copyright 2011 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
diff --git a/nova/api/openstack/compute/consoles.py b/nova/api/openstack/compute/consoles.py
index 19c7d6fa9..c0097b0eb 100644
--- a/nova/api/openstack/compute/consoles.py
+++ b/nova/api/openstack/compute/consoles.py
@@ -80,7 +80,7 @@ class ConsolesTemplate(xmlutil.TemplateBuilder):
class Controller(object):
- """The Consoles controller for the Openstack API"""
+ """The Consoles controller for the OpenStack API"""
def __init__(self):
self.console_api = console_api.API()
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index 3339c4568..f7908f758 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/nova/api/openstack/compute/contrib/admin_actions.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Openstack, LLC.
+# Copyright 2011 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
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index f47f107ea..b5d87477e 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Openstack, LLC.
+# Copyright 2011 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
diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py
index 16c305973..8ba23a663 100644
--- a/nova/api/openstack/compute/contrib/deferred_delete.py
+++ b/nova/api/openstack/compute/contrib/deferred_delete.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Openstack, LLC
+# Copyright 2011 OpenStack, LLC
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py
index a4794d74f..9b7d5f6db 100644
--- a/nova/api/openstack/compute/contrib/extended_server_attributes.py
+++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py
@@ -1,4 +1,4 @@
-# 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
diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py
index de532adad..879d17b53 100644
--- a/nova/api/openstack/compute/contrib/extended_status.py
+++ b/nova/api/openstack/compute/contrib/extended_status.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Openstack, LLC.
+# Copyright 2011 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
diff --git a/nova/api/openstack/compute/contrib/flavorextradata.py b/nova/api/openstack/compute/contrib/flavorextradata.py
index 92189fd51..2e9e927f6 100644
--- a/nova/api/openstack/compute/contrib/flavorextradata.py
+++ b/nova/api/openstack/compute/contrib/flavorextradata.py
@@ -18,7 +18,7 @@
"""The Flavor extra data extension
-Openstack API version 1.1 lists "name", "ram", "disk", "vcpus" as flavor
+OpenStack API version 1.1 lists "name", "ram", "disk", "vcpus" as flavor
attributes. This extension adds to that list:
- OS-FLV-EXT-DATA:ephemeral
diff --git a/nova/api/openstack/compute/contrib/flavorextraspecs.py b/nova/api/openstack/compute/contrib/flavorextraspecs.py
index 1712e30b9..e878e2efb 100644
--- a/nova/api/openstack/compute/contrib/flavorextraspecs.py
+++ b/nova/api/openstack/compute/contrib/flavorextraspecs.py
@@ -35,7 +35,7 @@ class ExtraSpecsTemplate(xmlutil.TemplateBuilder):
class FlavorExtraSpecsController(object):
- """ The flavor extra specs API controller for the Openstack API """
+ """ The flavor extra specs API controller for the OpenStack API """
def _get_extra_specs(self, context, flavor_id):
extra_specs = db.instance_type_extra_specs_get(context, flavor_id)
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index a44a56024..93e0dd983 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Openstack, LLC.
+# Copyright (c) 2011 OpenStack, LLC.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py
index 5f6f56e15..7dbbf14f3 100644
--- a/nova/api/openstack/compute/contrib/keypairs.py
+++ b/nova/api/openstack/compute/contrib/keypairs.py
@@ -49,7 +49,7 @@ class KeypairsTemplate(xmlutil.TemplateBuilder):
class KeypairController(object):
- """ Keypair API controller for the Openstack API """
+ """ Keypair API controller for the OpenStack API """
# TODO(ja): both this file and nova.api.ec2.cloud.py have similar logic.
# move the common keypair logic to nova.compute.API?
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py
index 20158ff22..b46b12a18 100644
--- a/nova/api/openstack/compute/contrib/rescue.py
+++ b/nova/api/openstack/compute/contrib/rescue.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Openstack, LLC.
+# Copyright 2011 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
diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py
index 87754499a..e7c0a8735 100644
--- a/nova/api/openstack/compute/contrib/virtual_interfaces.py
+++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py
@@ -50,7 +50,7 @@ def _translate_vif_summary_view(_context, vif):
class ServerVirtualInterfaceController(object):
- """The instance VIF API controller for the Openstack API.
+ """The instance VIF API controller for the OpenStack API.
"""
def __init__(self):
diff --git a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
index 6c8a58c21..9c413e76f 100644
--- a/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
+++ b/nova/api/openstack/compute/contrib/virtual_storage_arrays.py
@@ -439,7 +439,7 @@ class VsaVolumesTemplate(xmlutil.TemplateBuilder):
class VsaVolumeController(VsaVolumeDriveController):
- """The VSA volume API controller for the Openstack API.
+ """The VSA volume API controller for the OpenStack API.
A child resource of the VSA object. Allows operations with volumes created
by particular VSA
@@ -489,7 +489,7 @@ class VsaDrivesTemplate(xmlutil.TemplateBuilder):
class VsaDriveController(VsaVolumeDriveController):
- """The VSA Drive API controller for the Openstack API.
+ """The VSA Drive API controller for the OpenStack API.
A child resource of the VSA object. Allows operations with drives created
for particular VSA
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index 51d4a49a9..bc9e6a0d2 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/nova/api/openstack/compute/contrib/volumes.py
@@ -275,7 +275,7 @@ class VolumeAttachmentsTemplate(xmlutil.TemplateBuilder):
class VolumeAttachmentController(object):
- """The volume attachment API controller for the Openstack API.
+ """The volume attachment API controller for the OpenStack API.
A child resource of the server. Note that we use the volume id
as the ID of the attachment (though this is not guaranteed externally)
@@ -397,7 +397,7 @@ class VolumeAttachmentController(object):
class BootFromVolumeController(servers.Controller):
- """The boot from volume API controller for the Openstack API."""
+ """The boot from volume API controller for the OpenStack API."""
def _get_block_device_mapping(self, data):
return data.get('block_device_mapping')
diff --git a/nova/api/openstack/compute/contrib/volumetypes.py b/nova/api/openstack/compute/contrib/volumetypes.py
index d0d0575fd..16a423f80 100644
--- a/nova/api/openstack/compute/contrib/volumetypes.py
+++ b/nova/api/openstack/compute/contrib/volumetypes.py
@@ -54,7 +54,7 @@ class VolumeTypesTemplate(xmlutil.TemplateBuilder):
class VolumeTypesController(object):
- """ The volume types API controller for the Openstack API """
+ """ The volume types API controller for the OpenStack API """
@wsgi.serializers(xml=VolumeTypesTemplate)
def index(self, req):
@@ -144,7 +144,7 @@ class VolumeTypeExtraSpecTemplate(xmlutil.TemplateBuilder):
class VolumeTypeExtraSpecsController(object):
- """ The volume type extra specs API controller for the Openstack API """
+ """ The volume type extra specs API controller for the OpenStack API """
def _get_extra_specs(self, context, vol_type_id):
extra_specs = db.volume_type_extra_specs_get(context, vol_type_id)
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py
index 1e29d23ce..d79692f22 100644
--- a/nova/api/openstack/compute/image_metadata.py
+++ b/nova/api/openstack/compute/image_metadata.py
@@ -28,7 +28,7 @@ FLAGS = flags.FLAGS
class Controller(object):
- """The image metadata API controller for the Openstack API"""
+ """The image metadata API controller for the OpenStack API"""
def __init__(self):
self.image_service = image.get_default_image_service()
diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py
index 94b2ce895..0551323ac 100644
--- a/nova/api/openstack/compute/ips.py
+++ b/nova/api/openstack/compute/ips.py
@@ -59,7 +59,7 @@ class AddressesTemplate(xmlutil.TemplateBuilder):
class Controller(wsgi.Controller):
- """The servers addresses API controller for the Openstack API."""
+ """The servers addresses API controller for the OpenStack API."""
_view_builder_class = view_addresses.ViewBuilder
diff --git a/nova/api/openstack/compute/server_metadata.py b/nova/api/openstack/compute/server_metadata.py
index f70158ec3..bdef6fbf4 100644
--- a/nova/api/openstack/compute/server_metadata.py
+++ b/nova/api/openstack/compute/server_metadata.py
@@ -24,7 +24,7 @@ from nova import exception
class Controller(object):
- """ The server metadata API controller for the Openstack API """
+ """ The server metadata API controller for the OpenStack API """
def __init__(self):
self.compute_api = compute.API()
diff --git a/nova/api/openstack/compute/views/limits.py b/nova/api/openstack/compute/views/limits.py
index f55f451d4..d21ae98a5 100644
--- a/nova/api/openstack/compute/views/limits.py
+++ b/nova/api/openstack/compute/views/limits.py
@@ -21,7 +21,7 @@ from nova import utils
class ViewBuilder(object):
- """Openstack API base limits view builder."""
+ """OpenStack API base limits view builder."""
def build(self, rate_limits, absolute_limits):
rate_limits = self._build_rate_limits(rate_limits)
diff --git a/nova/api/openstack/volume/types.py b/nova/api/openstack/volume/types.py
index 0b55e6ebc..e81f23ef6 100644
--- a/nova/api/openstack/volume/types.py
+++ b/nova/api/openstack/volume/types.py
@@ -49,7 +49,7 @@ class VolumeTypesTemplate(xmlutil.TemplateBuilder):
class VolumeTypesController(object):
- """ The volume types API controller for the Openstack API """
+ """ The volume types API controller for the OpenStack API """
@wsgi.serializers(xml=VolumeTypesTemplate)
def index(self, req):
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index f592a0ee3..26c51d8f4 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -62,7 +62,7 @@ _MEDIA_TYPE_MAP = {
class Request(webob.Request):
- """Add some Openstack API-specific logic to the base webob.Request."""
+ """Add some OpenStack API-specific logic to the base webob.Request."""
def best_match_content_type(self):
"""Determine the requested response content-type."""