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
This commit is contained in:
parent
d64b09617f
commit
6f18654a0f
@ -71,7 +71,7 @@ class Agent(model_base.BASEV2, models_v2.HasId):
|
|||||||
|
|
||||||
|
|
||||||
class AgentDbMixin(ext_agent.AgentPluginBase):
|
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):
|
def _get_agent(self, context, id):
|
||||||
try:
|
try:
|
||||||
|
@ -97,7 +97,7 @@ class AgentSchedulerDbMixin(agents_db.AgentDbMixin):
|
|||||||
class DhcpAgentSchedulerDbMixin(dhcpagentscheduler
|
class DhcpAgentSchedulerDbMixin(dhcpagentscheduler
|
||||||
.DhcpAgentSchedulerPluginBase,
|
.DhcpAgentSchedulerPluginBase,
|
||||||
AgentSchedulerDbMixin):
|
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
|
network_scheduler = None
|
||||||
|
@ -46,7 +46,7 @@ class ExternalNetwork(model_base.BASEV2):
|
|||||||
|
|
||||||
|
|
||||||
class External_net_db_mixin(object):
|
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):
|
def _network_model_hook(self, context, original_model, query):
|
||||||
query = query.outerjoin(ExternalNetwork,
|
query = query.outerjoin(ExternalNetwork,
|
||||||
|
@ -78,7 +78,7 @@ class FloatingIP(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
|
|||||||
|
|
||||||
|
|
||||||
class L3_NAT_db_mixin(l3.RouterPluginBase):
|
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
|
l3_rpc_notifier = l3_rpc_agent_api.L3AgentNotify
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ class SecurityGroupRule(model_base.BASEV2, models_v2.HasId,
|
|||||||
|
|
||||||
|
|
||||||
class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
|
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
|
__native_bulk_support = True
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ class SdnveNeutronAgent():
|
|||||||
Otherwise, creates the bridge if not already existing.
|
Otherwise, creates the bridge if not already existing.
|
||||||
:param bridge_name: the name of the integration bridge.
|
:param bridge_name: the name of the integration bridge.
|
||||||
:param reset_br: A boolean to rest the bridge if True.
|
: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.
|
:param controller_ip: IP address to use as the bridge controller.
|
||||||
:returns: the integration bridge
|
:returns: the integration bridge
|
||||||
'''
|
'''
|
||||||
|
@ -41,7 +41,7 @@ SDNVE_URL = 'https://%s:%s%s'
|
|||||||
|
|
||||||
|
|
||||||
class RequestHandler(object):
|
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,
|
def __init__(self, controller_ips=None, port=None, ssl=None,
|
||||||
base_url=None, userid=None, password=None,
|
base_url=None, userid=None, password=None,
|
||||||
@ -53,7 +53,7 @@ class RequestHandler(object):
|
|||||||
:param port: Username for authentication.
|
:param port: Username for authentication.
|
||||||
:param timeout: Time out for http requests.
|
:param timeout: Time out for http requests.
|
||||||
:param userid: User id for accessing controller.
|
: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 base_url: The base url for the controller.
|
||||||
:param controller_ips: List of controller IP addresses.
|
:param controller_ips: List of controller IP addresses.
|
||||||
:param formats: Supported formats.
|
:param formats: Supported formats.
|
||||||
|
@ -95,7 +95,7 @@ def _ha(func):
|
|||||||
When a controller is detected to be not responding, and a
|
When a controller is detected to be not responding, and a
|
||||||
new controller is chosen to be used in its place, this decorator
|
new controller is chosen to be used in its place, this decorator
|
||||||
makes sure the existing integration bridges are set to point
|
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)
|
ret_func = func(self, *args, **kwargs)
|
||||||
self.set_controller(args[0])
|
self.set_controller(args[0])
|
||||||
@ -444,7 +444,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
router['router']['admin_state_up'] = True
|
router['router']['admin_state_up'] = True
|
||||||
|
|
||||||
tenant_id = self._get_tenant_id_for_create(context, router['router'])
|
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(
|
sdnve_tenant = self.sdnve_client.sdnve_check_and_create_tenant(
|
||||||
tenant_id)
|
tenant_id)
|
||||||
if sdnve_tenant is None:
|
if sdnve_tenant is None:
|
||||||
@ -452,7 +452,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
msg=_('Create router failed: no SDN-VE tenant.'))
|
msg=_('Create router failed: no SDN-VE tenant.'))
|
||||||
|
|
||||||
new_router = super(SdnvePluginV2, self).create_router(context, router)
|
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)
|
(res, data) = self.sdnve_client.sdnve_create('router', new_router)
|
||||||
if res not in constants.HTTP_ACCEPTABLE:
|
if res not in constants.HTTP_ACCEPTABLE:
|
||||||
super(SdnvePluginV2, self).delete_router(context, new_router['id'])
|
super(SdnvePluginV2, self).delete_router(context, new_router['id'])
|
||||||
|
Loading…
Reference in New Issue
Block a user