Fix misspells
Change-Id: I8be38727ca55ebbead9032cf69f10a1006fd004b Closes-bug:1257424
This commit is contained in:
parent
0b2d56cda7
commit
88148584f2
@ -36,7 +36,7 @@ trc.util = new Object();
|
|||||||
trc.util.browser = {
|
trc.util.browser = {
|
||||||
//
|
//
|
||||||
// Returns the current version of IE, or -1 if it's not an IE
|
// Returns the current version of IE, or -1 if it's not an IE
|
||||||
// browser. This is one of the recomended ways of detecting IE
|
// browser. This is one of the recommended ways of detecting IE
|
||||||
// see:
|
// see:
|
||||||
//
|
//
|
||||||
// http://msdn.microsoft.com/en-us/library/ms537509%28VS.85%29.aspx
|
// http://msdn.microsoft.com/en-us/library/ms537509%28VS.85%29.aspx
|
||||||
@ -174,7 +174,7 @@ trc.util.dom = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
//
|
//
|
||||||
// Dum utility function for setting the class name of an
|
// Dumb utility function for setting the class name of an
|
||||||
// element. Eventually we'll move completely to XHTML, but
|
// element. Eventually we'll move completely to XHTML, but
|
||||||
// this will never work in IE 6, so for now we need this
|
// this will never work in IE 6, so for now we need this
|
||||||
// method for setting the class name.
|
// method for setting the class name.
|
||||||
|
@ -14,10 +14,10 @@
|
|||||||
|
|
||||||
<!-- Include/Redefine core schema -->
|
<!-- Include/Redefine core schema -->
|
||||||
<include vc:minVersion="1.0" vc:maxVersion="1.1" schemaLocation="../../api.xsd"/>
|
<include vc:minVersion="1.0" vc:maxVersion="1.1" schemaLocation="../../api.xsd"/>
|
||||||
<!--
|
<!--
|
||||||
For the purposes of extending the schema api.xsd should be a flat XSD. This is, it should not have
|
For the purposes of extending the schema api.xsd should be a flat XSD. This is, it should not have
|
||||||
any <include ..> elements. That's no the case today. We should generate a flat XSD at compile time
|
any <include ..> elements. That's no the case today. We should generate a flat XSD at compile time
|
||||||
and refernce it here.
|
and reference it here.
|
||||||
-->
|
-->
|
||||||
<redefine vc:minVersion="1.1" schemaLocation="../../api.xsd">
|
<redefine vc:minVersion="1.1" schemaLocation="../../api.xsd">
|
||||||
<complexType name="Image">
|
<complexType name="Image">
|
||||||
|
@ -150,7 +150,7 @@
|
|||||||
</xsd:appinfo>
|
</xsd:appinfo>
|
||||||
</annotation>
|
</annotation>
|
||||||
</element>
|
</element>
|
||||||
|
|
||||||
<element name="network" type="csapi:AddressList">
|
<element name="network" type="csapi:AddressList">
|
||||||
<annotation>
|
<annotation>
|
||||||
<xsd:documentation
|
<xsd:documentation
|
||||||
@ -194,7 +194,7 @@
|
|||||||
</xsd:appinfo>
|
</xsd:appinfo>
|
||||||
</annotation>
|
</annotation>
|
||||||
</element>
|
</element>
|
||||||
|
|
||||||
|
|
||||||
<!-- Complex Types -->
|
<!-- Complex Types -->
|
||||||
<complexType name="Server">
|
<complexType name="Server">
|
||||||
@ -315,7 +315,7 @@
|
|||||||
xml:lang="EN"
|
xml:lang="EN"
|
||||||
xmlns="http://www.w3.org/1999/xhtml">
|
xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<p>
|
<p>
|
||||||
The detials of a fault that may have occured
|
The details of a fault that may have occurred
|
||||||
while cerating the server or performing a server
|
while cerating the server or performing a server
|
||||||
action.
|
action.
|
||||||
</p>
|
</p>
|
||||||
|
@ -9,7 +9,7 @@ l3_plugin_list= 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSN
|
|||||||
default_flavor = 'openvswitch'
|
default_flavor = 'openvswitch'
|
||||||
default_l3_flavor = 'openvswitch'
|
default_l3_flavor = 'openvswitch'
|
||||||
|
|
||||||
# supported extentions
|
# supported extensions
|
||||||
supported_extension_aliases = 'providernet'
|
supported_extension_aliases = 'providernet'
|
||||||
# specific method map for each flavor to extensions
|
# specific method map for each flavor to extensions
|
||||||
extension_map = 'get_port_stats:nvp'
|
extension_map = 'get_port_stats:nvp'
|
||||||
|
@ -632,7 +632,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
|
|||||||
"""Deal with routers modification and creation RPC message."""
|
"""Deal with routers modification and creation RPC message."""
|
||||||
LOG.debug(_('Got routers updated notification :%s'), routers)
|
LOG.debug(_('Got routers updated notification :%s'), routers)
|
||||||
if routers:
|
if routers:
|
||||||
# This is needed for backward compatiblity
|
# This is needed for backward compatibility
|
||||||
if isinstance(routers[0], dict):
|
if isinstance(routers[0], dict):
|
||||||
routers = [router['id'] for router in routers]
|
routers = [router['id'] for router in routers]
|
||||||
self.updated_routers.update(routers)
|
self.updated_routers.update(routers)
|
||||||
|
@ -180,7 +180,7 @@ class AsyncProcess(object):
|
|||||||
if not callback():
|
if not callback():
|
||||||
break
|
break
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.exception(_('An error occured while communicating '
|
LOG.exception(_('An error occurred while communicating '
|
||||||
'with async process [%s].'), self.cmd)
|
'with async process [%s].'), self.cmd)
|
||||||
break
|
break
|
||||||
# Ensure that watching a process with lots of output does
|
# Ensure that watching a process with lots of output does
|
||||||
|
@ -559,7 +559,7 @@ class IptablesManager(object):
|
|||||||
# Leave it alone
|
# Leave it alone
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# We filter duplicates. Go throught the chains and rules, letting
|
# We filter duplicates. Go through the chains and rules, letting
|
||||||
# the *last* occurrence take precendence since it could have a
|
# the *last* occurrence take precendence since it could have a
|
||||||
# non-zero [packet:byte] count we want to preserve. We also filter
|
# non-zero [packet:byte] count we want to preserve. We also filter
|
||||||
# out anything in the "remove" list.
|
# out anything in the "remove" list.
|
||||||
|
@ -91,7 +91,7 @@ class SimpleInterfaceMonitor(OvsdbMonitor):
|
|||||||
|
|
||||||
True will be returned if the monitor process is not active.
|
True will be returned if the monitor process is not active.
|
||||||
This 'failing open' minimizes the risk of falsely indicating
|
This 'failing open' minimizes the risk of falsely indicating
|
||||||
the absense of updates at the expense of potential false
|
the absence of updates at the expense of potential false
|
||||||
positives.
|
positives.
|
||||||
"""
|
"""
|
||||||
return bool(list(self.iter_stdout())) or not self.is_active
|
return bool(list(self.iter_stdout())) or not self.is_active
|
||||||
|
@ -46,7 +46,7 @@ class PluginInterface(object):
|
|||||||
"""Checking plugin class.
|
"""Checking plugin class.
|
||||||
|
|
||||||
The __subclasshook__ method is a class method
|
The __subclasshook__ method is a class method
|
||||||
that will be called everytime a class is tested
|
that will be called every time a class is tested
|
||||||
using issubclass(klass, PluginInterface).
|
using issubclass(klass, PluginInterface).
|
||||||
In that case, it will check that every method
|
In that case, it will check that every method
|
||||||
marked with the abstractmethod decorator is
|
marked with the abstractmethod decorator is
|
||||||
@ -667,7 +667,7 @@ class ResourceExtension(object):
|
|||||||
self.attr_map = attr_map
|
self.attr_map = attr_map
|
||||||
|
|
||||||
|
|
||||||
# Returns the extention paths from a config entry and the __path__
|
# Returns the extension paths from a config entry and the __path__
|
||||||
# of neutron.extensions
|
# of neutron.extensions
|
||||||
def get_extensions_path():
|
def get_extensions_path():
|
||||||
paths = ':'.join(neutron.extensions.__path__)
|
paths = ':'.join(neutron.extensions.__path__)
|
||||||
|
@ -546,7 +546,7 @@ SUBNETS = '%ss' % SUBNET
|
|||||||
# attribute is not required, but will be generated by the plugin
|
# attribute is not required, but will be generated by the plugin
|
||||||
# if it is not specified. Particularly, a value of ATTR_NOT_SPECIFIED
|
# if it is not specified. Particularly, a value of ATTR_NOT_SPECIFIED
|
||||||
# is different from an attribute that has been specified with a value of
|
# is different from an attribute that has been specified with a value of
|
||||||
# None. For example, if 'gateway_ip' is ommitted in a request to
|
# None. For example, if 'gateway_ip' is omitted in a request to
|
||||||
# create a subnet, the plugin will receive ATTR_NOT_SPECIFIED
|
# create a subnet, the plugin will receive ATTR_NOT_SPECIFIED
|
||||||
# and the default gateway_ip will be generated.
|
# and the default gateway_ip will be generated.
|
||||||
# However, if gateway_ip is specified as None, this means that
|
# However, if gateway_ip is specified as None, this means that
|
||||||
|
@ -114,7 +114,7 @@ def Resource(controller, faults=None, deserializers=None, serializers=None):
|
|||||||
kwargs = {'body': body, 'content_type': content_type}
|
kwargs = {'body': body, 'content_type': content_type}
|
||||||
raise webob.exc.HTTPNotImplemented(**kwargs)
|
raise webob.exc.HTTPNotImplemented(**kwargs)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
# NOTE(jkoelker) Everyting else is 500
|
# NOTE(jkoelker) Everything else is 500
|
||||||
LOG.exception(_('%s failed'), action)
|
LOG.exception(_('%s failed'), action)
|
||||||
# Do not expose details of 500 error to clients.
|
# Do not expose details of 500 error to clients.
|
||||||
msg = _('Request Failed: internal server error while '
|
msg = _('Request Failed: internal server error while '
|
||||||
|
@ -233,7 +233,7 @@ class PreexistingDeviceFailure(NeutronException):
|
|||||||
|
|
||||||
|
|
||||||
class SudoRequired(NeutronException):
|
class SudoRequired(NeutronException):
|
||||||
message = _("Sudo priviledge is required to run this command.")
|
message = _("Sudo privilege is required to run this command.")
|
||||||
|
|
||||||
|
|
||||||
class QuotaResourceUnknown(NotFound):
|
class QuotaResourceUnknown(NotFound):
|
||||||
|
@ -944,7 +944,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
|||||||
context.session.commit()
|
context.session.commit()
|
||||||
except Exception:
|
except Exception:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
LOG.error(_("An exception occured while creating "
|
LOG.error(_("An exception occurred while creating "
|
||||||
"the %(resource)s:%(item)s"),
|
"the %(resource)s:%(item)s"),
|
||||||
{'resource': resource, 'item': item})
|
{'resource': resource, 'item': item})
|
||||||
context.session.rollback()
|
context.session.rollback()
|
||||||
|
@ -746,7 +746,7 @@ class LoadBalancerPluginDb(LoadBalancerPluginBase,
|
|||||||
v = health_monitor['health_monitor']
|
v = health_monitor['health_monitor']
|
||||||
tenant_id = self._get_tenant_id_for_create(context, v)
|
tenant_id = self._get_tenant_id_for_create(context, v)
|
||||||
with context.session.begin(subtransactions=True):
|
with context.session.begin(subtransactions=True):
|
||||||
# setting ACTIVE status sinse healthmon is shared DB object
|
# setting ACTIVE status since healthmon is shared DB object
|
||||||
monitor_db = HealthMonitor(id=uuidutils.generate_uuid(),
|
monitor_db = HealthMonitor(id=uuidutils.generate_uuid(),
|
||||||
tenant_id=tenant_id,
|
tenant_id=tenant_id,
|
||||||
type=v['type'],
|
type=v['type'],
|
||||||
|
@ -449,7 +449,7 @@ class NeutronRestProxyV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
neutron_extensions.append_api_extensions_path(extensions.__path__)
|
neutron_extensions.append_api_extensions_path(extensions.__path__)
|
||||||
|
|
||||||
# 'servers' is the list of network controller REST end-points
|
# 'servers' is the list of network controller REST end-points
|
||||||
# (used in order specified till one suceeds, and it is sticky
|
# (used in order specified till one succeeds, and it is sticky
|
||||||
# till next failure). Use 'server_auth' to encode api-key
|
# till next failure). Use 'server_auth' to encode api-key
|
||||||
servers = cfg.CONF.RESTPROXY.servers
|
servers = cfg.CONF.RESTPROXY.servers
|
||||||
server_auth = cfg.CONF.RESTPROXY.server_auth
|
server_auth = cfg.CONF.RESTPROXY.server_auth
|
||||||
|
@ -192,7 +192,7 @@ class VSMConnectionFailed(exceptions.ServiceUnavailable):
|
|||||||
|
|
||||||
|
|
||||||
class VSMError(exceptions.NeutronException):
|
class VSMError(exceptions.NeutronException):
|
||||||
"""Error has occured on the VSM."""
|
"""Error has occurred on the VSM."""
|
||||||
message = _("Internal VSM Error: %(reason)s.")
|
message = _("Internal VSM Error: %(reason)s.")
|
||||||
|
|
||||||
|
|
||||||
|
@ -338,7 +338,7 @@ def get_segment_range(network_profile):
|
|||||||
|
|
||||||
def get_multicast_ip(network_profile):
|
def get_multicast_ip(network_profile):
|
||||||
"""
|
"""
|
||||||
Retreive a multicast ip from the defined pool.
|
Retrieve a multicast ip from the defined pool.
|
||||||
|
|
||||||
:params network_profile: object of type network profile
|
:params network_profile: object of type network profile
|
||||||
:returns: string representing multicast IP
|
:returns: string representing multicast IP
|
||||||
|
@ -178,7 +178,7 @@ class L2DevicePluginBase(object):
|
|||||||
"""Check plugin class.
|
"""Check plugin class.
|
||||||
|
|
||||||
The __subclasshook__ method is a class method
|
The __subclasshook__ method is a class method
|
||||||
that will be called everytime a class is tested
|
that will be called every time a class is tested
|
||||||
using issubclass(klass, Plugin).
|
using issubclass(klass, Plugin).
|
||||||
In that case, it will check that every method
|
In that case, it will check that every method
|
||||||
marked with the abstractmethod decorator is
|
marked with the abstractmethod decorator is
|
||||||
|
@ -99,7 +99,7 @@ class Client(object):
|
|||||||
Hence for every unique combination of a network and a policy-profile, a
|
Hence for every unique combination of a network and a policy-profile, a
|
||||||
unique vm-network will be created and a reference to the port will be
|
unique vm-network will be created and a reference to the port will be
|
||||||
added. If the same combination of network and policy-profile is used by
|
added. If the same combination of network and policy-profile is used by
|
||||||
another port, the refernce to that port will be added to the same
|
another port, the references to that port will be added to the same
|
||||||
vm-network.
|
vm-network.
|
||||||
|
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
"""
|
"""
|
||||||
Setup Cisco Nexus 1000V related parameters and pull policy profiles.
|
Setup Cisco Nexus 1000V related parameters and pull policy profiles.
|
||||||
|
|
||||||
Retreive all the policy profiles from the VSM when the plugin is
|
Retrieve all the policy profiles from the VSM when the plugin is
|
||||||
is instantiated for the first time and then continue to poll for
|
is instantiated for the first time and then continue to poll for
|
||||||
policy profile updates.
|
policy profile updates.
|
||||||
"""
|
"""
|
||||||
@ -973,7 +973,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
|
|
||||||
def _get_segmentation_id(self, context, id):
|
def _get_segmentation_id(self, context, id):
|
||||||
"""
|
"""
|
||||||
Retreive segmentation ID for a given network.
|
Retrieve segmentation ID for a given network.
|
||||||
|
|
||||||
:param context: neutron api request context
|
:param context: neutron api request context
|
||||||
:param id: UUID of the network
|
:param id: UUID of the network
|
||||||
@ -1169,7 +1169,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
|
|
||||||
def get_network(self, context, id, fields=None):
|
def get_network(self, context, id, fields=None):
|
||||||
"""
|
"""
|
||||||
Retreive a Network.
|
Retrieve a Network.
|
||||||
|
|
||||||
:param context: neutron api request context
|
:param context: neutron api request context
|
||||||
:param id: UUID representing the network to fetch
|
:param id: UUID representing the network to fetch
|
||||||
@ -1184,7 +1184,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
|
|
||||||
def get_networks(self, context, filters=None, fields=None):
|
def get_networks(self, context, filters=None, fields=None):
|
||||||
"""
|
"""
|
||||||
Retreive a list of networks.
|
Retrieve a list of networks.
|
||||||
|
|
||||||
:param context: neutron api request context
|
:param context: neutron api request context
|
||||||
:param filters: a dictionary with keys that are valid keys for a
|
:param filters: a dictionary with keys that are valid keys for a
|
||||||
|
@ -132,7 +132,7 @@ class LinuxBridgeManager:
|
|||||||
if 0 <= int(segmentation_id) <= constants.MAX_VXLAN_VNI:
|
if 0 <= int(segmentation_id) <= constants.MAX_VXLAN_VNI:
|
||||||
return VXLAN_INTERFACE_PREFIX + str(segmentation_id)
|
return VXLAN_INTERFACE_PREFIX + str(segmentation_id)
|
||||||
else:
|
else:
|
||||||
LOG.warning(_("Invalid Segementation ID: %s, will lead to "
|
LOG.warning(_("Invalid Segmentation ID: %s, will lead to "
|
||||||
"incorrect vxlan device name"), segmentation_id)
|
"incorrect vxlan device name"), segmentation_id)
|
||||||
|
|
||||||
def get_all_neutron_bridges(self):
|
def get_all_neutron_bridges(self):
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
This plugin supports multiple plugin at same time. This plugin is for L3 connectivility
|
This plugin supports multiple plugin at same time. This plugin is for L3 connectivility
|
||||||
between networks which are realized by different plugins.This plugin adds new attributes 'flavor:network' and 'flavor:router".
|
between networks which are realized by different plugins.This plugin adds new attributes 'flavor:network' and 'flavor:router".
|
||||||
flavor:network corresponds to specific l2 plugin ( flavor-plugin mapping could be configureable by plugin_list config.
|
flavor:network corresponds to specific l2 plugin ( flavor-plugin mapping could be configurable by plugin_list config.
|
||||||
flavor:router corresponds to specific l3 plugin ( flavor-plugin mapping could be configureable by l3_plugin_list config. Note that Metaplugin can provide l3 functionaliteis for l2 plugin which didn't support l3 extension yet.
|
flavor:router corresponds to specific l3 plugin ( flavor-plugin mapping could be configurable by l3_plugin_list config. Note that Metaplugin can provide l3 functionaliteis for l2 plugin which didn't support l3 extension yet.
|
||||||
This plugin also support extensions. We can map extension to plugin by using extension_map config.
|
This plugin also support extensions. We can map extension to plugin by using extension_map config.
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
@ -32,7 +32,7 @@ default_flavor = 'openvswitch'
|
|||||||
# Default value for l3
|
# Default value for l3
|
||||||
default_l3_flavor = 'openvswitch'
|
default_l3_flavor = 'openvswitch'
|
||||||
|
|
||||||
# supported extentions
|
# supported extensions
|
||||||
supported_extension_aliases = 'providernet'
|
supported_extension_aliases = 'providernet'
|
||||||
# specific method map for each flavor to extensions
|
# specific method map for each flavor to extensions
|
||||||
extension_map = 'get_port_stats:nvp'
|
extension_map = 'get_port_stats:nvp'
|
||||||
@ -76,7 +76,7 @@ Vlan ID range of each plugin should be different, since Metaplugin dose not mana
|
|||||||
#- limitations
|
#- limitations
|
||||||
|
|
||||||
Basically, All plugin should inherit NeutronDbPluginV2.
|
Basically, All plugin should inherit NeutronDbPluginV2.
|
||||||
Metaplugin assumes all plugin share same Database expecially for IPAM part in NeutronV2 API.
|
Metaplugin assumes all plugin share same Database especially for IPAM part in NeutronV2 API.
|
||||||
You can use another plugin if you use ProxyPluginV2, which proxies request to the another neutron server.
|
You can use another plugin if you use ProxyPluginV2, which proxies request to the another neutron server.
|
||||||
|
|
||||||
Example flavor configration for ProxyPluginV2
|
Example flavor configration for ProxyPluginV2
|
||||||
|
@ -1045,7 +1045,7 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
|
|||||||
return info
|
return info
|
||||||
|
|
||||||
def update_floatingip(self, context, id, floatingip):
|
def update_floatingip(self, context, id, floatingip):
|
||||||
"""Handle floating IP assocation and disassociation."""
|
"""Handle floating IP association and disassociation."""
|
||||||
LOG.debug(_("MidonetPluginV2.update_floatingip called: id=%(id)s "
|
LOG.debug(_("MidonetPluginV2.update_floatingip called: id=%(id)s "
|
||||||
"floatingip=%(floatingip)s "),
|
"floatingip=%(floatingip)s "),
|
||||||
{'id': id, 'floatingip': floatingip})
|
{'id': id, 'floatingip': floatingip})
|
||||||
|
@ -3,7 +3,7 @@ Arista Neutron ML2 Mechanism Driver
|
|||||||
|
|
||||||
This mechanism driver implements ML2 Driver API and is used to manage the virtual and physical networks using Arista Hardware.
|
This mechanism driver implements ML2 Driver API and is used to manage the virtual and physical networks using Arista Hardware.
|
||||||
|
|
||||||
Note: Initial verison of this driver support VLANs only.
|
Note: Initial version of this driver support VLANs only.
|
||||||
|
|
||||||
For more details on use please refer to:
|
For more details on use please refer to:
|
||||||
https://wiki.openstack.org/wiki/Arista-neutron-ml2-driver
|
https://wiki.openstack.org/wiki/Arista-neutron-ml2-driver
|
||||||
|
@ -128,7 +128,7 @@ def num_provisioned_tenants():
|
|||||||
|
|
||||||
|
|
||||||
def remember_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
def remember_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
||||||
"""Stores all relevent information about a VM in repository.
|
"""Stores all relevant information about a VM in repository.
|
||||||
|
|
||||||
:param vm_id: globally unique identifier for VM instance
|
:param vm_id: globally unique identifier for VM instance
|
||||||
:param host_id: ID of the host where the VM is placed
|
:param host_id: ID of the host where the VM is placed
|
||||||
@ -154,7 +154,7 @@ def remember_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
|||||||
|
|
||||||
|
|
||||||
def forget_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
def forget_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
||||||
"""Removes all relevent information about a VM from repository.
|
"""Removes all relevant information about a VM from repository.
|
||||||
|
|
||||||
:param vm_id: globally unique identifier for VM instance
|
:param vm_id: globally unique identifier for VM instance
|
||||||
:param host_id: ID of the host where the VM is placed
|
:param host_id: ID of the host where the VM is placed
|
||||||
@ -171,7 +171,7 @@ def forget_vm(vm_id, host_id, port_id, network_id, tenant_id):
|
|||||||
|
|
||||||
|
|
||||||
def remember_network(tenant_id, network_id, segmentation_id):
|
def remember_network(tenant_id, network_id, segmentation_id):
|
||||||
"""Stores all relevent information about a Network in repository.
|
"""Stores all relevant information about a Network in repository.
|
||||||
|
|
||||||
:param tenant_id: globally unique neutron tenant identifier
|
:param tenant_id: globally unique neutron tenant identifier
|
||||||
:param network_id: globally unique neutron network identifier
|
:param network_id: globally unique neutron network identifier
|
||||||
@ -192,7 +192,7 @@ def remember_network(tenant_id, network_id, segmentation_id):
|
|||||||
|
|
||||||
|
|
||||||
def forget_network(tenant_id, network_id):
|
def forget_network(tenant_id, network_id):
|
||||||
"""Deletes all relevent information about a Network from repository.
|
"""Deletes all relevant information about a Network from repository.
|
||||||
|
|
||||||
:param tenant_id: globally unique neutron tenant identifier
|
:param tenant_id: globally unique neutron tenant identifier
|
||||||
:param network_id: globally unique neutron network identifier
|
:param network_id: globally unique neutron network identifier
|
||||||
|
@ -359,7 +359,7 @@ class MechanismManager(stevedore.named.NamedExtensionManager):
|
|||||||
if any mechanism driver create_port_postcommit call fails.
|
if any mechanism driver create_port_postcommit call fails.
|
||||||
|
|
||||||
Called after the database transaction. Errors raised by
|
Called after the database transaction. Errors raised by
|
||||||
mechanism drivers are left to propogate to the caller, where
|
mechanism drivers are left to propagate to the caller, where
|
||||||
the port will be deleted, triggering any required
|
the port will be deleted, triggering any required
|
||||||
cleanup. There is no guarantee that all mechanism drivers are
|
cleanup. There is no guarantee that all mechanism drivers are
|
||||||
called in this case.
|
called in this case.
|
||||||
|
@ -412,7 +412,7 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
|
|||||||
network_bindings, max_ports,
|
network_bindings, max_ports,
|
||||||
allow_extra_lswitches)
|
allow_extra_lswitches)
|
||||||
except NvpApiClient.NvpApiException:
|
except NvpApiClient.NvpApiException:
|
||||||
err_desc = _("An exception occured while selecting logical "
|
err_desc = _("An exception occurred while selecting logical "
|
||||||
"switch for the port")
|
"switch for the port")
|
||||||
LOG.exception(err_desc)
|
LOG.exception(err_desc)
|
||||||
raise nvp_exc.NvpPluginException(err_msg=err_desc)
|
raise nvp_exc.NvpPluginException(err_msg=err_desc)
|
||||||
@ -443,7 +443,7 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
|
|||||||
# rollback the neutron-nvp port mapping
|
# rollback the neutron-nvp port mapping
|
||||||
nicira_db.delete_neutron_nvp_port_mapping(context.session,
|
nicira_db.delete_neutron_nvp_port_mapping(context.session,
|
||||||
port_id)
|
port_id)
|
||||||
msg = (_("An exception occured while creating the "
|
msg = (_("An exception occurred while creating the "
|
||||||
"quantum port %s on the NVP plaform") % port_id)
|
"quantum port %s on the NVP plaform") % port_id)
|
||||||
LOG.exception(msg)
|
LOG.exception(msg)
|
||||||
|
|
||||||
|
@ -413,7 +413,7 @@ class NvpAdvancedPlugin(sr_db.ServiceRouter_mixin,
|
|||||||
self.cluster, lswitch['uuid'], tenant_id,
|
self.cluster, lswitch['uuid'], tenant_id,
|
||||||
'', '', lrouter['uuid'], True)
|
'', '', lrouter['uuid'], True)
|
||||||
except NvpApiClient.NvpApiException:
|
except NvpApiClient.NvpApiException:
|
||||||
msg = (_("An exception occured while creating a port "
|
msg = (_("An exception occurred while creating a port "
|
||||||
"on lswitch %s") % lswitch['uuid'])
|
"on lswitch %s") % lswitch['uuid'])
|
||||||
LOG.exception(msg)
|
LOG.exception(msg)
|
||||||
raise q_exc.NeutronException(message=msg)
|
raise q_exc.NeutronException(message=msg)
|
||||||
|
@ -96,10 +96,10 @@ class NVPApiHelper(client_eventlet.NvpApiClientEventlet):
|
|||||||
Assumes same password is used for all controllers.
|
Assumes same password is used for all controllers.
|
||||||
|
|
||||||
:param user: NVP controller user (usually admin). Provided for
|
:param user: NVP controller user (usually admin). Provided for
|
||||||
backwards compatability. In the normal mode of operation
|
backwards compatibility. In the normal mode of operation
|
||||||
this should be None.
|
this should be None.
|
||||||
:param password: NVP controller password. Provided for backwards
|
:param password: NVP controller password. Provided for backwards
|
||||||
compatability. In the normal mode of operation this should
|
compatibility. In the normal mode of operation this should
|
||||||
be None.
|
be None.
|
||||||
|
|
||||||
:returns: Does not return a value.
|
:returns: Does not return a value.
|
||||||
|
@ -205,7 +205,7 @@ class NvpApiClient(object):
|
|||||||
provider_sem.release()
|
provider_sem.release()
|
||||||
else:
|
else:
|
||||||
LOG.debug(_("Waiting for auth to complete"))
|
LOG.debug(_("Waiting for auth to complete"))
|
||||||
# Wait until we can aquire then release
|
# Wait until we can acquire then release
|
||||||
provider_sem.acquire(blocking=True)
|
provider_sem.acquire(blocking=True)
|
||||||
provider_sem.release()
|
provider_sem.release()
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ class NvpApiClientEventlet(client.NvpApiClient):
|
|||||||
# self._concurrent_connections temporarily)
|
# self._concurrent_connections temporarily)
|
||||||
if not result_conn:
|
if not result_conn:
|
||||||
conn = self._create_connection(*conn_params)
|
conn = self._create_connection(*conn_params)
|
||||||
conn.priority = 0 # redirect connections ahve highest priority
|
conn.priority = 0 # redirect connections have highest priority
|
||||||
conn.no_release = True
|
conn.no_release = True
|
||||||
result_conn = conn
|
result_conn = conn
|
||||||
else:
|
else:
|
||||||
|
@ -545,7 +545,7 @@ class NvpSynchronizer():
|
|||||||
sleep_interval = self._sync_backoff
|
sleep_interval = self._sync_backoff
|
||||||
# Cap max back off to 64 seconds
|
# Cap max back off to 64 seconds
|
||||||
self._sync_backoff = min(self._sync_backoff * 2, 64)
|
self._sync_backoff = min(self._sync_backoff * 2, 64)
|
||||||
LOG.exception(_("An error occured while communicating with "
|
LOG.exception(_("An error occurred while communicating with "
|
||||||
"NVP backend. Will retry synchronization "
|
"NVP backend. Will retry synchronization "
|
||||||
"in %d seconds"), sleep_interval)
|
"in %d seconds"), sleep_interval)
|
||||||
return sleep_interval
|
return sleep_interval
|
||||||
|
@ -392,9 +392,9 @@ def add_tunnel_endpoint(ip, max_retries=10):
|
|||||||
|
|
||||||
return tunnel
|
return tunnel
|
||||||
except db_exc.DBDuplicateEntry:
|
except db_exc.DBDuplicateEntry:
|
||||||
# a concurrent transaction has been commited, try again
|
# a concurrent transaction has been committed, try again
|
||||||
LOG.debug(_('Adding a tunnel endpoint failed due to a concurrent'
|
LOG.debug(_('Adding a tunnel endpoint failed due to a concurrent'
|
||||||
'transaction had been commited (%s attempts left)'),
|
'transaction had been committed (%s attempts left)'),
|
||||||
max_retries - (i + 1))
|
max_retries - (i + 1))
|
||||||
|
|
||||||
raise q_exc.NeutronException(
|
raise q_exc.NeutronException(
|
||||||
|
@ -52,7 +52,7 @@ class LoadBalancerAbstractDriver(object):
|
|||||||
def delete_vip(self, context, vip):
|
def delete_vip(self, context, vip):
|
||||||
"""A real driver would invoke a call to his backend
|
"""A real driver would invoke a call to his backend
|
||||||
and try to delete the Vip.
|
and try to delete the Vip.
|
||||||
if the deletion was successfull, delete the record from the database.
|
if the deletion was successful, delete the record from the database.
|
||||||
if the deletion has failed, set the Vip status to ERROR.
|
if the deletion has failed, set the Vip status to ERROR.
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
@ -402,7 +402,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
|
|||||||
def _get_service(self, pool_id, network_id):
|
def _get_service(self, pool_id, network_id):
|
||||||
"""Get a service name.
|
"""Get a service name.
|
||||||
|
|
||||||
if you cant find one,
|
if you can't find one,
|
||||||
create a service and create l2_l2 WF.
|
create a service and create l2_l2 WF.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -468,7 +468,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
|
|||||||
|
|
||||||
def _create_workflow(self, wf_name, wf_template_name,
|
def _create_workflow(self, wf_name, wf_template_name,
|
||||||
create_workflow_params=None):
|
create_workflow_params=None):
|
||||||
"""Create a WF if it doesnt exists yet."""
|
"""Create a WF if it doesn't exists yet."""
|
||||||
if not self.workflow_templates_exists:
|
if not self.workflow_templates_exists:
|
||||||
self._verify_workflow_templates()
|
self._verify_workflow_templates()
|
||||||
if not self._workflow_exists(wf_name):
|
if not self._workflow_exists(wf_name):
|
||||||
@ -484,7 +484,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
|
|||||||
LOG.debug(_('create_workflow response: %s'), str(response))
|
LOG.debug(_('create_workflow response: %s'), str(response))
|
||||||
|
|
||||||
def _verify_workflow_templates(self):
|
def _verify_workflow_templates(self):
|
||||||
"""Verify the existance of workflows on vDirect server."""
|
"""Verify the existence of workflows on vDirect server."""
|
||||||
workflows = {self.l2_l3_wf_name:
|
workflows = {self.l2_l3_wf_name:
|
||||||
False, self.l4_wf_name: False}
|
False, self.l4_wf_name: False}
|
||||||
resource = '/api/workflowTemplate'
|
resource = '/api/workflowTemplate'
|
||||||
|
@ -544,7 +544,7 @@ class IPsecDriver(device_drivers.DeviceDriver):
|
|||||||
def ensure_process(self, process_id, vpnservice=None):
|
def ensure_process(self, process_id, vpnservice=None):
|
||||||
"""Ensuring process.
|
"""Ensuring process.
|
||||||
|
|
||||||
If the process dosen't exist, it will create process
|
If the process doesn't exist, it will create process
|
||||||
and store it in self.processs
|
and store it in self.processs
|
||||||
"""
|
"""
|
||||||
process = self.processes.get(process_id)
|
process = self.processes.get(process_id)
|
||||||
|
@ -38,8 +38,8 @@ def setup_valid_config():
|
|||||||
class AristaProvisionedVlansStorageTestCase(base.BaseTestCase):
|
class AristaProvisionedVlansStorageTestCase(base.BaseTestCase):
|
||||||
"""Test storing and retriving functionality of Arista mechanism driver.
|
"""Test storing and retriving functionality of Arista mechanism driver.
|
||||||
|
|
||||||
Tests all methods of this class by invoking them seperately as well
|
Tests all methods of this class by invoking them separately as well
|
||||||
as a goup.
|
as a group.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
@ -100,7 +100,7 @@ class TestBaseOVS(base.BaseTestCase):
|
|||||||
|
|
||||||
|
|
||||||
class OVS_Lib_Test(base.BaseTestCase):
|
class OVS_Lib_Test(base.BaseTestCase):
|
||||||
"""A test suite to excercise the OVS libraries shared by Neutron agents.
|
"""A test suite to exercise the OVS libraries shared by Neutron agents.
|
||||||
|
|
||||||
Note: these tests do not actually execute ovs-* utilities, and thus
|
Note: these tests do not actually execute ovs-* utilities, and thus
|
||||||
can run on any system. That does, however, limit their scope.
|
can run on any system. That does, however, limit their scope.
|
||||||
|
@ -1248,7 +1248,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
|
|||||||
self.deserialize(self.fmt, res)
|
self.deserialize(self.fmt, res)
|
||||||
self.assertEqual(res.status_int, webob.exc.HTTPConflict.code)
|
self.assertEqual(res.status_int, webob.exc.HTTPConflict.code)
|
||||||
|
|
||||||
def test_create_security_group_rule_differnt_security_group_ids(self):
|
def test_create_security_group_rule_different_security_group_ids(self):
|
||||||
if self._skip_native_bulk:
|
if self._skip_native_bulk:
|
||||||
self.skipTest("Plugin does not support native bulk "
|
self.skipTest("Plugin does not support native bulk "
|
||||||
"security_group_rule create")
|
"security_group_rule create")
|
||||||
|
@ -572,7 +572,7 @@ class DictSerializerTest(base.BaseTestCase):
|
|||||||
def test_dispatch_default(self):
|
def test_dispatch_default(self):
|
||||||
serializer = wsgi.DictSerializer()
|
serializer = wsgi.DictSerializer()
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
serializer.serialize({}, 'NonExistantAction'), '')
|
serializer.serialize({}, 'NonExistentAction'), '')
|
||||||
|
|
||||||
|
|
||||||
class JSONDictSerializerTest(base.BaseTestCase):
|
class JSONDictSerializerTest(base.BaseTestCase):
|
||||||
|
Loading…
Reference in New Issue
Block a user