lp:~cisco-openstack/neutron/l2network-plugin-consolidated

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:neutron/diablo at revision 62

Arvind Somya: Approve on 2011-08-30

dan wendlandt: Approve on 2011-08-30

Diff: 4856 lines (+2992/-623)

38 files modified

extensions/novatenant.py (+27/-11)
extensions/portprofile.py (+0/-2)
quantum/plugins/cisco/README (+52/-53)
quantum/plugins/cisco/common/cisco_constants.py (+22/-3)
quantum/plugins/cisco/common/cisco_credentials.py (+33/-18)
quantum/plugins/cisco/common/cisco_exceptions.py (+58/-0)
quantum/plugins/cisco/common/cisco_utils.py (+40/-0)
quantum/plugins/cisco/conf/l2network_plugin.ini (+6/-3)
quantum/plugins/cisco/conf/plugins.ini (+4/-0)
quantum/plugins/cisco/conf/ucs_inventory.ini (+24/-0)
quantum/plugins/cisco/db/api.py (+43/-0)
quantum/plugins/cisco/db/l2network_db.py (+188/-0)
quantum/plugins/cisco/db/l2network_models.py (+47/-4)
quantum/plugins/cisco/db/ucs_db.py (+130/-0)
quantum/plugins/cisco/db/ucs_models.py (+55/-0)
quantum/plugins/cisco/l2device_inventory_base.py (+343/-0)
quantum/plugins/cisco/l2network_model.py (+0/-123)
quantum/plugins/cisco/l2network_plugin.py (+79/-156)
quantum/plugins/cisco/l2network_plugin_configuration.py (+3/-0)
quantum/plugins/cisco/l2network_segmentation_base.py (+75/-0)
quantum/plugins/cisco/models/__init__.py (+20/-0)
quantum/plugins/cisco/models/l2network_multi_blade.py (+173/-0)
quantum/plugins/cisco/models/l2network_single_blade.py (+164/-0)
quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py (+23/-4)
quantum/plugins/cisco/nexus/cisco_nexus_plugin.py (+1/-1)
quantum/plugins/cisco/nova/quantum_aware_scheduler.py (+3/-2)
quantum/plugins/cisco/nova/vifdirect.py (+3/-2)
quantum/plugins/cisco/segmentation/__init__.py (+20/-0)
quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py (+47/-0)
quantum/plugins/cisco/tests/unit/test_cisco_extension.py (+145/-42)
quantum/plugins/cisco/tests/unit/test_database.py (+192/-17)
quantum/plugins/cisco/tests/unit/test_nexus_plugin.py (+19/-3)
quantum/plugins/cisco/tests/unit/test_ucs_driver.py (+0/-10)
quantum/plugins/cisco/ucs/cisco_ucs_configuration.py (+7/-0)
quantum/plugins/cisco/ucs/cisco_ucs_inventory.py (+682/-0)
quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py (+31/-0)
quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py (+111/-35)
quantum/plugins/cisco/ucs/cisco_ucs_plugin.py (+122/-134)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

112. By Sumit Naiksatam on 2011-08-30

Merging Ying's changes (minor).

Merged branch lp:~yinliu2/neutron/l2network-plugin-consolidated-yingfix0830

111. By Sumit Naiksatam on 2011-08-28

Merging fixes from Sumit's branch for extension API version number and to UCS inventory to associated VIF-ID with ports.

Merged branch lp:~rohitagarwalla/neutron/l2network-plugin-consolidated-newdbapi

110. By Sumit Naiksatam on 2011-08-28

Merging Shweta's fix for extensions' test cases (clean up was not happening completely).

Merged branch lp:~shweta-ap05/neutron/shweta-l2network-plugin-consolidated

109. By Sumit Naiksatam on 2011-08-27

Merging from lp:quantum

108. By Sumit Naiksatam on 2011-08-26

Merging Shweta's fixes in the tests for key names changes in the Core API

Merged branch lp:~shweta-ap05/neutron/shweta-l2network-plugin-consolidated

107. By Sumit Naiksatam on 2011-08-26

Merging lp:quantum, resolving conflict.

106. By Sumit Naiksatam on 2011-08-26

Merging Ying's pep8 fixes.

Merged branch lp:~yinliu2/neutron/l2network-consolidated-pep8

105. By Sumit Naiksatam on 2011-08-26

Merging quantum trunk.

104. By Sumit Naiksatam on 2011-08-26

Merging from quantum.

103. By Sumit Naiksatam on 2011-08-26

Merging Shweta's fixes to the test cases for the extensions.

Merged branch lp:~shweta-ap05/neutron/shweta-l2network-plugin-consolidated