neutron

Merge lp://staging/~bgh/neutron/202to200 into lp://staging/neutron/diablo

  1. 202to200
  2. Merge into diablo
Proposed by Brad Hall
Status: Merged
Merged at revision: 77
Proposed branch: lp://staging/~bgh/neutron/202to200
Merge into: lp://staging/neutron/diablo
Diff against target: 102 lines (+13/-11)
4 files modified
quantum/api/networks.py (+3/-2)
quantum/api/ports.py (+3/-2)
quantum/plugins/cisco/tests/unit/test_cisco_extension.py (+5/-5)
tests/unit/test_api.py (+2/-2)
To merge this branch: bzr merge lp://staging/~bgh/neutron/202to200
Reviewer Review Type Date Requested Status
Tyler Smith Approve
dan wendlandt Approve
Review via email: mp+76803@code.staging.launchpad.net

Description of the change

Pick up 202->200 changes. This is the same as salvatore's branch but it doesn't include the attachment_id fix and it also changes the expected return code in the cisco plugin tests.

To post a comment you must log in.
Revision history for this message
dan wendlandt (danwent) wrote :

Will be running tests on this as part of the final tests for diablo.

Will try to figure out how to invoke the Cisco tests, but it would be great if someone from that team was able to do a quick review as well.

review: Approve
Revision history for this message
dan wendlandt (danwent) wrote :

As an update, I tried running the cisco tests, but they seem to require that the config file has a database set, so I got many failures with the line:

OperationalError: (OperationalError) (2005, "Unknown MySQL server host '<put_quantum_mysql_host_here>' (1)") None None

Hopefully we can get someone from Cisco to run the tests on their setup (Brad's changes seem pretty benign, but its best to be overly cautious)

Revision history for this message
Tyler Smith (tylesmit) wrote :

Give me a minute; I'm setting up now.

Revision history for this message
Tyler Smith (tylesmit) wrote :

I'm getting 2 errors and 5 failures. The failures are definitely caused by this. I'm looking into it.

Revision history for this message
Tyler Smith (tylesmit) wrote :

I've fixed the issue and sent a merge prop from the fixed branch to this one. Once it's merged in everything should be good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches