lp://qastaging/~cisco-openstack/neutron/l2network-plugin-extensions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/neutron/diablo at revision 52

Salvatore Orlando: Approve on 2011-08-25

Mark T. Voelker (community): Approve on 2011-08-25

Diff: 3783 lines (+2763/-81)

33 files modified

extensions/_credential_view.py (+58/-0)
extensions/_novatenant_view.py (+47/-0)
extensions/_pprofiles.py (+63/-0)
extensions/_qos_view.py (+56/-0)
extensions/credential.py (+166/-0)
extensions/novatenant.py (+144/-0)
extensions/portprofile.py (+219/-0)
extensions/qos.py (+164/-0)
quantum/plugins/cisco/README (+25/-9)
quantum/plugins/cisco/common/cisco_constants.py (+20/-10)
quantum/plugins/cisco/common/cisco_credentials.py (+1/-1)
quantum/plugins/cisco/common/cisco_exceptions.py (+27/-4)
quantum/plugins/cisco/common/cisco_faults.py (+148/-0)
quantum/plugins/cisco/conf/nexus.ini (+3/-2)
quantum/plugins/cisco/conf/quantum.conf.ciscoext (+24/-0)
quantum/plugins/cisco/db/l2network_db.py (+22/-0)
quantum/plugins/cisco/db/nexus_db.py (+93/-0)
quantum/plugins/cisco/db/nexus_models.py (+38/-0)
quantum/plugins/cisco/l2network_model.py (+1/-1)
quantum/plugins/cisco/l2network_plugin.py (+181/-9)
quantum/plugins/cisco/l2network_plugin_configuration.py (+9/-0)
quantum/plugins/cisco/nexus/cisco_nexus_configuration.py (+2/-1)
quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py (+9/-5)
quantum/plugins/cisco/nexus/cisco_nexus_plugin.py (+13/-4)
quantum/plugins/cisco/tests/unit/test_cisco_extension.py (+964/-0)
quantum/plugins/cisco/tests/unit/test_database.py (+137/-1)
quantum/plugins/cisco/tests/unit/test_l2networkApi.py (+33/-9)
quantum/plugins/cisco/tests/unit/test_nexus_plugin.py (+5/-16)
quantum/plugins/cisco/tests/unit/test_ucs_driver.py (+1/-2)
quantum/plugins/cisco/tests/unit/test_ucs_plugin.py (+86/-2)
quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py (+1/-1)
quantum/plugins/cisco/ucs/cisco_ucs_plugin.py (+1/-1)
tests/unit/test_extensions.py (+2/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

96. By Ying Liu on 2011-08-25

add cisco_faults under l2network package.

95. By Ying Liu on 2011-08-25

move faults/exceptions to l2network package,
remove unecessary faults definitions
change the portprofile action api's method
fix imports order and other comments issues

94. By Sumit Naiksatam on 2011-08-25

Merging from Sumit's branch, import ordering related changes.

Merged branch lp://qastaging/~snaiksat/neutron/sumit-l2network-plugin-extensions

93. By Rohit Agarwalla on 2011-08-24

fixing relative import in nexus_db.py

92. By Ying Liu on 2011-08-24

merge latest quantum branch and resolve conflicts

91. By Ying Liu on 2011-08-24

delete quantum/common/test_lib.py to prepare for quantum merge

90. By Ying Liu on 2011-08-24

Made changes according to reviewer's comments.
Add addtional information on extension test in README.

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

89. By Ying Liu on 2011-08-23

remove unnecessary code and sync faults and exception handling

88. By Sumit Naiksatam on 2011-08-22

Code clean up as per reviewr's request; documentation strings, unused code, etc.

87. By Edgar Magana on 2011-08-22

Rewording of the README file to clarify the use of the SSh port