Rename Openstack to OpenStack

Change-Id: I64530a086f591a2f0e33ab734e4241b4c9846820
This commit is contained in:
tanlin 2014-02-13 16:52:11 +08:00
parent a16ebda05c
commit 4956a64ce1
4 changed files with 11 additions and 11 deletions

@ -1,4 +1,4 @@
# Copyright 2013 Openstack Foundation. # Copyright 2013 OpenStack Foundation.
# All Rights Reserved. # All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may

@ -277,7 +277,7 @@ class BaseTestCase(testtools.TestCase,
@classmethod @classmethod
def get_client_manager(cls, interface=None): def get_client_manager(cls, interface=None):
""" """
Returns an Openstack client manager Returns an OpenStack client manager
""" """
cls.isolated_creds = isolated_creds.IsolatedCreds( cls.isolated_creds = isolated_creds.IsolatedCreds(
cls.__name__, network_resources=cls.network_resources) cls.__name__, network_resources=cls.network_resources)

@ -25,12 +25,12 @@ import install_venv_common as install_venv # noqa
def print_help(venv, root): def print_help(venv, root):
help = """ help = """
Openstack development environment setup is complete. OpenStack development environment setup is complete.
Openstack development uses virtualenv to track and manage Python OpenStack development uses virtualenv to track and manage Python
dependencies while in development and testing. dependencies while in development and testing.
To activate the Openstack virtualenv for the extent of your current shell To activate the OpenStack virtualenv for the extent of your current shell
session you can run: session you can run:
$ source %s/bin/activate $ source %s/bin/activate

@ -13,14 +13,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
# This script aims to configure an initial Openstack environment with all the # This script aims to configure an initial OpenStack environment with all the
# necessary configurations for tempest's run using nothing but Openstack's # necessary configurations for tempest's run using nothing but OpenStack's
# native API. # native API.
# That includes, creating users, tenants, registering images (cirros), # That includes, creating users, tenants, registering images (cirros),
# configuring neutron and so on. # configuring neutron and so on.
# #
# ASSUMPTION: this script is run by an admin user as it is meant to configure # ASSUMPTION: this script is run by an admin user as it is meant to configure
# the Openstack environment prior to actual use. # the OpenStack environment prior to actual use.
# Config # Config
import ConfigParser import ConfigParser
@ -32,7 +32,7 @@ import urllib2
import glanceclient as glance_client import glanceclient as glance_client
import keystoneclient.v2_0.client as keystone_client import keystoneclient.v2_0.client as keystone_client
# Import Openstack exceptions # Import OpenStack exceptions
import glanceclient.exc as glance_exception import glanceclient.exc as glance_exception
import keystoneclient.exceptions as keystone_exception import keystoneclient.exceptions as keystone_exception
@ -88,7 +88,7 @@ class ClientManager(object):
def get_image_client(self, version="1", *args, **kwargs): def get_image_client(self, version="1", *args, **kwargs):
""" """
This method returns Openstack glance python client This method returns OpenStack glance python client
:param version: a string representing the version of the glance client :param version: a string representing the version of the glance client
to use. to use.
:param string endpoint: A user-supplied endpoint URL for the glance :param string endpoint: A user-supplied endpoint URL for the glance
@ -333,7 +333,7 @@ def create_images(image_client, config, config_section,
""" """
Creates images for tempest's use and registers the environment variables Creates images for tempest's use and registers the environment variables
IMAGE_ID and IMAGE_ID_ALT with registered images IMAGE_ID and IMAGE_ID_ALT with registered images
:param image_client: Openstack python image client :param image_client: OpenStack python image client
:param config: a ConfigParser object representing the tempest config file :param config: a ConfigParser object representing the tempest config file
:param config_section: the section name where the IMAGE ids are set :param config_section: the section name where the IMAGE ids are set
:param download_url: the URL from which we should download the UEC tar :param download_url: the URL from which we should download the UEC tar