8ac8222eaa
Improvements to exception handling in the Cisco plugins. Changes
include:
- Added mapping of Cisco exceptions to HTTP codes
(extension to FAULT_MAP).
- Removed several unused Cisco exception definitions.
- Added several new Cisco exceptions for fault conditions.
- Added several rollbacks for various sequential operations, e.g.:
* Create port: Nexus sub-plugin fails after OVS sub-plugin success
* Create port: Nexus switch conig fails after adding binding to
Nexus binding database
* Delete port: OVS sub-plugin fails after Nexus sub-plugin success
- Delete Port: Reversed order of OVS/Nexus sub-plugin calls so that
it is done in the reverse order as is done for create port.
- Removed several empty except/raise blocks
- Delete network: Removed call to Nexus sub-plugin delete_network,
since that is a no-op.
- Removed a block of unused code in model's create_network method.
- Added several unit testcases, including patching of OVS, Cisco
and Nexus config.
- Remove CISCO_TEST configuration from cisco plugin
config .ini file.
Change-Id: Iabdf4842aa2f0b090a90e2c565848290832b5197
104 lines
3.5 KiB
Python
104 lines
3.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2013 Cisco Systems, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo.config import cfg
|
|
|
|
from quantum.agent.common import config
|
|
|
|
|
|
cisco_plugins_opts = [
|
|
cfg.StrOpt('vswitch_plugin',
|
|
default='quantum.plugins.openvswitch.ovs_quantum_plugin.'
|
|
'OVSQuantumPluginV2',
|
|
help=_("Virtual Switch to use")),
|
|
cfg.StrOpt('nexus_plugin',
|
|
default='quantum.plugins.cisco.nexus.cisco_nexus_plugin_v2.'
|
|
'NexusPlugin',
|
|
help=_("Nexus Switch to use")),
|
|
]
|
|
|
|
|
|
cisco_opts = [
|
|
cfg.StrOpt('vlan_start', default='100',
|
|
help=_("VLAN start value")),
|
|
cfg.StrOpt('vlan_end', default='3000',
|
|
help=_("VLAN end value")),
|
|
cfg.StrOpt('vlan_name_prefix', default='q-',
|
|
help=_("VLAN Name prefix")),
|
|
cfg.StrOpt('max_ports', default='100',
|
|
help=_("Maximum Port value")),
|
|
cfg.StrOpt('max_port_profiles', default='65568',
|
|
help=_("Maximum Port Profile value")),
|
|
cfg.StrOpt('max_networks', default='65568',
|
|
help=_("Maximum Network value")),
|
|
cfg.StrOpt('model_class',
|
|
default='quantum.plugins.cisco.models.virt_phy_sw_v2.'
|
|
'VirtualPhysicalSwitchModelV2',
|
|
help=_("Model Class")),
|
|
cfg.StrOpt('manager_class',
|
|
default='quantum.plugins.cisco.segmentation.'
|
|
'l2network_vlan_mgr_v2.L2NetworkVLANMgr',
|
|
help=_("Manager Class")),
|
|
cfg.StrOpt('nexus_driver',
|
|
default='quantum.plugins.cisco.tests.unit.v2.nexus.'
|
|
'fake_nexus_driver.CiscoNEXUSFakeDriver',
|
|
help=_("Nexus Driver Name")),
|
|
]
|
|
|
|
cfg.CONF.register_opts(cisco_opts, "CISCO")
|
|
cfg.CONF.register_opts(cisco_plugins_opts, "CISCO_PLUGINS")
|
|
config.register_root_helper(cfg.CONF)
|
|
|
|
# shortcuts
|
|
CONF = cfg.CONF
|
|
CISCO = cfg.CONF.CISCO
|
|
CISCO_PLUGINS = cfg.CONF.CISCO_PLUGINS
|
|
|
|
#
|
|
# When populated the nexus_dictionary format is:
|
|
# {('<nexus ipaddr>', '<key>'): '<value>', ...}
|
|
#
|
|
# Example:
|
|
# {('1.1.1.1', 'username'): 'admin',
|
|
# ('1.1.1.1', 'password'): 'mySecretPassword',
|
|
# ('1.1.1.1', 'ssh_port'): 22,
|
|
# ('1.1.1.1', 'compute1'): '1/1', ...}
|
|
#
|
|
nexus_dictionary = {}
|
|
|
|
|
|
class CiscoConfigOptions():
|
|
"""Cisco Configuration Options Class."""
|
|
|
|
def __init__(self):
|
|
self._create_nexus_dictionary()
|
|
|
|
def _create_nexus_dictionary(self):
|
|
"""Create the Nexus dictionary.
|
|
|
|
Reads data from cisco_plugins.ini NEXUS_SWITCH section(s).
|
|
"""
|
|
for parsed_file in cfg.CONF._cparser.parsed:
|
|
for parsed_item in parsed_file.keys():
|
|
nexus_name, sep, nexus_ip = parsed_item.partition(':')
|
|
if nexus_name == 'NEXUS_SWITCH':
|
|
for nexus_key, value in parsed_file[parsed_item].items():
|
|
nexus_dictionary[nexus_ip, nexus_key] = value[0]
|
|
|
|
|
|
def get_nexus_dictionary():
|
|
return nexus_dictionary
|