← Back to branch summary

~salvatore-orlando/neutron/bug822813

~salvatore-orlando/neutron/bug822813

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/conf/plugins.ini

Committer: Dan Wendlandt
Date: 2011-08-30 16:54:49 UTC
mfrom: (21.27.40 cisco-l2network-plugin-consolidated)
Revision ID: dan@nicira.com-20110830165449-jte3rdt0hocy2ksc

merge cisco consolidated plugin changes

files added:
quantum/plugins/cisco/conf/ucs_inventory.ini

quantum/plugins/cisco/db/ucs_db.py

quantum/plugins/cisco/db/ucs_models.py

quantum/plugins/cisco/l2device_inventory_base.py

quantum/plugins/cisco/l2network_segmentation_base.py

quantum/plugins/cisco/models

quantum/plugins/cisco/models/__init__.py

quantum/plugins/cisco/models/l2network_multi_blade.py

quantum/plugins/cisco/models/l2network_single_blade.py

quantum/plugins/cisco/segmentation

quantum/plugins/cisco/segmentation/__init__.py

quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py

quantum/plugins/cisco/ucs/cisco_ucs_inventory.py

quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py

files removed:
quantum/plugins/cisco/l2network_model.py

files modified:
extensions/novatenant.py

extensions/portprofile.py

quantum/plugins/cisco/README

quantum/plugins/cisco/common/cisco_constants.py

quantum/plugins/cisco/common/cisco_credentials.py

quantum/plugins/cisco/common/cisco_exceptions.py

quantum/plugins/cisco/common/cisco_utils.py

quantum/plugins/cisco/conf/l2network_plugin.ini

quantum/plugins/cisco/conf/plugins.ini

quantum/plugins/cisco/db/api.py

quantum/plugins/cisco/db/l2network_db.py

quantum/plugins/cisco/db/l2network_models.py

quantum/plugins/cisco/l2network_plugin.py

quantum/plugins/cisco/l2network_plugin_configuration.py

quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py

quantum/plugins/cisco/nexus/cisco_nexus_plugin.py

quantum/plugins/cisco/nova/quantum_aware_scheduler.py

quantum/plugins/cisco/nova/vifdirect.py

quantum/plugins/cisco/tests/unit/test_cisco_extension.py

quantum/plugins/cisco/tests/unit/test_database.py

quantum/plugins/cisco/tests/unit/test_nexus_plugin.py

quantum/plugins/cisco/tests/unit/test_ucs_driver.py

quantum/plugins/cisco/ucs/cisco_ucs_configuration.py

quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py

quantum/plugins/cisco/ucs/cisco_ucs_plugin.py

Show diffs side-by-side

added added

removed removed

quantum/plugins/cisco/conf/plugins.ini

1

1

[PLUGINS]

2

2

ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_plugin.UCSVICPlugin

3

3

#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin.NexusPlugin

4

5

[INVENTORY]

6

ucs_plugin=quantum.plugins.cisco.ucs.cisco_ucs_inventory.UCSInventory

7

#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_inventory.NexusInventory

Older »