Merge lp://qastaging/~justin-fathomdb/nova/output-xml-in-order into lp://qastaging/~hudson-openstack/nova/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~justin-fathomdb/nova/output-xml-in-order |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Prerequisite: | lp://qastaging/~rackspace-titan/nova/osapi-xml-serialization |
Diff against target: |
8021 lines (+7741/-7) 36 files modified
nova/api/direct.py (+3/-1) nova/api/openstack/common.py (+49/-1) nova/api/openstack/schemas/v1.0/xsd/actions.xsd (+256/-0) nova/api/openstack/schemas/v1.0/xsd/backup.xsd (+374/-0) nova/api/openstack/schemas/v1.0/xsd/common.xsd (+51/-0) nova/api/openstack/schemas/v1.0/xsd/faults.xsd (+480/-0) nova/api/openstack/schemas/v1.0/xsd/flavor.xsd (+144/-0) nova/api/openstack/schemas/v1.0/xsd/image.xsd (+263/-0) nova/api/openstack/schemas/v1.0/xsd/ipgroup.xsd (+215/-0) nova/api/openstack/schemas/v1.0/xsd/limits.xsd (+354/-0) nova/api/openstack/schemas/v1.0/xsd/rackspace.xsd (+141/-0) nova/api/openstack/schemas/v1.0/xsd/server.xsd (+913/-0) nova/api/openstack/schemas/v1.0/xsd/version.xsd (+172/-0) nova/api/openstack/schemas/v1.1/actions.xsd (+370/-0) nova/api/openstack/schemas/v1.1/api-common.xjb (+11/-0) nova/api/openstack/schemas/v1.1/api-common.xsd (+67/-0) nova/api/openstack/schemas/v1.1/api.xjb (+17/-0) nova/api/openstack/schemas/v1.1/api.xsd (+117/-0) nova/api/openstack/schemas/v1.1/atom.xjb (+11/-0) nova/api/openstack/schemas/v1.1/atom/atom.xsd (+115/-0) nova/api/openstack/schemas/v1.1/atom/xml.xsd (+287/-0) nova/api/openstack/schemas/v1.1/backup.xsd (+378/-0) nova/api/openstack/schemas/v1.1/common.xsd (+125/-0) nova/api/openstack/schemas/v1.1/extensions.xsd (+56/-0) nova/api/openstack/schemas/v1.1/faults.xsd (+482/-0) nova/api/openstack/schemas/v1.1/flavor.xsd (+156/-0) nova/api/openstack/schemas/v1.1/image.xsd (+286/-0) nova/api/openstack/schemas/v1.1/ipgroup.xsd (+231/-0) nova/api/openstack/schemas/v1.1/limits.xsd (+282/-0) nova/api/openstack/schemas/v1.1/server.xsd (+1010/-0) nova/api/openstack/schemas/v1.1/version.xsd (+200/-0) nova/api/openstack/servers.py (+3/-0) nova/api/openstack/validation.py (+85/-0) nova/tests/fake_flags.py (+6/-0) nova/wsgi.py (+30/-5) tools/pip-requires (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~justin-fathomdb/nova/output-xml-in-order |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christopher MacGown (community) | Needs Information | ||
Brian Waldon (community) | Needs Information | ||
Review via email:
|
Description of the change
Allow XML elements to be listed, and then output in that order
Unmerged revisions
- 854. By justinsb
-
Better formed output: if an order is specified for elements, follow the order
- 853. By justinsb
-
Merged with lp:~rackspace-titan/nova/osapi-xml-serialization
- 852. By justinsb
-
Merged with lp:~justin-fathomdb/nova/bug740576 and thereby with trunk
- 851. By justinsb
-
For now, tolerate the stuff that's broken and dial back the tests so that we don't have to raise 200 bugs yet
- 850. By justinsb
-
Imported 1.1 schema from http://
bazaar. launchpad. net/~annegentle /openstack- manuals/ trunk/files/ head:/doc/ source/ docbkx/ openstack- compute- api/ - 849. By justinsb
-
Added validation code
- 848. By justinsb
-
Merged with trunk
- 847. By justinsb
-
Moved CloudServers v1.0 under nova/api/
openstack/ schemas - 846. By justinsb
-
Moved rackspace.xsd so that the relative URLs work
- 845. By justinsb
-
Added common.xsd that I had missed
The diff created by launchpad seems to be missing a lot. For example, you added a api/openstack/ validation. py in rev 849. Nowhere in the diff is that file referenced. I also don't see the changes you made in wsgi.py. This probably isn't your fault, I just wanted to point this out to other reviewers. I used the following command to generate a diff:
bzr diff lp:~justin-fathomdb/nova/output-xml-in-order --old=lp:nova/trunk -r 949
So it looks like this branch does more than "Allow XML elements to be listed, and then output in that order". Can you expand on that?
Does this branch also depend on lp:~justin-fathomdb/nova/add-xsd? Otherwise, why are you adding all of the xsd files in this branch?
I also noticed "# NOTE(justinsb): Commented out for now because it finds too many issues" in fake_flags.py. Is this the right approach to take? Why don't we address the "issues" before we merge this in?
Can you explain what the "validate_ xml_for_ json" flag means?