From 5385d06f86a1309176b5f688071e6ea55d91e8e5 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Mon, 12 May 2014 11:05:18 +0800 Subject: [PATCH] Fix some typos in neutron/db and IBM SDN-VE plugin For example, in neutron/db/agents_db.py, db_plugin_base_v2 should be changed to db_base_plugin_v2. There is no bug or blueprint related to this fix. Change-Id: I0d348d92c9c32f172d1e505cf660aed4d064a440 --- neutron/db/agents_db.py | 2 +- neutron/db/agentschedulers_db.py | 2 +- neutron/db/external_net_db.py | 2 +- neutron/db/l3_db.py | 2 +- neutron/db/securitygroups_db.py | 2 +- neutron/plugins/ibm/agent/sdnve_neutron_agent.py | 2 +- neutron/plugins/ibm/sdnve_api.py | 4 ++-- neutron/plugins/ibm/sdnve_neutron_plugin.py | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index bd5e745ad31..02abda02abb 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -71,7 +71,7 @@ class Agent(model_base.BASEV2, models_v2.HasId): class AgentDbMixin(ext_agent.AgentPluginBase): - """Mixin class to add agent extension to db_plugin_base_v2.""" + """Mixin class to add agent extension to db_base_plugin_v2.""" def _get_agent(self, context, id): try: diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index 1e46a94faa8..0e1b6d6b171 100644 --- a/neutron/db/agentschedulers_db.py +++ b/neutron/db/agentschedulers_db.py @@ -97,7 +97,7 @@ class AgentSchedulerDbMixin(agents_db.AgentDbMixin): class DhcpAgentSchedulerDbMixin(dhcpagentscheduler .DhcpAgentSchedulerPluginBase, AgentSchedulerDbMixin): - """Mixin class to add DHCP agent scheduler extension to db_plugin_base_v2. + """Mixin class to add DHCP agent scheduler extension to db_base_plugin_v2. """ network_scheduler = None diff --git a/neutron/db/external_net_db.py b/neutron/db/external_net_db.py index f339e9415bd..53f3895364c 100644 --- a/neutron/db/external_net_db.py +++ b/neutron/db/external_net_db.py @@ -46,7 +46,7 @@ class ExternalNetwork(model_base.BASEV2): class External_net_db_mixin(object): - """Mixin class to add external network methods to db_plugin_base_v2.""" + """Mixin class to add external network methods to db_base_plugin_v2.""" def _network_model_hook(self, context, original_model, query): query = query.outerjoin(ExternalNetwork, diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index beebaee878f..69f133eba64 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -78,7 +78,7 @@ class FloatingIP(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): class L3_NAT_db_mixin(l3.RouterPluginBase): - """Mixin class to add L3/NAT router methods to db_plugin_base_v2.""" + """Mixin class to add L3/NAT router methods to db_base_plugin_v2.""" l3_rpc_notifier = l3_rpc_agent_api.L3AgentNotify diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py index f620d26fbd5..c897071b3ea 100644 --- a/neutron/db/securitygroups_db.py +++ b/neutron/db/securitygroups_db.py @@ -91,7 +91,7 @@ class SecurityGroupRule(model_base.BASEV2, models_v2.HasId, class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase): - """Mixin class to add security group to db_plugin_base_v2.""" + """Mixin class to add security group to db_base_plugin_v2.""" __native_bulk_support = True diff --git a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py index 8b1b21dddba..03b419ceea3 100644 --- a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py +++ b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py @@ -161,7 +161,7 @@ class SdnveNeutronAgent(): Otherwise, creates the bridge if not already existing. :param bridge_name: the name of the integration bridge. :param reset_br: A boolean to rest the bridge if True. - :param out_of_band: A boolean inidicating controller is out of band. + :param out_of_band: A boolean indicating controller is out of band. :param controller_ip: IP address to use as the bridge controller. :returns: the integration bridge ''' diff --git a/neutron/plugins/ibm/sdnve_api.py b/neutron/plugins/ibm/sdnve_api.py index ab918d2c63c..86411612e1c 100644 --- a/neutron/plugins/ibm/sdnve_api.py +++ b/neutron/plugins/ibm/sdnve_api.py @@ -41,7 +41,7 @@ SDNVE_URL = 'https://%s:%s%s' class RequestHandler(object): - '''Handles processeing requests to and responses from controller.''' + '''Handles processing requests to and responses from controller.''' def __init__(self, controller_ips=None, port=None, ssl=None, base_url=None, userid=None, password=None, @@ -53,7 +53,7 @@ class RequestHandler(object): :param port: Username for authentication. :param timeout: Time out for http requests. :param userid: User id for accessing controller. - :param password: Password for accessing the controlelr. + :param password: Password for accessing the controller. :param base_url: The base url for the controller. :param controller_ips: List of controller IP addresses. :param formats: Supported formats. diff --git a/neutron/plugins/ibm/sdnve_neutron_plugin.py b/neutron/plugins/ibm/sdnve_neutron_plugin.py index 6b2178001f5..ecfd9716639 100644 --- a/neutron/plugins/ibm/sdnve_neutron_plugin.py +++ b/neutron/plugins/ibm/sdnve_neutron_plugin.py @@ -95,7 +95,7 @@ def _ha(func): When a controller is detected to be not responding, and a new controller is chosen to be used in its place, this decorator makes sure the existing integration bridges are set to point - to the new controleer by calling the set_controller method. + to the new controller by calling the set_controller method. ''' ret_func = func(self, *args, **kwargs) self.set_controller(args[0]) @@ -444,7 +444,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2, router['router']['admin_state_up'] = True tenant_id = self._get_tenant_id_for_create(context, router['router']) - # Create a new Pinnaacles tenant if need be + # Create a new SDN-VE tenant if need be sdnve_tenant = self.sdnve_client.sdnve_check_and_create_tenant( tenant_id) if sdnve_tenant is None: @@ -452,7 +452,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2, msg=_('Create router failed: no SDN-VE tenant.')) new_router = super(SdnvePluginV2, self).create_router(context, router) - # Create Sdnve router + # Create SDN-VE router (res, data) = self.sdnve_client.sdnve_create('router', new_router) if res not in constants.HTTP_ACCEPTABLE: super(SdnvePluginV2, self).delete_router(context, new_router['id'])