Merge "Fix some typos in neutron/db and IBM SDN-VE plugin"

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:

neutron/db/agentschedulers_db.py

@@ -98,7 +98,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

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,

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
 

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
 

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
         '''

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.

neutron/plugins/ibm/sdnve_neutron_plugin.py

@@ -96,7 +96,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])
@@ -445,7 +445,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:
@@ -453,7 +453,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'])