summaryrefslogtreecommitdiff
path: root/doc/api_samples
diff options
context:
space:
mode:
authorDavanum Srinivas <dims@linux.vnet.ibm.com>2014-12-08 08:31:35 -0500
committerDavanum Srinivas <dims@linux.vnet.ibm.com>2015-01-05 12:46:04 -0500
commit417704816e002fc11b8a126a5d94d1f2dee5015d (patch)
tree6e162dfe5bd3310bd0015d103f02a37d67e8cfa3 /doc/api_samples
parentad69ea886ccba9030d55d8f172522bd214349107 (diff)
downloadnova-417704816e002fc11b8a126a5d94d1f2dee5015d.tar.gz
Nuke XML support from Nova REST API - Phase 1
In I5a580fc323c3809790b4a68a9f8f8129ecdc2cf0 we switched off XML support. In this review we entirely remove all the testcases and supporting files. Change-Id: I83827d438753fd3899053dd6e09bc77c997c7406
Diffstat (limited to 'doc/api_samples')
-rw-r--r--doc/api_samples/NMN/multinic-add-fixed-ip-req.xml3
-rw-r--r--doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml3
-rw-r--r--doc/api_samples/NMN/server-post-req.xml19
-rw-r--r--doc/api_samples/NMN/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-DCF/image-get-resp.xml12
-rw-r--r--doc/api_samples/OS-DCF/image-list-resp.xml71
-rw-r--r--doc/api_samples/OS-DCF/list-servers-detail-get.xml21
-rw-r--r--doc/api_samples/OS-DCF/server-action-rebuild-req.xml6
-rw-r--r--doc/api_samples/OS-DCF/server-action-rebuild-resp.xml19
-rw-r--r--doc/api_samples/OS-DCF/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-DCF/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-DCF/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-DCF/server-resize-post-req.xml6
-rw-r--r--doc/api_samples/OS-DCF/server-update-put-req.xml5
-rw-r--r--doc/api_samples/OS-DCF/server-update-put-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-AZ/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-AZ/server-post-req.xml6
-rw-r--r--doc/api_samples/OS-EXT-AZ/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml12
-rw-r--r--doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml71
-rw-r--r--doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/OS-EXT-IPS/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-IPS/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-EXT-IPS/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/OS-EXT-STS/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-EXT-STS/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-EXT-STS/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-STS/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml8
-rw-r--r--doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml23
-rw-r--r--doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml5
-rw-r--r--doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml5
-rw-r--r--doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml23
-rw-r--r--doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml11
-rw-r--r--doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml5
-rw-r--r--doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml12
-rw-r--r--doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml6
-rw-r--r--doc/api_samples/OS-SRV-USG/server-get-resp.xml19
-rw-r--r--doc/api_samples/OS-SRV-USG/server-post-req.xml19
-rw-r--r--doc/api_samples/OS-SRV-USG/server-post-resp.xml6
-rw-r--r--doc/api_samples/OS-SRV-USG/servers-detail-resp.xml21
-rw-r--r--doc/api_samples/all_extensions/extensions-get-resp.xml293
-rw-r--r--doc/api_samples/all_extensions/flavor-get-resp.xml5
-rw-r--r--doc/api_samples/all_extensions/flavors-list-resp.xml23
-rw-r--r--doc/api_samples/all_extensions/server-action-changepassword.xml4
-rw-r--r--doc/api_samples/all_extensions/server-action-confirmresize.xml3
-rw-r--r--doc/api_samples/all_extensions/server-action-createimage.xml8
-rw-r--r--doc/api_samples/all_extensions/server-action-reboot.xml4
-rw-r--r--doc/api_samples/all_extensions/server-action-rebuild-resp.xml19
-rw-r--r--doc/api_samples/all_extensions/server-action-rebuild.xml25
-rw-r--r--doc/api_samples/all_extensions/server-action-resize.xml4
-rw-r--r--doc/api_samples/all_extensions/server-action-revertresize.xml3
-rw-r--r--doc/api_samples/all_extensions/server-get-resp.xml22
-rw-r--r--doc/api_samples/all_extensions/server-post-req.xml19
-rw-r--r--doc/api_samples/all_extensions/server-post-resp.xml9
-rw-r--r--doc/api_samples/all_extensions/servers-details-resp.xml24
-rw-r--r--doc/api_samples/all_extensions/servers-list-resp.xml7
-rw-r--r--doc/api_samples/flavor-get-resp.xml5
-rw-r--r--doc/api_samples/flavors-list-resp.xml23
-rw-r--r--doc/api_samples/image-get-resp.xml12
-rw-r--r--doc/api_samples/image-meta-key-get.xml2
-rw-r--r--doc/api_samples/image-meta-key-put-req.xml4
-rw-r--r--doc/api_samples/image-meta-key-put-resp.xml2
-rw-r--r--doc/api_samples/image-metadata-get-resp.xml7
-rw-r--r--doc/api_samples/image-metadata-post-req.xml5
-rw-r--r--doc/api_samples/image-metadata-post-resp.xml8
-rw-r--r--doc/api_samples/image-metadata-put-req.xml6
-rw-r--r--doc/api_samples/image-metadata-put-resp.xml5
-rw-r--r--doc/api_samples/images-details-get-resp.xml71
-rw-r--r--doc/api_samples/images-details-resp.xml71
-rw-r--r--doc/api_samples/images-list-get-resp.xml38
-rw-r--r--doc/api_samples/images-list-resp.xml38
-rw-r--r--doc/api_samples/limit-get-resp.xml32
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-backup-server.xml6
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml6
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-lock-server.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-migrate.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-pause.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-reset-network.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml4
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-reset-state.xml0
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-resume.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-suspend.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml2
-rw-r--r--doc/api_samples/os-admin-actions/admin-actions-unpause.xml2
-rw-r--r--doc/api_samples/os-admin-actions/server-post-req.xml19
-rw-r--r--doc/api_samples/os-admin-actions/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-agents/agent-post-req.xml9
-rw-r--r--doc/api_samples/os-agents/agent-post-resp.xml10
-rw-r--r--doc/api_samples/os-agents/agent-update-put-req.xml6
-rw-r--r--doc/api_samples/os-agents/agent-update-put-resp.xml7
-rw-r--r--doc/api_samples/os-agents/agents-get-resp.xml4
-rw-r--r--doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml2
-rw-r--r--doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml6
-rw-r--r--doc/api_samples/os-aggregates/aggregate-post-req.xml2
-rw-r--r--doc/api_samples/os-aggregates/aggregate-post-resp.xml10
-rw-r--r--doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml2
-rw-r--r--doc/api_samples/os-aggregates/aggregate-update-post-req.xml2
-rw-r--r--doc/api_samples/os-aggregates/aggregate-update-post-resp.xml14
-rw-r--r--doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml16
-rw-r--r--doc/api_samples/os-aggregates/aggregates-get-resp.xml14
-rw-r--r--doc/api_samples/os-aggregates/aggregates-list-get-resp.xml16
-rw-r--r--doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml15
-rw-r--r--doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml14
-rw-r--r--doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml9
-rw-r--r--doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml2
-rw-r--r--doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml4
-rw-r--r--doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml13
-rw-r--r--doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml15
-rw-r--r--doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml17
-rw-r--r--doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml13
-rw-r--r--doc/api_samples/os-attach-interfaces/server-post-req.xml19
-rw-r--r--doc/api_samples/os-attach-interfaces/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-availability-zone/availability-zone-post-req.xml23
-rw-r--r--doc/api_samples/os-availability-zone/availability-zone-post-resp.xml6
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml4
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml2
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml10
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml4
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml11
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml6
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml8
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml4
-rw-r--r--doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml6
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml4
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml2
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml10
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml13
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml11
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml19
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml21
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml4
-rw-r--r--doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml19
-rw-r--r--doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml23
-rw-r--r--doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-cell-capacities/cells-capacities-resp.xml19
-rw-r--r--doc/api_samples/os-cells/cells-get-resp.xml2
-rw-r--r--doc/api_samples/os-cells/cells-list-empty-resp.xml2
-rw-r--r--doc/api_samples/os-cells/cells-list-resp.xml8
-rw-r--r--doc/api_samples/os-certificates/certificate-create-req.xml0
-rw-r--r--doc/api_samples/os-certificates/certificate-create-resp.xml2
-rw-r--r--doc/api_samples/os-certificates/certificate-get-root-resp.xml2
-rw-r--r--doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml5
-rw-r--r--doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml3
-rw-r--r--doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml4
-rw-r--r--doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml12
-rw-r--r--doc/api_samples/os-config-drive/server-config-drive-get-resp.xml19
-rw-r--r--doc/api_samples/os-config-drive/server-post-req.xml19
-rw-r--r--doc/api_samples/os-config-drive/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml21
-rw-r--r--doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml7
-rw-r--r--doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml2
-rw-r--r--doc/api_samples/os-console-auth-tokens/server-post-req.xml19
-rw-r--r--doc/api_samples/os-console-auth-tokens/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-console-output/console-output-post-req.xml2
-rw-r--r--doc/api_samples/os-console-output/console-output-post-resp.xml4
-rw-r--r--doc/api_samples/os-console-output/server-post-req.xml19
-rw-r--r--doc/api_samples/os-console-output/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-consoles/get-rdp-console-post-req.xml2
-rw-r--r--doc/api_samples/os-consoles/get-rdp-console-post-resp.xml5
-rw-r--r--doc/api_samples/os-consoles/get-serial-console-post-req.xml2
-rw-r--r--doc/api_samples/os-consoles/get-serial-console-post-resp.xml5
-rw-r--r--doc/api_samples/os-consoles/get-spice-console-post-req.xml2
-rw-r--r--doc/api_samples/os-consoles/get-spice-console-post-resp.xml5
-rw-r--r--doc/api_samples/os-consoles/get-vnc-console-post-req.xml2
-rw-r--r--doc/api_samples/os-consoles/get-vnc-console-post-resp.xml5
-rw-r--r--doc/api_samples/os-consoles/server-post-req.xml19
-rw-r--r--doc/api_samples/os-consoles/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-deferred-delete/force-delete-post-req.xml2
-rw-r--r--doc/api_samples/os-deferred-delete/restore-post-req.xml2
-rw-r--r--doc/api_samples/os-deferred-delete/server-post-req.xml19
-rw-r--r--doc/api_samples/os-deferred-delete/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-evacuate/server-evacuate-req.xml5
-rw-r--r--doc/api_samples/os-evacuate/server-evacuate-resp.xml2
-rw-r--r--doc/api_samples/os-evacuate/server-post-req.xml19
-rw-r--r--doc/api_samples/os-evacuate/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml4
-rw-r--r--doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml2
-rw-r--r--doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml19
-rw-r--r--doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml0
-rw-r--r--doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml2
-rw-r--r--doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml2
-rw-r--r--doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml2
-rw-r--r--doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml5
-rw-r--r--doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml4
-rw-r--r--doc/api_samples/os-extended-networks/network-create-req.xml10
-rw-r--r--doc/api_samples/os-extended-networks/network-create-resp.xml35
-rw-r--r--doc/api_samples/os-extended-networks/network-show-resp.xml35
-rw-r--r--doc/api_samples/os-extended-networks/networks-list-resp.xml71
-rw-r--r--doc/api_samples/os-extended-quotas/quotas-update-post-req.xml5
-rw-r--r--doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml15
-rw-r--r--doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml19
-rw-r--r--doc/api_samples/os-extended-rescue-with-image/server-post-req.xml19
-rw-r--r--doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml3
-rw-r--r--doc/api_samples/os-extended-rescue-with-image/server-rescue.xml2
-rw-r--r--doc/api_samples/os-extended-services-delete/services-get-resp.xml6
-rw-r--r--doc/api_samples/os-extended-volumes/server-get-resp.xml21
-rw-r--r--doc/api_samples/os-extended-volumes/server-post-req.xml19
-rw-r--r--doc/api_samples/os-extended-volumes/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-extended-volumes/servers-detail-resp.xml23
-rw-r--r--doc/api_samples/os-fixed-ips/fixedip-post-req.xml2
-rw-r--r--doc/api_samples/os-fixed-ips/fixedips-get-resp.xml7
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-req.xml10
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-create-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml23
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-list-resp.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml4
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml2
-rw-r--r--doc/api_samples/os-flavor-access/flavor-access-show-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml5
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml2
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml2
-rw-r--r--doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml2
-rw-r--r--doc/api_samples/os-flavor-manage/flavor-create-post-req.xml8
-rw-r--r--doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml23
-rw-r--r--doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml9
-rw-r--r--doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml5
-rw-r--r--doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml23
-rw-r--r--doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml9
-rw-r--r--doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml5
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml5
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml6
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml4
-rw-r--r--doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml4
-rw-r--r--doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml5
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml6
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml6
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml2
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml11
-rw-r--r--doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml27
-rw-r--r--doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml0
-rw-r--r--doc/api_samples/os-floating-ips/floating-ips-create-req.xml2
-rw-r--r--doc/api_samples/os-floating-ips/floating-ips-create-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml2
-rw-r--r--doc/api_samples/os-floating-ips/floating-ips-list-resp.xml5
-rw-r--r--doc/api_samples/os-fping/fping-get-details-resp.xml6
-rw-r--r--doc/api_samples/os-fping/fping-get-resp.xml8
-rw-r--r--doc/api_samples/os-fping/server-post-req.xml19
-rw-r--r--doc/api_samples/os-fping/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-hide-server-addresses/server-get-resp.xml19
-rw-r--r--doc/api_samples/os-hide-server-addresses/server-post-req.xml0
-rw-r--r--doc/api_samples/os-hide-server-addresses/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-hide-server-addresses/servers-details-resp.xml21
-rw-r--r--doc/api_samples/os-hide-server-addresses/servers-list-resp.xml7
-rw-r--r--doc/api_samples/os-hosts/host-get-reboot.xml2
-rw-r--r--doc/api_samples/os-hosts/host-get-resp.xml24
-rw-r--r--doc/api_samples/os-hosts/host-get-shutdown.xml2
-rw-r--r--doc/api_samples/os-hosts/host-get-startup.xml2
-rw-r--r--doc/api_samples/os-hosts/host-put-maintenance-req.xml5
-rw-r--r--doc/api_samples/os-hosts/host-put-maintenance-resp.xml2
-rw-r--r--doc/api_samples/os-hosts/hosts-list-resp.xml10
-rw-r--r--doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml4
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml6
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-list-resp.xml4
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-search-resp.xml4
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml6
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-show-resp.xml4
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml2
-rw-r--r--doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml2
-rw-r--r--doc/api_samples/os-instance-actions/instance-action-get-resp.xml5
-rw-r--r--doc/api_samples/os-instance-actions/instance-actions-list-resp.xml5
-rw-r--r--doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml16
-rw-r--r--doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml16
-rw-r--r--doc/api_samples/os-keypairs/keypairs-get-resp.xml13
-rw-r--r--doc/api_samples/os-keypairs/keypairs-import-post-req.xml4
-rw-r--r--doc/api_samples/os-keypairs/keypairs-import-post-resp.xml7
-rw-r--r--doc/api_samples/os-keypairs/keypairs-list-resp.xml9
-rw-r--r--doc/api_samples/os-keypairs/keypairs-post-req.xml3
-rw-r--r--doc/api_samples/os-keypairs/keypairs-post-resp.xml24
-rw-r--r--doc/api_samples/os-migrations/migrations-get.xml5
-rw-r--r--doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml24
-rw-r--r--doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml6
-rw-r--r--doc/api_samples/os-multiple-create/multiple-create-post-req.xml25
-rw-r--r--doc/api_samples/os-multiple-create/multiple-create-post-resp.xml2
-rw-r--r--doc/api_samples/os-networks-associate/network-associate-host-req.xml2
-rw-r--r--doc/api_samples/os-networks-associate/network-disassociate-host-req.xml1
-rw-r--r--doc/api_samples/os-networks-associate/network-disassociate-project-req.xml1
-rw-r--r--doc/api_samples/os-networks-associate/network-disassociate-req.xml1
-rw-r--r--doc/api_samples/os-networks/network-add-req.xml1
-rw-r--r--doc/api_samples/os-networks/network-create-req.xml4
-rw-r--r--doc/api_samples/os-networks/network-create-resp.xml31
-rw-r--r--doc/api_samples/os-networks/network-show-resp.xml31
-rw-r--r--doc/api_samples/os-networks/networks-disassociate-req.xml1
-rw-r--r--doc/api_samples/os-networks/networks-list-resp.xml63
-rw-r--r--doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml19
-rw-r--r--doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml26
-rw-r--r--doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml19
-rw-r--r--doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml15
-rw-r--r--doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml14
-rw-r--r--doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml15
-rw-r--r--doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml15
-rw-r--r--doc/api_samples/os-quota-sets/quotas-show-get-resp.xml15
-rw-r--r--doc/api_samples/os-quota-sets/quotas-update-post-req.xml4
-rw-r--r--doc/api_samples/os-quota-sets/quotas-update-post-resp.xml15
-rw-r--r--doc/api_samples/os-rescue/server-get-resp-rescue.xml19
-rw-r--r--doc/api_samples/os-rescue/server-get-resp-unrescue.xml19
-rw-r--r--doc/api_samples/os-rescue/server-post-req.xml19
-rw-r--r--doc/api_samples/os-rescue/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-rescue/server-rescue-req.xml3
-rw-r--r--doc/api_samples/os-rescue/server-rescue.xml2
-rw-r--r--doc/api_samples/os-rescue/server-unrescue-req.xml2
-rw-r--r--doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml7
-rw-r--r--doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml9
-rw-r--r--doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml11
-rw-r--r--doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml9
-rw-r--r--doc/api_samples/os-security-groups/security-group-add-post-req.xml4
-rw-r--r--doc/api_samples/os-security-groups/security-group-post-req.xml5
-rw-r--r--doc/api_samples/os-security-groups/security-group-remove-post-req.xml4
-rw-r--r--doc/api_samples/os-security-groups/security-groups-create-resp.xml7
-rw-r--r--doc/api_samples/os-security-groups/security-groups-get-resp.xml5
-rw-r--r--doc/api_samples/os-security-groups/security-groups-list-get-resp.xml7
-rw-r--r--doc/api_samples/os-security-groups/server-post-req.xml19
-rw-r--r--doc/api_samples/os-security-groups/server-post-resp.xml9
-rw-r--r--doc/api_samples/os-security-groups/server-security-groups-list-resp.xml7
-rw-r--r--doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml18
-rw-r--r--doc/api_samples/os-server-diagnostics/server-post-req.xml19
-rw-r--r--doc/api_samples/os-server-diagnostics/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-external-events/event-create-req.xml9
-rw-r--r--doc/api_samples/os-server-external-events/event-create-resp.xml10
-rw-r--r--doc/api_samples/os-server-external-events/server-post-req.xml19
-rw-r--r--doc/api_samples/os-server-external-events/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-group-quotas/limit-get-resp.xml34
-rw-r--r--doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml17
-rw-r--r--doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml16
-rw-r--r--doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml17
-rw-r--r--doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml17
-rw-r--r--doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml17
-rw-r--r--doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml4
-rw-r--r--doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml17
-rw-r--r--doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml40
-rw-r--r--doc/api_samples/os-server-groups/server-groups-get-resp.xml8
-rw-r--r--doc/api_samples/os-server-groups/server-groups-list-resp.xml10
-rw-r--r--doc/api_samples/os-server-groups/server-groups-post-req.xml5
-rw-r--r--doc/api_samples/os-server-groups/server-groups-post-resp.xml8
-rw-r--r--doc/api_samples/os-server-list-multi-status/server-post-req.xml19
-rw-r--r--doc/api_samples/os-server-list-multi-status/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-list-multi-status/servers-list-resp.xml7
-rw-r--r--doc/api_samples/os-server-password/get-password-resp.xml2
-rw-r--r--doc/api_samples/os-server-password/server-post-req.xml19
-rw-r--r--doc/api_samples/os-server-password/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-sort-keys/server-post-req.xml3
-rw-r--r--doc/api_samples/os-server-sort-keys/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml7
-rw-r--r--doc/api_samples/os-server-start-stop/server-post-req.xml19
-rw-r--r--doc/api_samples/os-server-start-stop/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-server-start-stop/server_start_stop.xml2
-rw-r--r--doc/api_samples/os-services/service-disable-log-put-req.xml2
-rw-r--r--doc/api_samples/os-services/service-disable-log-put-resp.xml2
-rw-r--r--doc/api_samples/os-services/service-disable-put-req.xml2
-rw-r--r--doc/api_samples/os-services/service-disable-put-resp.xml2
-rw-r--r--doc/api_samples/os-services/service-enable-put-req.xml2
-rw-r--r--doc/api_samples/os-services/service-enable-put-resp.xml2
-rw-r--r--doc/api_samples/os-services/services-get-resp.xml6
-rw-r--r--doc/api_samples/os-services/services-list-get-resp.xml6
-rw-r--r--doc/api_samples/os-shelve/os-shelve-offload.xml2
-rw-r--r--doc/api_samples/os-shelve/os-shelve.xml2
-rw-r--r--doc/api_samples/os-shelve/os-unshelve.xml2
-rw-r--r--doc/api_samples/os-shelve/server-post-req.xml19
-rw-r--r--doc/api_samples/os-shelve/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-simple-tenant-usage/server-post-req.xml19
-rw-r--r--doc/api_samples/os-simple-tenant-usage/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml26
-rw-r--r--doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml13
-rw-r--r--doc/api_samples/os-tenant-networks/networks-list-res.xml13
-rw-r--r--doc/api_samples/os-tenant-networks/networks-post-req.xml7
-rw-r--r--doc/api_samples/os-tenant-networks/networks-post-res.xml6
-rw-r--r--doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml37
-rw-r--r--doc/api_samples/os-used-limits/usedlimits-get-resp.xml37
-rw-r--r--doc/api_samples/os-user-data/userdata-post-req.xml25
-rw-r--r--doc/api_samples/os-user-data/userdata-post-resp.xml6
-rw-r--r--doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml15
-rw-r--r--doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml5
-rw-r--r--doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml15
-rw-r--r--doc/api_samples/os-virtual-interfaces/server-post-req.xml19
-rw-r--r--doc/api_samples/os-virtual-interfaces/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml4
-rw-r--r--doc/api_samples/os-volume-attachment-update/server-post-req.xml19
-rw-r--r--doc/api_samples/os-volume-attachment-update/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-volume-attachment-update/update-volume-req.xml2
-rw-r--r--doc/api_samples/os-volumes/attach-volume-to-server-req.xml2
-rw-r--r--doc/api_samples/os-volumes/attach-volume-to-server-resp.xml2
-rw-r--r--doc/api_samples/os-volumes/list-volume-attachments-resp.xml5
-rw-r--r--doc/api_samples/os-volumes/os-volumes-detail-resp.xml9
-rw-r--r--doc/api_samples/os-volumes/os-volumes-get-resp.xml7
-rw-r--r--doc/api_samples/os-volumes/os-volumes-index-resp.xml9
-rw-r--r--doc/api_samples/os-volumes/os-volumes-post-req.xml3
-rw-r--r--doc/api_samples/os-volumes/os-volumes-post-resp.xml7
-rw-r--r--doc/api_samples/os-volumes/server-post-req.xml19
-rw-r--r--doc/api_samples/os-volumes/server-post-resp.xml6
-rw-r--r--doc/api_samples/os-volumes/snapshot-create-req.xml7
-rw-r--r--doc/api_samples/os-volumes/snapshot-create-resp.xml2
-rw-r--r--doc/api_samples/os-volumes/snapshots-detail-resp.xml6
-rw-r--r--doc/api_samples/os-volumes/snapshots-list-resp.xml6
-rw-r--r--doc/api_samples/os-volumes/snapshots-show-resp.xml2
-rw-r--r--doc/api_samples/os-volumes/volume-attachment-detail-resp.xml2
-rw-r--r--doc/api_samples/server-action-changepassword.xml4
-rw-r--r--doc/api_samples/server-action-confirmresize.xml3
-rw-r--r--doc/api_samples/server-action-createimage.xml8
-rw-r--r--doc/api_samples/server-action-reboot.xml4
-rw-r--r--doc/api_samples/server-action-rebuild-resp.xml19
-rw-r--r--doc/api_samples/server-action-rebuild.xml25
-rw-r--r--doc/api_samples/server-action-resize.xml4
-rw-r--r--doc/api_samples/server-action-revertresize.xml3
-rw-r--r--doc/api_samples/server-get-resp.xml19
-rw-r--r--doc/api_samples/server-ips-network-resp.xml4
-rw-r--r--doc/api_samples/server-ips-resp.xml6
-rw-r--r--doc/api_samples/server-metadata-all-req.xml5
-rw-r--r--doc/api_samples/server-metadata-all-resp.xml4
-rw-r--r--doc/api_samples/server-metadata-req.xml3
-rw-r--r--doc/api_samples/server-metadata-resp.xml2
-rw-r--r--doc/api_samples/server-post-req.xml19
-rw-r--r--doc/api_samples/server-post-resp.xml6
-rw-r--r--doc/api_samples/servers-details-resp.xml21
-rw-r--r--doc/api_samples/servers-list-resp.xml7
-rw-r--r--doc/api_samples/versions-get-resp.xml9
441 files changed, 0 insertions, 4883 deletions
diff --git a/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml
deleted file mode 100644
index 4c72212a74..0000000000
--- a/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<addFixedIp>
- <networkId>1</networkId>
-</addFixedIp>
diff --git a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml
deleted file mode 100644
index 4e6ccdd87c..0000000000
--- a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<removeFixedIp>
- <address>10.0.0.2</address>
-</removeFixedIp>
diff --git a/doc/api_samples/NMN/server-post-req.xml b/doc/api_samples/NMN/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/NMN/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/NMN/server-post-resp.xml b/doc/api_samples/NMN/server-post-resp.xml
deleted file mode 100644
index 7f84ac03df..0000000000
--- a/doc/api_samples/NMN/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" adminPass="uF9wWxBh3mWL">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/image-get-resp.xml b/doc/api_samples/OS-DCF/image-get-resp.xml
deleted file mode 100644
index 448fd33837..0000000000
--- a/doc/api_samples/OS-DCF/image-get-resp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b" OS-DCF:diskConfig="AUTO">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
-</image>
diff --git a/doc/api_samples/OS-DCF/image-list-resp.xml b/doc/api_samples/OS-DCF/image-list-resp.xml
deleted file mode 100644
index eadb6c01bf..0000000000
--- a/doc/api_samples/OS-DCF/image-list-resp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b" OS-DCF:diskConfig="AUTO">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379" OS-DCF:diskConfig="MANUAL">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">False</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
- <metadata>
- <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
- <meta key="ramdisk_id">None</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images>
diff --git a/doc/api_samples/OS-DCF/list-servers-detail-get.xml b/doc/api_samples/OS-DCF/list-servers-detail-get.xml
deleted file mode 100644
index 1675b511bf..0000000000
--- a/doc/api_samples/OS-DCF/list-servers-detail-get.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-12-02T02:15:38Z" hostId="85973b57730e91f4eea36b3e7a2a7e3fdaf56008af335dd59f897a59" name="new-server-test" created="2012-12-02T02:15:38Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="08266bed-2651-4b6c-9dc8-83f0c3ef9d38" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/08266bed-2651-4b6c-9dc8-83f0c3ef9d38" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/08266bed-2651-4b6c-9dc8-83f0c3ef9d38" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-req.xml b/doc/api_samples/OS-DCF/server-action-rebuild-req.xml
deleted file mode 100644
index 1c0fcaa5c4..0000000000
--- a/doc/api_samples/OS-DCF/server-action-rebuild-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
- xmlns:atom="http://www.w3.org/2005/Atom"
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
- OS-DCF:diskConfig="AUTO" /> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml b/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml
deleted file mode 100644
index 1d7b3267c6..0000000000
--- a/doc/api_samples/OS-DCF/server-action-rebuild-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-12-02T02:15:39Z" hostId="981de784ae4d8c49ca075024977828a16e7f3c2beeb19115b0366e17" name="new-server-test" created="2012-12-02T02:15:38Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="10791a94-8900-4d0c-b93d-0debb224882e" adminPass="mTxoVD3eALpv" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/10791a94-8900-4d0c-b93d-0debb224882e" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/10791a94-8900-4d0c-b93d-0debb224882e" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-get-resp.xml b/doc/api_samples/OS-DCF/server-get-resp.xml
deleted file mode 100644
index 3acba49eb5..0000000000
--- a/doc/api_samples/OS-DCF/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-12-02T02:15:37Z" hostId="afa0a883de4743c7a0c164327bda5284b875c50e1a9e30de910ac126" name="new-server-test" created="2012-12-02T02:15:37Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="d5d844c0-ecc3-4202-90ed-2e85b7fe513d" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/d5d844c0-ecc3-4202-90ed-2e85b7fe513d" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/d5d844c0-ecc3-4202-90ed-2e85b7fe513d" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-post-req.xml b/doc/api_samples/OS-DCF/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-DCF/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-post-resp.xml b/doc/api_samples/OS-DCF/server-post-resp.xml
deleted file mode 100644
index c9439943c3..0000000000
--- a/doc/api_samples/OS-DCF/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="900a4ef7-f374-413f-8816-52d3dbfaf498" adminPass="Cj6sZgWq85qm" OS-DCF:diskConfig="AUTO">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/900a4ef7-f374-413f-8816-52d3dbfaf498" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/900a4ef7-f374-413f-8816-52d3dbfaf498" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-resize-post-req.xml b/doc/api_samples/OS-DCF/server-resize-post-req.xml
deleted file mode 100644
index f0a299bca4..0000000000
--- a/doc/api_samples/OS-DCF/server-resize-post-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resize xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
- xmlns:atom="http://www.w3.org/2005/Atom"
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- OS-DCF:diskConfig="AUTO"
- flavorRef="3" /> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-update-put-req.xml b/doc/api_samples/OS-DCF/server-update-put-req.xml
deleted file mode 100644
index f48d8e73dc..0000000000
--- a/doc/api_samples/OS-DCF/server-update-put-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
- xmlns:atom="http://www.w3.org/2005/Atom"
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- OS-DCF:diskConfig="AUTO" /> \ No newline at end of file
diff --git a/doc/api_samples/OS-DCF/server-update-put-resp.xml b/doc/api_samples/OS-DCF/server-update-put-resp.xml
deleted file mode 100644
index cd5ff55616..0000000000
--- a/doc/api_samples/OS-DCF/server-update-put-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-12-02T02:15:40Z" hostId="e987bebf62599c59c4559b249d0f5f300a302d1e9ff22dd1f0c5c4b0" name="new-server-test" created="2012-12-02T02:15:40Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="900a4ef7-f374-413f-8816-52d3dbfaf498" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/900a4ef7-f374-413f-8816-52d3dbfaf498" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/900a4ef7-f374-413f-8816-52d3dbfaf498" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-AZ/server-get-resp.xml b/doc/api_samples/OS-EXT-AZ/server-get-resp.xml
deleted file mode 100644
index 5025af4e81..0000000000
--- a/doc/api_samples/OS-EXT-AZ/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-01-30T14:29:20Z" hostId="471e52951e3182954c5a93489dafc3fc38a9ef3e0b62d26dc740460c" name="new-server-test" created="2013-01-30T14:29:19Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="26ea8424-758d-483a-addc-9a5905afc9e6" OS-EXT-AZ:availability_zone="nova">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/26ea8424-758d-483a-addc-9a5905afc9e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/26ea8424-758d-483a-addc-9a5905afc9e6" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/OS-EXT-AZ/server-post-req.xml b/doc/api_samples/OS-EXT-AZ/server-post-req.xml
deleted file mode 100644
index 68f0933c77..0000000000
--- a/doc/api_samples/OS-EXT-AZ/server-post-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" adminPass="MVk5HPrazHcG">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/OS-EXT-AZ/server-post-resp.xml b/doc/api_samples/OS-EXT-AZ/server-post-resp.xml
deleted file mode 100644
index d8b1f0837a..0000000000
--- a/doc/api_samples/OS-EXT-AZ/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="727a3e47-b047-4d55-b37a-ddae4641df0a" adminPass="L34AhxSuya3R">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/727a3e47-b047-4d55-b37a-ddae4641df0a" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/727a3e47-b047-4d55-b37a-ddae4641df0a" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml b/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml
deleted file mode 100644
index 4cdf793346..0000000000
--- a/doc/api_samples/OS-EXT-AZ/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-01-30T14:29:20Z" hostId="85adf7d0492dedf0a7e3dc44ef7d16186b768ca3df33c4d608e630d9" name="new-server-test" created="2013-01-30T14:29:19Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="a668c72d-2bac-4806-a297-c7c11d97e3b3" OS-EXT-AZ:availability_zone="nova">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/a668c72d-2bac-4806-a297-c7c11d97e3b3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/a668c72d-2bac-4806-a297-c7c11d97e3b3" rel="bookmark"/>
- </server>
-</servers>
diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml
deleted file mode 100644
index c713e3a207..0000000000
--- a/doc/api_samples/OS-EXT-IMG-SIZE/image-get-resp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image xmlns:OS-EXT-IMG-SIZE="http://docs.openstack.org/compute/ext/image_size/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b" OS-EXT-IMG-SIZE:size="74185822">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
-</image>
diff --git a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml b/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml
deleted file mode 100644
index bb3dcbaa87..0000000000
--- a/doc/api_samples/OS-EXT-IMG-SIZE/images-details-get-resp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:OS-EXT-IMG-SIZE="http://docs.openstack.org/compute/ext/image_size/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b" OS-EXT-IMG-SIZE:size="74185822">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6" OS-EXT-IMG-SIZE:size="25165824">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c" OS-EXT-IMG-SIZE:size="58145823">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379" OS-EXT-IMG-SIZE:size="49163826">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">False</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77" OS-EXT-IMG-SIZE:size="26360814">
- <metadata>
- <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
- <meta key="ramdisk_id">None</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175" OS-EXT-IMG-SIZE:size="84035174">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" OS-EXT-IMG-SIZE:size="83594576">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images>
diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml
deleted file mode 100644
index 273ae36e7d..0000000000
--- a/doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-07T18:46:29Z" hostId="068cc5e2de14b6e533a239c6eac0a0bdedcd57cab25450a6d3da43af" name="new-server-test" created="2013-02-07T18:46:28Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-EXT-IPS-MAC/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml
deleted file mode 100644
index b268ba0d39..0000000000
--- a/doc/api_samples/OS-EXT-IPS-MAC/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="752dd57d-933b-4a57-a0ae-4c3431c5abc7" adminPass="B2gvFFjBQCVQ">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/752dd57d-933b-4a57-a0ae-4c3431c5abc7" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/752dd57d-933b-4a57-a0ae-4c3431c5abc7" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml b/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml
deleted file mode 100644
index c2f958a148..0000000000
--- a/doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-02-07T18:40:59Z" hostId="51a80e6ee89b638b2cb57eb4e39d89a725e07c8a698f4d8e256f8665" name="new-server-test" created="2013-02-07T18:40:59Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="0337de6b-1d43-46c8-8804-35669f1dea9a">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/0337de6b-1d43-46c8-8804-35669f1dea9a" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/0337de6b-1d43-46c8-8804-35669f1dea9a" rel="bookmark"/>
- </server>
-</servers>
diff --git a/doc/api_samples/OS-EXT-IPS/server-get-resp.xml b/doc/api_samples/OS-EXT-IPS/server-get-resp.xml
deleted file mode 100644
index 84619ffec7..0000000000
--- a/doc/api_samples/OS-EXT-IPS/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-07T18:46:29Z" hostId="068cc5e2de14b6e533a239c6eac0a0bdedcd57cab25450a6d3da43af" name="new-server-test" created="2013-02-07T18:46:28Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/22e7cf4d-ab7a-4a3d-9599-7d0dbaf9ed55" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-IPS/server-post-req.xml b/doc/api_samples/OS-EXT-IPS/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-EXT-IPS/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-IPS/server-post-resp.xml b/doc/api_samples/OS-EXT-IPS/server-post-resp.xml
deleted file mode 100644
index b268ba0d39..0000000000
--- a/doc/api_samples/OS-EXT-IPS/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="752dd57d-933b-4a57-a0ae-4c3431c5abc7" adminPass="B2gvFFjBQCVQ">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/752dd57d-933b-4a57-a0ae-4c3431c5abc7" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/752dd57d-933b-4a57-a0ae-4c3431c5abc7" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml b/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml
deleted file mode 100644
index 93a3ff2e91..0000000000
--- a/doc/api_samples/OS-EXT-IPS/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-02-07T18:40:59Z" hostId="51a80e6ee89b638b2cb57eb4e39d89a725e07c8a698f4d8e256f8665" name="new-server-test" created="2013-02-07T18:40:59Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="0337de6b-1d43-46c8-8804-35669f1dea9a">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/0337de6b-1d43-46c8-8804-35669f1dea9a" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/0337de6b-1d43-46c8-8804-35669f1dea9a" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml
deleted file mode 100644
index 4b42c3586b..0000000000
--- a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-11-15T19:27:06Z" hostId="6b8205d183f40afad106dbeac44d3872151ef6f36790077ea2ea85fc" name="new-server-test" created="2012-11-15T19:27:05Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="ece641c1-51f5-4190-9342-d9751f28eead" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="80edfa5af48b4894b20eb1d9d2d4424e" OS-EXT-SRV-ATTR:hypervisor_hostname="fake-mini">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/ece641c1-51f5-4190-9342-d9751f28eead" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/ece641c1-51f5-4190-9342-d9751f28eead" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml
deleted file mode 100644
index 1c7833c3cb..0000000000
--- a/doc/api_samples/OS-EXT-SRV-ATTR/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="28f2c75f-61f3-44e5-b8c3-1725be74a831" adminPass="mZ8D3wQe8UtT">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/28f2c75f-61f3-44e5-b8c3-1725be74a831" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/28f2c75f-61f3-44e5-b8c3-1725be74a831" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml
deleted file mode 100644
index 8179a3bf94..0000000000
--- a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-11-15T19:27:06Z" hostId="b348a7376e2e61781829c9b45e63675aa0207632c25ce36c55a4fb2a" name="new-server-test" created="2012-11-15T19:27:06Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="3cadb9e9-f430-4f62-8b9b-3efb671ff1fa" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="2c4d049170fe409abc14942757d63a4e" OS-EXT-SRV-ATTR:hypervisor_hostname="fake-mini">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/3cadb9e9-f430-4f62-8b9b-3efb671ff1fa" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/3cadb9e9-f430-4f62-8b9b-3efb671ff1fa" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-STS/server-get-resp.xml b/doc/api_samples/OS-EXT-STS/server-get-resp.xml
deleted file mode 100644
index 53363a2240..0000000000
--- a/doc/api_samples/OS-EXT-STS/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-07T19:35:10Z" hostId="372afb648339fb6f22faa0b75fdd8834e2382fe02b352af8d7ee0b84" name="new-server-test" created="2013-02-07T19:35:09Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="68647408-85a7-4d9b-85e7-7f1e238983ad" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-STS/server-post-req.xml b/doc/api_samples/OS-EXT-STS/server-post-req.xml
deleted file mode 100644
index 077dd7618c..0000000000
--- a/doc/api_samples/OS-EXT-STS/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/OS-EXT-STS/server-post-resp.xml b/doc/api_samples/OS-EXT-STS/server-post-resp.xml
deleted file mode 100644
index 68f0933c77..0000000000
--- a/doc/api_samples/OS-EXT-STS/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" adminPass="MVk5HPrazHcG">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml b/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml
deleted file mode 100644
index e4dafd70bb..0000000000
--- a/doc/api_samples/OS-EXT-STS/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-12-05T07:35:57Z" hostId="20171312b8f2c42b69b09360e08d7fe257b2e021107be687d0302a96" name="new-server-test" created="2012-12-05T07:35:56Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="085c76aa-a58f-45b8-ba78-4d1e541d5f89" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/085c76aa-a58f-45b8-ba78-4d1e541d5f89" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/085c76aa-a58f-45b8-ba78-4d1e541d5f89" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml b/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-EXT-VIF-NET/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml b/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml
deleted file mode 100644
index d620ed00b0..0000000000
--- a/doc/api_samples/OS-EXT-VIF-NET/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="37443b33-eb80-4eea-90d8-f90778f53dea" adminPass="ffV6E5gsNPpi">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml b/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml
deleted file mode 100644
index d5a587d550..0000000000
--- a/doc/api_samples/OS-EXT-VIF-NET/vifs-list-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<virtual_interfaces
- xmlns:OS-EXT-VIF-NET="http://docs.openstack.org/compute/ext/extended-virtual-interfaces-net/api/v1.1"
- xmlns="http://docs.openstack.org/compute/api/v1.1">
- <virtual_interface id="94edf7aa-565a-469a-8f45-656b4acf8229"
- mac_address="fa:16:3e:7d:31:9a"
- OS-EXT-VIF-NET:net_id="94edf7aa-565a-469a-8f45-656b4acf8230"/>
-</virtual_interfaces>
diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
deleted file mode 100644
index 95d8b5d6d9..0000000000
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors>
diff --git a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml b/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
deleted file mode 100644
index d49c273d64..0000000000
--- a/doc/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
deleted file mode 100644
index 653e77cda2..0000000000
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
deleted file mode 100644
index dc48eebd8d..0000000000
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" OS-FLV-EXT-DATA:ephemeral="0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors>
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml
deleted file mode 100644
index 99aec19ed8..0000000000
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
- xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
- name="flavortest"
- ram="1024"
- vcpus="2"
- disk="10"
- id="666"
- swap="5"
- rxtx_factor="2.0"
- OS-FLV-EXT-DATA:ephemeral="30" /> \ No newline at end of file
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml
deleted file mode 100644
index 7da3e23797..0000000000
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="flavortest" id="666" OS-FLV-EXT-DATA:ephemeral="30">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/666" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/666" rel="bookmark"/>
-</flavor> \ No newline at end of file
diff --git a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml
deleted file mode 100644
index 66843fae33..0000000000
--- a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-req.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<server
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- xmlns:OS-SCH-HNT="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2"
- name='new-server-test'
- imageRef='70a599e0-31e7-49b7-b260-868f441e862b'
- flavorRef='1'
->
- <OS-SCH-HNT:scheduler_hints>
- <hypervisor>xen</hypervisor>
- <near>eb999657-dd6b-464e-8713-95c532ac3b18</near>
- </OS-SCH-HNT:scheduler_hints>
-</server>
diff --git a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml b/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml
deleted file mode 100644
index 59929d8083..0000000000
--- a/doc/api_samples/OS-SCH-HNT/scheduler-hints-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="a14a9bf5-93b3-49e4-85f1-01d7cf2645b4" adminPass="Q6jfHPrnvB9X">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/a14a9bf5-93b3-49e4-85f1-01d7cf2645b4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/a14a9bf5-93b3-49e4-85f1-01d7cf2645b4" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-SRV-USG/server-get-resp.xml b/doc/api_samples/OS-SRV-USG/server-get-resp.xml
deleted file mode 100644
index f5336a1471..0000000000
--- a/doc/api_samples/OS-SRV-USG/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-05-02T19:26:46Z" hostId="d2e0951aac9e7db88dd51f90746dc2094ce3fe7d8e1bc6a46057f7f7" name="new-server-test" created="2013-05-02T19:26:45Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="19dd0e0b-d59f-480f-b175-82c8f921ad5b" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="2013-05-02 19:26:46.727461">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/19dd0e0b-d59f-480f-b175-82c8f921ad5b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/19dd0e0b-d59f-480f-b175-82c8f921ad5b" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-SRV-USG/server-post-req.xml b/doc/api_samples/OS-SRV-USG/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/OS-SRV-USG/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-SRV-USG/server-post-resp.xml b/doc/api_samples/OS-SRV-USG/server-post-resp.xml
deleted file mode 100644
index bac663bd35..0000000000
--- a/doc/api_samples/OS-SRV-USG/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ecaa5d95-14b1-4ee7-ad13-f91614e44167" adminPass="Tczo7hUJw2US">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/ecaa5d95-14b1-4ee7-ad13-f91614e44167" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/ecaa5d95-14b1-4ee7-ad13-f91614e44167" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml b/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml
deleted file mode 100644
index 099f2ded1f..0000000000
--- a/doc/api_samples/OS-SRV-USG/servers-detail-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-05-02T19:26:40Z" hostId="6f0c555353e6a6269b27264081a68cd31eab18b7f5c008975757689a" name="new-server-test" created="2013-05-02T19:26:39Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="ecaa5d95-14b1-4ee7-ad13-f91614e44167" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="2013-05-02 19:26:40.101839">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/ecaa5d95-14b1-4ee7-ad13-f91614e44167" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/ecaa5d95-14b1-4ee7-ad13-f91614e44167" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
deleted file mode 100644
index 41f5a304f7..0000000000
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extensions xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <extension alias="NMN" updated="2011-06-09T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/multinic/api/v1.1" name="Multinic">
- <description>Multiple network support.</description>
- </extension>
- <extension alias="OS-DCF" updated="2011-09-27T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" name="DiskConfig">
- <description>Disk Management Extension.</description>
- </extension>
- <extension alias="OS-EXT-AZ" updated="2013-01-30T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" name="ExtendedAvailabilityZone">
- <description>Extended Availability Zone support.</description>
- </extension>
- <extension alias="OS-EXT-IMG-SIZE" updated="2013-02-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/image_size/api/v1.1" name="ImageSize">
- <description>Adds image size to image listings.</description>
- </extension>
- <extension alias="OS-EXT-IPS" updated="2013-01-06T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" name="ExtendedIps">
- <description>Adds type parameter to the ip list.</description>
- </extension>
- <extension alias="OS-EXT-IPS-MAC" updated="2013-03-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" name="ExtendedIpsMac">
- <description>Adds mac address parameter to the ip list.</description>
- </extension>
- <extension alias="OS-EXT-SRV-ATTR" updated="2011-11-03T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" name="ExtendedServerAttributes">
- <description>Extended Server Attributes support.</description>
- </extension>
- <extension alias="OS-EXT-STS" updated="2011-11-03T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" name="ExtendedStatus">
- <description>Extended Status support.</description>
- </extension>
- <extension alias="OS-EXT-VIF-NET" updated="2013-03-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended-virtual-interfaces-net/api/v1.1" name="ExtendedVIFNet">
- <description>Adds network id parameter to the virtual interface list.</description>
- </extension>
- <extension alias="OS-FLV-DISABLED" updated="2012-08-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" name="FlavorDisabled">
- <description>Support to show the disabled status of a flavor.</description>
- </extension>
- <extension alias="OS-FLV-EXT-DATA" updated="2011-09-14T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" name="FlavorExtraData">
- <description>Provide additional data for flavors.</description>
- </extension>
- <extension alias="OS-SCH-HNT" updated="2011-07-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2" name="SchedulerHints">
- <description>Pass arbitrary key/value pairs to the scheduler.</description>
- </extension>
- <extension alias="OS-SRV-USG" updated="2013-04-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" name="ServerUsage">
- <description>Adds launched_at and terminated_at on Servers.</description>
- </extension>
- <extension alias="os-admin-actions" updated="2011-09-20T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/admin-actions/api/v1.1" name="AdminActions">
- <description>Enable admin-only server actions
-
- Actions include: pause, unpause, suspend, resume, migrate,
- resetNetwork, injectNetworkInfo, lock, unlock, createBackup
- </description>
- </extension>
- <extension alias="os-agents" updated="2012-10-28T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/agents/api/v2" name="Agents">
- <description>Agents support.</description>
- </extension>
- <extension alias="os-aggregates" updated="2012-01-12T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/aggregates/api/v1.1" name="Aggregates">
- <description>Admin-only aggregate administration.</description>
- </extension>
- <extension alias="os-assisted-volume-snapshots" updated="2013-08-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/assisted-volume-snapshots/api/v2" name="AssistedVolumeSnapshots">
- <description>Assisted volume snapshots.</description>
- </extension>
- <extension alias="os-attach-interfaces" updated="2012-07-22T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/interfaces/api/v1.1" name="AttachInterfaces">
- <description>Attach interface support.</description>
- </extension>
- <extension alias="os-availability-zone" updated="2012-12-21T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1" name="AvailabilityZone">
- <description>1. Add availability_zone to the Create Server v1.1 API.
- 2. Add availability zones describing.
- </description>
- </extension>
- <extension alias="os-baremetal-ext-status" updated="2013-08-27T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/baremetal_ext_status/api/v2" name="BareMetalExtStatus">
- <description>Add extended status in Baremetal Nodes v2 API.</description>
- </extension>
- <extension alias="os-baremetal-nodes" updated="2013-01-04T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/baremetal_nodes/api/v2" name="BareMetalNodes">
- <description>Admin-only bare-metal node administration.</description>
- </extension>
- <extension alias="os-block-device-mapping-v2-boot" updated="2013-07-08T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/block_device_mapping_v2_boot/api/v2" name="BlockDeviceMappingV2Boot">
- <description>Allow boot with the new BDM data format.</description>
- </extension>
- <extension alias="os-cell-capacities" updated="2013-05-27T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/cell_capacities/api/v1.1" name="CellCapacities">
- <description>Adding functionality to get cell capacities.</description>
- </extension>
- <extension alias="os-cells" updated="2013-05-14T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/cells/api/v1.1" name="Cells">
- <description>Enables cells-related functionality such as adding neighbor cells,
- listing neighbor cells, and getting the capabilities of the local cell.
- </description>
- </extension>
- <extension alias="os-certificates" updated="2012-01-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/certificates/api/v1.1" name="Certificates">
- <description>Certificates support.</description>
- </extension>
- <extension alias="os-cloudpipe" updated="2011-12-16T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1" name="Cloudpipe">
- <description>Adds actions to create cloudpipe instances.
-
- When running with the Vlan network mode, you need a mechanism to route
- from the public Internet to your vlans. This mechanism is known as a
- cloudpipe.
-
- At the time of creating this class, only OpenVPN is supported. Support for
- a SSH Bastion host is forthcoming.
- </description>
- </extension>
- <extension alias="os-cloudpipe-update" updated="2012-11-14T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/cloudpipe-update/api/v2" name="CloudpipeUpdate">
- <description>Adds the ability to set the vpn ip/port for cloudpipe instances.</description>
- </extension>
- <extension alias="os-config-drive" updated="2012-07-16T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/config_drive/api/v1.1" name="ConfigDrive">
- <description>Config Drive Extension.</description>
- </extension>
- <extension alias="os-console-auth-tokens" updated="2013-08-13T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/consoles-auth-tokens/api/v2" name="ConsoleAuthTokens">
- <description>Console token authentication support.</description>
- </extension>
- <extension alias="os-console-output" updated="2011-12-08T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-console-output/api/v2" name="ConsoleOutput">
- <description>Console log output support, with tailing ability.</description>
- </extension>
- <extension alias="os-consoles" updated="2011-12-23T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-consoles/api/v2" name="Consoles">
- <description>Interactive Console support.</description>
- </extension>
- <extension alias="os-create-server-ext" updated="2011-07-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/createserverext/api/v1.1" name="Createserverext">
- <description>Extended support to the Create Server v1.1 API.</description>
- </extension>
- <extension alias="os-deferred-delete" updated="2011-09-01T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1" name="DeferredDelete">
- <description>Instance deferred delete.</description>
- </extension>
- <extension alias="os-evacuate" updated="2013-01-06T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/evacuate/api/v2" name="Evacuate">
- <description>Enables server evacuation.</description>
- </extension>
- <extension alias="os-extended-evacuate-find-host" updated="2014-02-12T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2" name="ExtendedEvacuateFindHost">
- <description>Enables server evacuation without target host. Scheduler will select
- one to target.
- </description>
- </extension>
- <extension alias="os-extended-floating-ips" updated="2013-04-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_floating_ips/api/v2" name="ExtendedFloatingIps">
- <description>Adds optional fixed_address to the add floating IP command.</description>
- </extension>
- <extension alias="os-extended-hypervisors" updated="2014-01-04T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1" name="ExtendedHypervisors">
- <description>Extended hypervisors support.</description>
- </extension>
- <extension alias="os-extended-networks" updated="2014-05-09T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_networks/api/v2" name="ExtendedNetworks">
- <description>Adds additional fields to networks</description>
- </extension>
- <extension alias="os-extended-quotas" updated="2013-06-09T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_quotas/api/v1.1" name="ExtendedQuotas">
- <description>Adds ability for admins to delete quota
- and optionally force the update Quota command.
- </description>
- </extension>
- <extension alias="os-extended-rescue-with-image" updated="2014-01-04T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_rescue_with_image/api/v2" name="ExtendedRescueWithImage">
- <description>Allow the user to specify the image to use for rescue.</description>
- </extension>
- <extension alias="os-extended-services" updated="2013-05-17T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_services/api/v2" name="ExtendedServices">
- <description>Extended services support.</description>
- </extension>
- <extension alias="os-extended-services-delete" updated="2013-12-10T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_services_delete/api/v2" name="ExtendedServicesDelete">
- <description>Extended services deletion support.</description>
- </extension>
- <extension alias="os-hypervisor-status" updated="2014-04-17T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1" name="HypervisorStatus">
- <description>Show hypervisor status.</description>
- </extension>
- <extension alias="os-extended-volumes" updated="2013-06-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" name="ExtendedVolumes">
- <description>Extended Volumes support.</description>
- </extension>
- <extension alias="os-fixed-ips" updated="2012-10-18T19:25:27Z" namespace="http://docs.openstack.org/compute/ext/fixed_ips/api/v2" name="FixedIPs">
- <description>Fixed IPs support.</description>
- </extension>
- <extension alias="os-flavor-access" updated="2012-08-01T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_access/api/v2" name="FlavorAccess">
- <description>Flavor access support.</description>
- </extension>
- <extension alias="os-flavor-extra-specs" updated="2011-06-23T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1" name="FlavorExtraSpecs">
- <description>Instance type (flavor) extra specs.</description>
- </extension>
- <extension alias="os-flavor-manage" updated="2012-01-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1" name="FlavorManage">
- <description>Flavor create/delete API support.</description>
- </extension>
- <extension alias="os-flavor-rxtx" updated="2012-08-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1" name="FlavorRxtx">
- <description>Support to show the rxtx status of a flavor.</description>
- </extension>
- <extension alias="os-flavor-swap" updated="2012-08-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1" name="FlavorSwap">
- <description>Support to show the swap status of a flavor.</description>
- </extension>
- <extension alias="os-floating-ip-dns" updated="2011-12-23T00:00:00Z" namespace="http://docs.openstack.org/ext/floating_ip_dns/api/v1.1" name="FloatingIpDns">
- <description>Floating IP DNS support.</description>
- </extension>
- <extension alias="os-floating-ip-pools" updated="2012-01-04T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1" name="FloatingIpPools">
- <description>Floating IPs support.</description>
- </extension>
- <extension alias="os-floating-ips" updated="2011-06-16T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/floating_ips/api/v1.1" name="FloatingIps">
- <description>Floating IPs support.</description>
- </extension>
- <extension alias="os-floating-ips-bulk" updated="2012-10-29T19:25:27Z" namespace="http://docs.openstack.org/compute/ext/floating_ips_bulk/api/v2" name="FloatingIpsBulk">
- <description>Bulk handling of Floating IPs.</description>
- </extension>
- <extension alias="os-fping" updated="2012-07-06T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/fping/api/v1.1" name="Fping">
- <description>Fping Management Extension.</description>
- </extension>
- <extension alias="os-hide-server-addresses" updated="2012-12-11T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/hide_server_addresses/api/v1.1" name="HideServerAddresses">
- <description>Support hiding server addresses in certain states.</description>
- </extension>
- <extension alias="os-hosts" updated="2011-06-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/hosts/api/v1.1" name="Hosts">
- <description>Admin-only host administration.</description>
- </extension>
- <extension alias="os-hypervisors" updated="2012-06-21T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/hypervisors/api/v1.1" name="Hypervisors">
- <description>Admin-only hypervisor administration.</description>
- </extension>
- <extension alias="os-instance-actions" updated="2013-02-08T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/instance-actions/api/v1.1" name="InstanceActions">
- <description>View a log of actions and events taken on an instance.</description>
- </extension>
- <extension alias="os-instance_usage_audit_log" updated="2012-07-06T01:00:00Z" namespace="http://docs.openstack.org/ext/services/api/v1.1" name="OSInstanceUsageAuditLog">
- <description>Admin-only Task Log Monitoring.</description>
- </extension>
- <extension alias="os-keypairs" updated="2011-08-08T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/keypairs/api/v1.1" name="Keypairs">
- <description>Keypair Support.</description>
- </extension>
- <extension alias="os-migrations" updated="2013-05-30T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/migrations/api/v2.0" name="Migrations">
- <description>Provide data on migrations.</description>
- </extension>
- <extension alias="os-multiple-create" updated="2012-08-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1" name="MultipleCreate">
- <description>Allow multiple create in the Create Server v1.1 API.</description>
- </extension>
- <extension alias="os-networks" updated="2011-12-23T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-networks/api/v1.1" name="Networks">
- <description>Admin-only Network Management Extension.</description>
- </extension>
- <extension alias="os-networks-associate" updated="2012-11-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/networks_associate/api/v2" name="NetworkAssociationSupport">
- <description>Network association support.</description>
- </extension>
- <extension alias="os-preserve-ephemeral-rebuild" updated="2013-12-17T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/preserve_ephemeral_rebuild/api/v2" name="PreserveEphemeralOnRebuild">
- <description>Allow preservation of the ephemeral partition on rebuild.</description>
- </extension>
- <extension alias="os-quota-class-sets" updated="2012-03-12T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1" name="QuotaClasses">
- <description>Quota classes management support.</description>
- </extension>
- <extension alias="os-quota-sets" updated="2011-08-08T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1" name="Quotas">
- <description>Quotas management support.</description>
- </extension>
- <extension alias="os-rescue" updated="2011-08-18T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/rescue/api/v1.1" name="Rescue">
- <description>Instance rescue mode.</description>
- </extension>
- <extension alias="os-security-group-default-rules" updated="2013-02-05T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/securitygroupdefaultrules/api/v1.1" name="SecurityGroupDefaultRules">
- <description>Default rules for security group support.</description>
- </extension>
- <extension alias="os-security-groups" updated="2013-05-28T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/securitygroups/api/v1.1" name="SecurityGroups">
- <description>Security group support.</description>
- </extension>
- <extension alias="os-server-diagnostics" updated="2011-12-21T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1" name="ServerDiagnostics">
- <description>Allow Admins to view server diagnostics through server action.</description>
- </extension>
- <extension alias="os-server-external-events" updated="2014-02-18T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server-external-events/api/v2" name="ServerExternalEvents">
- <description>Server External Event Triggers.</description>
- </extension>
- <extension alias="os-server-groups" updated="2013-06-20T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/servergroups/api/v2" name="ServerGroups">
- <description>Server group support.</description>
- </extension>
- <extension alias="os-server-group-quotas" updated="2014-07-25T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server-group-quotas/api/v2" name="ServerGroupQuotas">
- <description>Adds quota support to server groups.</description>
- </extension>
- <extension alias="os-server-list-multi-status" updated="2014-05-11T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2" name="ServerListMultiStatus">
- <description>Allow to filter the servers by a set of status values.</description>
- </extension>
- <extension alias="os-server-password" updated="2012-11-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server-password/api/v2" name="ServerPassword">
- <description>Server password support.</description>
- </extension>
- <extension alias="os-server-start-stop" updated="2012-01-23T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/servers/api/v1.1" name="ServerStartStop">
- <description>Start/Stop instance compute API support.</description>
- </extension>
- <extension alias="os-services" updated="2012-10-28T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/services/api/v2" name="Services">
- <description>Services support.</description>
- </extension>
- <extension alias="os-shelve" updated="2013-04-06T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/shelve/api/v1.1" name="Shelve">
- <description>Instance shelve mode.</description>
- </extension>
- <extension alias="os-simple-tenant-usage" updated="2011-08-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1" name="SimpleTenantUsage">
- <description>Simple tenant usage extension.</description>
- </extension>
- <extension alias="os-tenant-networks" updated="2012-03-07T14:46:43Z" namespace="http://docs.openstack.org/compute/ext/os-tenant-networks/api/v2" name="OSTenantNetworks">
- <description>Tenant-based Network Management Extension.</description>
- </extension>
- <extension alias="os-used-limits" updated="2012-07-13T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" name="UsedLimits">
- <description>Provide data on limited resources that are being used.</description>
- </extension>
- <extension alias="os-used-limits-for-admin" updated="2013-05-02T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/used_limits_for_admin/api/v1.1" name="UsedLimitsForAdmin">
- <description>Provide data to admin on limited resources used by other tenants.</description>
- </extension>
- <extension alias="os-user-data" updated="2012-08-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/userdata/api/v1.1" name="UserData">
- <description>Add user_data to the Create Server v1.1 API.</description>
- </extension>
- <extension alias="os-user-quotas" updated="2013-07-18T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/user_quotas/api/v1.1" name="UserQuotas">
- <description>Project user quota support.</description>
- </extension>
- <extension alias="os-virtual-interfaces" updated="2011-08-17T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1" name="VirtualInterfaces">
- <description>Virtual interface support.</description>
- </extension>
- <extension alias="os-volume-attachment-update" updated="2013-06-20T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-volume-attachment-update/api/v2" name="VolumeAttachmentUpdate">
- <description>Support for updating a volume attachment.</description>
- </extension>
- <extension alias="os-volumes" updated="2011-03-25T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/volumes/api/v1.1" name="Volumes">
- <description>Volumes support.</description>
- </extension>
- <extension alias="os-server-sort-keys" updated="2014-05-22T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server_sort_keys/api/v2" name="ServerSortKeys">
- <description>Add sorting support in get Server v2 API.</description>
- </extension>
-</extensions>
diff --git a/doc/api_samples/all_extensions/flavor-get-resp.xml b/doc/api_samples/all_extensions/flavor-get-resp.xml
deleted file mode 100644
index 53f870ec4d..0000000000
--- a/doc/api_samples/all_extensions/flavor-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/all_extensions/flavors-list-resp.xml b/doc/api_samples/all_extensions/flavors-list-resp.xml
deleted file mode 100644
index 435f96be56..0000000000
--- a/doc/api_samples/all_extensions/flavors-list-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor name="m1.tiny" id="1">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor name="m1.small" id="2">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor name="m1.medium" id="3">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor name="m1.large" id="4">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor name="m1.xlarge" id="5">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-changepassword.xml b/doc/api_samples/all_extensions/server-action-changepassword.xml
deleted file mode 100644
index 4326e01617..0000000000
--- a/doc/api_samples/all_extensions/server-action-changepassword.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changePassword
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- adminPass="foo"/> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-confirmresize.xml b/doc/api_samples/all_extensions/server-action-confirmresize.xml
deleted file mode 100644
index ffad7f16ae..0000000000
--- a/doc/api_samples/all_extensions/server-action-confirmresize.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confirmResize
- xmlns="http://docs.openstack.org/compute/api/v1.1"/> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-createimage.xml b/doc/api_samples/all_extensions/server-action-createimage.xml
deleted file mode 100644
index faa6ae7660..0000000000
--- a/doc/api_samples/all_extensions/server-action-createimage.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<createImage
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- name="foo-image">
- <metadata>
- <meta key="myvar">foobar</meta>
- </metadata>
-</createImage> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-reboot.xml b/doc/api_samples/all_extensions/server-action-reboot.xml
deleted file mode 100644
index b36d35801f..0000000000
--- a/doc/api_samples/all_extensions/server-action-reboot.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reboot
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- type="SOFT"/> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-rebuild-resp.xml b/doc/api_samples/all_extensions/server-action-rebuild-resp.xml
deleted file mode 100644
index c183f9e696..0000000000
--- a/doc/api_samples/all_extensions/server-action-rebuild-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-09-25T13:40:46Z" hostId="140a6675f54b67847d7ff7655a3a85f1483ea977e9024a1412f6d8ad" name="foobar" created="2012-09-25T13:40:45Z" userId="fake" tenantId="openstack" accessIPv4="1.2.3.4" accessIPv6="fe80::100" progress="0" id="1e1278ab-7011-4f0b-901f-eea5473b0824" adminPass="seekr3t" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/1e1278ab-7011-4f0b-901f-eea5473b0824" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/1e1278ab-7011-4f0b-901f-eea5473b0824" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-rebuild.xml b/doc/api_samples/all_extensions/server-action-rebuild.xml
deleted file mode 100644
index d39b9d8a38..0000000000
--- a/doc/api_samples/all_extensions/server-action-rebuild.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebuild
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- name="foobar"
- imageRef="http://openstack.example.com/v1.1/32278/images/70a599e0-31e7-49b7-b260-868f441e862b"
- accessIPv4="1.2.3.4"
- accessIPv6="fe80::100"
- adminPass="seekr3t">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</rebuild> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-resize.xml b/doc/api_samples/all_extensions/server-action-resize.xml
deleted file mode 100644
index 8dfb53c6a8..0000000000
--- a/doc/api_samples/all_extensions/server-action-resize.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resize
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- flavorRef="2"/> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-action-revertresize.xml b/doc/api_samples/all_extensions/server-action-revertresize.xml
deleted file mode 100644
index 7981753e75..0000000000
--- a/doc/api_samples/all_extensions/server-action-revertresize.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<revertResize
- xmlns="http://docs.openstack.org/compute/api/v1.1"/> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml
deleted file mode 100644
index 42fd2dd8cd..0000000000
--- a/doc/api_samples/all_extensions/server-get-resp.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-05-02T19:13:53Z" hostId="02da39e5db251d57b0ab8e8a2f902617a4800891ae726af602678299" name="new-server-test" created="2013-05-02T19:13:53Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="f51be755-f78e-4899-b4b9-d8ab979a1589" key_name="None" config_drive="" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="2013-05-02 19:13:53.859580" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="7729a44884d94767a2d239da3d5b4a8a" OS-EXT-SRV-ATTR:hypervisor_hostname="fake-mini" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="aa:bb:cc:dd:ee:ff"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/f51be755-f78e-4899-b4b9-d8ab979a1589" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/f51be755-f78e-4899-b4b9-d8ab979a1589" rel="bookmark"/>
- <security_groups>
- <security_group name="default"/>
- </security_groups>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-post-req.xml b/doc/api_samples/all_extensions/server-post-req.xml
deleted file mode 100644
index 2dbbb4438d..0000000000
--- a/doc/api_samples/all_extensions/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/all_extensions/server-post-resp.xml b/doc/api_samples/all_extensions/server-post-resp.xml
deleted file mode 100644
index 1754dc7005..0000000000
--- a/doc/api_samples/all_extensions/server-post-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="f3053932-a09d-446d-ba6e-4303b6725317" adminPass="phFnce4H8pnP" OS-DCF:diskConfig="AUTO">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="bookmark"/>
- <security_groups>
- <security_group name="default"/>
- </security_groups>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml
deleted file mode 100644
index e58aa25808..0000000000
--- a/doc/api_samples/all_extensions/servers-details-resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-05-02T19:13:58Z" hostId="13233ec6d4eb3659bff165e8db9605421526bb461766ca658f343e50" name="new-server-test" created="2013-05-02T19:13:58Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="99e9e5b5-5a27-4181-88d4-ade79f132103" key_name="None" config_drive="" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="2013-05-02 19:13:58.791386" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="a7b375c2d6fa4fd2a4c2b7eee5154f1e" OS-EXT-SRV-ATTR:hypervisor_hostname="fake-mini" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="aa:bb:cc:dd:ee:ff"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/99e9e5b5-5a27-4181-88d4-ade79f132103" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/99e9e5b5-5a27-4181-88d4-ade79f132103" rel="bookmark"/>
- <security_groups>
- <security_group name="default"/>
- </security_groups>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/all_extensions/servers-list-resp.xml b/doc/api_samples/all_extensions/servers-list-resp.xml
deleted file mode 100644
index 34e7d90f82..0000000000
--- a/doc/api_samples/all_extensions/servers-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server name="new-server-test" id="b28017c2-7909-4318-bc47-ba1419f17709">
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b28017c2-7909-4318-bc47-ba1419f17709" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b28017c2-7909-4318-bc47-ba1419f17709" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/flavor-get-resp.xml b/doc/api_samples/flavor-get-resp.xml
deleted file mode 100644
index 1101fdb56b..0000000000
--- a/doc/api_samples/flavor-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/flavors-list-resp.xml b/doc/api_samples/flavors-list-resp.xml
deleted file mode 100644
index 435f96be56..0000000000
--- a/doc/api_samples/flavors-list-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor name="m1.tiny" id="1">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor name="m1.small" id="2">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor name="m1.medium" id="3">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor name="m1.large" id="4">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor name="m1.xlarge" id="5">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors> \ No newline at end of file
diff --git a/doc/api_samples/image-get-resp.xml b/doc/api_samples/image-get-resp.xml
deleted file mode 100644
index 09ac3e1508..0000000000
--- a/doc/api_samples/image-get-resp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<image xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
-</image>
diff --git a/doc/api_samples/image-meta-key-get.xml b/doc/api_samples/image-meta-key-get.xml
deleted file mode 100644
index 1de6b40781..0000000000
--- a/doc/api_samples/image-meta-key-get.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="kernel_id">nokernel</meta> \ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-req.xml b/doc/api_samples/image-meta-key-put-req.xml
deleted file mode 100644
index 23a6f47182..0000000000
--- a/doc/api_samples/image-meta-key-put-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<meta
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- key="auto_disk_config">False</meta> \ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-resp.xml b/doc/api_samples/image-meta-key-put-resp.xml
deleted file mode 100644
index c989c38a2d..0000000000
--- a/doc/api_samples/image-meta-key-put-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="auto_disk_config">False</meta> \ No newline at end of file
diff --git a/doc/api_samples/image-metadata-get-resp.xml b/doc/api_samples/image-metadata-get-resp.xml
deleted file mode 100644
index 8409016bf4..0000000000
--- a/doc/api_samples/image-metadata-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-req.xml b/doc/api_samples/image-metadata-post-req.xml
deleted file mode 100644
index db1b74572c..0000000000
--- a/doc/api_samples/image-metadata-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="kernel_id">False</meta>
- <meta key="Label">UpdatedImage</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-resp.xml b/doc/api_samples/image-metadata-post-resp.xml
deleted file mode 100644
index 1d96bd9af5..0000000000
--- a/doc/api_samples/image-metadata-post-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="kernel_id">False</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="Label">UpdatedImage</meta>
- <meta key="architecture">x86_64</meta>
- <meta key="auto_disk_config">True</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-req.xml b/doc/api_samples/image-metadata-put-req.xml
deleted file mode 100644
index 454d9294f8..0000000000
--- a/doc/api_samples/image-metadata-put-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="auto_disk_config">True</meta>
- <meta key="Label">Changed</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-resp.xml b/doc/api_samples/image-metadata-put-resp.xml
deleted file mode 100644
index 7011871cc9..0000000000
--- a/doc/api_samples/image-metadata-put-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="auto_disk_config">True</meta>
- <meta key="Label">Changed</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/images-details-get-resp.xml b/doc/api_samples/images-details-get-resp.xml
deleted file mode 100644
index 22c533cbd5..0000000000
--- a/doc/api_samples/images-details-get-resp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">False</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
- <metadata>
- <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
- <meta key="ramdisk_id">None</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images>
diff --git a/doc/api_samples/images-details-resp.xml b/doc/api_samples/images-details-resp.xml
deleted file mode 100644
index 654251a33f..0000000000
--- a/doc/api_samples/images-details-resp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">True</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="auto_disk_config">False</meta>
- <meta key="ramdisk_id">nokernel</meta>
- <meta key="architecture">x86_64</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
- <metadata>
- <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
- <meta key="ramdisk_id">None</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
- <metadata>
- <meta key="kernel_id">nokernel</meta>
- <meta key="ramdisk_id">nokernel</meta>
- </metadata>
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images> \ No newline at end of file
diff --git a/doc/api_samples/images-list-get-resp.xml b/doc/api_samples/images-list-get-resp.xml
deleted file mode 100644
index 685345739b..0000000000
--- a/doc/api_samples/images-list-get-resp.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c">
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379">
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175">
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images>
diff --git a/doc/api_samples/images-list-resp.xml b/doc/api_samples/images-list-resp.xml
deleted file mode 100644
index 0674afb09a..0000000000
--- a/doc/api_samples/images-list-resp.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
- <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c">
- <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379">
- <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
- <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175">
- <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
- <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
- <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
- <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
- </image>
-</images> \ No newline at end of file
diff --git a/doc/api_samples/limit-get-resp.xml b/doc/api_samples/limit-get-resp.xml
deleted file mode 100644
index 02c96ed782..0000000000
--- a/doc/api_samples/limit-get-resp.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <rates>
- <rate regex=".*" uri="*">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
- </rate>
- <rate regex="^/servers" uri="*/servers">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- </rate>
- <rate regex=".*changes-since.*" uri="*changes-since*">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
- </rate>
- <rate regex="^/os-fping" uri="*/os-fping">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
- </rate>
- </rates>
- <absolute>
- <limit name="maxServerMeta" value="128"/>
- <limit name="maxPersonality" value="5"/>
- <limit name="maxImageMeta" value="128"/>
- <limit name="maxPersonalitySize" value="10240"/>
- <limit name="maxSecurityGroupRules" value="20"/>
- <limit name="maxTotalKeypairs" value="100"/>
- <limit name="maxSecurityGroups" value="10"/>
- <limit name="maxTotalCores" value="20"/>
- <limit name="maxTotalFloatingIps" value="10"/>
- <limit name="maxTotalInstances" value="10"/>
- <limit name="maxTotalRAMSize" value="51200"/>
- </absolute>
-</limits>
diff --git a/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml b/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml
deleted file mode 100644
index 0acb176951..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-backup-server.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <createBackup>
- <name>Backup 1</name>
- <backup_type>daily</backup_type>
- <rotation>1</rotation>
- </createBackup> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml b/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml
deleted file mode 100644
index 6091a5ed7b..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <injectNetworkInfo /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml b/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml
deleted file mode 100644
index 35269d76e3..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-live-migrate.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <os-migrateLive>
- <host>6217bf142bb3491995f966af999f9f23</host>
- <block_migration>false</block_migration>
- <disk_over_commit>false</disk_over_commit>
- </os-migrateLive> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml b/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml
deleted file mode 100644
index 943691c746..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-lock-server.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <lock /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-migrate.xml b/doc/api_samples/os-admin-actions/admin-actions-migrate.xml
deleted file mode 100644
index c686d9e19d..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-migrate.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <migrate /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-pause.xml b/doc/api_samples/os-admin-actions/admin-actions-pause.xml
deleted file mode 100644
index 6a61bc26b3..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-pause.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <pause/> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml
deleted file mode 100644
index d800b3decf..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-reset-network.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <resetNetwork /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml
deleted file mode 100644
index 976be070d5..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <os-resetState>
- <state>active</state>
- </os-resetState> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-state.xml b/doc/api_samples/os-admin-actions/admin-actions-reset-state.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-reset-state.xml
+++ /dev/null
diff --git a/doc/api_samples/os-admin-actions/admin-actions-resume.xml b/doc/api_samples/os-admin-actions/admin-actions-resume.xml
deleted file mode 100644
index d53370e158..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-resume.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <resume /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-suspend.xml b/doc/api_samples/os-admin-actions/admin-actions-suspend.xml
deleted file mode 100644
index 1da7328b51..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-suspend.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <suspend /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml b/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml
deleted file mode 100644
index 5c59e3a577..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-unlock-server.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <unlock /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/admin-actions-unpause.xml b/doc/api_samples/os-admin-actions/admin-actions-unpause.xml
deleted file mode 100644
index 1c3b538c13..0000000000
--- a/doc/api_samples/os-admin-actions/admin-actions-unpause.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <unpause /> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/server-post-req.xml b/doc/api_samples/os-admin-actions/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-admin-actions/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-admin-actions/server-post-resp.xml b/doc/api_samples/os-admin-actions/server-post-resp.xml
deleted file mode 100644
index 06f00f80e4..0000000000
--- a/doc/api_samples/os-admin-actions/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="491bb5e9-068e-4fcd-a468-8638ceeffbe9" adminPass="4jXS888UQScr">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/491bb5e9-068e-4fcd-a468-8638ceeffbe9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/491bb5e9-068e-4fcd-a468-8638ceeffbe9" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-agents/agent-post-req.xml b/doc/api_samples/os-agents/agent-post-req.xml
deleted file mode 100644
index b7b7d036ba..0000000000
--- a/doc/api_samples/os-agents/agent-post-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<agent>
- <hypervisor>hypervisor</hypervisor>
- <os>os</os>
- <architecture>x86</architecture>
- <version>8.0</version>
- <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
- <url>http://example.com/path/to/resource</url>
-</agent>
diff --git a/doc/api_samples/os-agents/agent-post-resp.xml b/doc/api_samples/os-agents/agent-post-resp.xml
deleted file mode 100644
index abfe15f909..0000000000
--- a/doc/api_samples/os-agents/agent-post-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agent>
- <url>http://example.com/path/to/resource</url>
- <hypervisor>hypervisor</hypervisor>
- <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
- <version>8.0</version>
- <architecture>x86</architecture>
- <os>os</os>
- <agent_id>1</agent_id>
-</agent>
diff --git a/doc/api_samples/os-agents/agent-update-put-req.xml b/doc/api_samples/os-agents/agent-update-put-req.xml
deleted file mode 100644
index 9a25cefdda..0000000000
--- a/doc/api_samples/os-agents/agent-update-put-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<para>
- <version>7.0</version>
- <url>http://example.com/path/to/resource</url>
- <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</para>
diff --git a/doc/api_samples/os-agents/agent-update-put-resp.xml b/doc/api_samples/os-agents/agent-update-put-resp.xml
deleted file mode 100644
index ce62db3868..0000000000
--- a/doc/api_samples/os-agents/agent-update-put-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agent>
- <url>http://example.com/path/to/resource</url>
- <version>7.0</version>
- <agent_id>1</agent_id>
- <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</agent>
diff --git a/doc/api_samples/os-agents/agents-get-resp.xml b/doc/api_samples/os-agents/agents-get-resp.xml
deleted file mode 100644
index d804245305..0000000000
--- a/doc/api_samples/os-agents/agents-get-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<agents>
- <agent url="http://example.com/path/to/resource" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
-</agents>
diff --git a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml
deleted file mode 100644
index 5f48f043d2..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-add-host-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<add_host host="7c9e00dbca5e4fb88538b021c0f933a5" /> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml b/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml
deleted file mode 100644
index d9b935fd45..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-metadata-post-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set_metadata>
- <metadata>
- <key>value</key>
- </metadata>
-</set_metadata> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-post-req.xml b/doc/api_samples/os-aggregates/aggregate-post-req.xml
deleted file mode 100644
index d25f5f848c..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="name" availability_zone="nova" /> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-post-resp.xml
deleted file mode 100644
index 544271bdc8..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-post-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-10-01 18:50:35.506667</created_at>
- <updated_at>None</updated_at>
- <deleted_at>None</deleted_at>
- <id>1</id>
-</aggregate> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml b/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
deleted file mode 100644
index 87e5d64f9a..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<remove_host host="7c9e00dbca5e4fb88538b021c0f933a5" /> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-req.xml b/doc/api_samples/os-aggregates/aggregate-update-post-req.xml
deleted file mode 100644
index 1eb9c38fdb..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-update-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="newname" availability_zone="nova2" /> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml b/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
deleted file mode 100644
index 25227669be..0000000000
--- a/doc/api_samples/os-aggregates/aggregate-update-post-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>newname</name>
- <availability_zone>nova2</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-12-04 12:04:30.245284</created_at>
- <updated_at>2012-12-04 12:04:30.357795</updated_at>
- <hosts/>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <availability_zone>nova2</availability_zone>
- </metadata>
-</aggregate> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
deleted file mode 100644
index ad11f38597..0000000000
--- a/doc/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-12-04 12:04:27.574038</created_at>
- <updated_at>None</updated_at>
- <hosts>
- <host>392adba19dd449179804eaff16ff4a97</host>
- </hosts>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <availability_zone>nova</availability_zone>
- </metadata>
-</aggregate> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-get-resp.xml
deleted file mode 100644
index 431e59cf45..0000000000
--- a/doc/api_samples/os-aggregates/aggregates-get-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-11-16 06:22:25.587739</created_at>
- <updated_at>None</updated_at>
- <hosts/>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <availability_zone>nova</availability_zone>
- </metadata>
-</aggregate>
diff --git a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml b/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
deleted file mode 100644
index 8d92e14664..0000000000
--- a/doc/api_samples/os-aggregates/aggregates-list-get-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregates>
- <aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-11-16 06:22:25.935099</created_at>
- <updated_at>None</updated_at>
- <hosts/>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <availability_zone>nova</availability_zone>
- </metadata>
- </aggregate>
-</aggregates>
diff --git a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
deleted file mode 100644
index 5e2193d064..0000000000
--- a/doc/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-11-16 06:22:24.864471</created_at>
- <updated_at>None</updated_at>
- <hosts/>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <key>value</key>
- <availability_zone>nova</availability_zone>
- </metadata>
-</aggregate> \ No newline at end of file
diff --git a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml b/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
deleted file mode 100644
index 33dce28384..0000000000
--- a/doc/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
- <name>name</name>
- <availability_zone>nova</availability_zone>
- <deleted>False</deleted>
- <created_at>2012-12-04 12:04:29.722109</created_at>
- <updated_at>None</updated_at>
- <hosts/>
- <deleted_at>None</deleted_at>
- <id>1</id>
- <metadata>
- <availability_zone>nova</availability_zone>
- </metadata>
-</aggregate> \ No newline at end of file
diff --git a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml
deleted file mode 100644
index 925dbf2f1e..0000000000
--- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <snapshot>
- <volume_id>521752a6-acf6-4b2d-bc7a-119f9148cd8c</volume_id>
- <create_info>
- <snapshot_id>421752a6-acf6-4b2d-bc7a-119f9148cd8c</snapshot_id>
- <type>qcow2</type>
- <new_file>new_file_name</new_file>
- </create_info>
- </snapshot>
diff --git a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml b/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml
deleted file mode 100644
index 419d6d4066..0000000000
--- a/doc/api_samples/os-assisted-volume-snapshots/snapshot-create-assisted-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c" id="100"/> \ No newline at end of file
diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml
deleted file mode 100644
index bd3f242653..0000000000
--- a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interfaceAttachment>
- <port_id>ce531f90-199f-48c0-816c-13e38010b442</port_id>
-</interfaceAttachment> \ No newline at end of file
diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml
deleted file mode 100644
index 4b32543717..0000000000
--- a/doc/api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<interfaceAttachment>
- <net_id>3cb9bc59-5699-4588-a4b1-b87f96708bc6</net_id>
- <port_id>ce531f90-199f-48c0-816c-13e38010b442</port_id>
- <fixed_ips>
- <fixed_ip>
- <subnet_id>f8a6e8f8-c2ec-497c-9f23-da9616de54ef</subnet_id>
- <ip_address>192.168.1.3</ip_address>
- </fixed_ip>
- </fixed_ips>
- <port_state>ACTIVE</port_state>
- <mac_addr>fa:16:3e:4c:2c:30</mac_addr>
-</interfaceAttachment> \ No newline at end of file
diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml
deleted file mode 100644
index f1bef407cc..0000000000
--- a/doc/api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<interfaceAttachments>
- <interfaceAttachment>
- <port_state>ACTIVE</port_state>
- <fixed_ips>
- <fixed_ip>
- <subnet_id>f8a6e8f8-c2ec-497c-9f23-da9616de54ef</subnet_id>
- <ip_address>192.168.1.3</ip_address>
- </fixed_ip>
- </fixed_ips>
- <port_id>ce531f90-199f-48c0-816c-13e38010b442</port_id>
- <net_id>3cb9bc59-5699-4588-a4b1-b87f96708bc6</net_id>
- <mac_addr>fa:16:3e:4c:2c:30</mac_addr>
- </interfaceAttachment>
-</interfaceAttachments> \ No newline at end of file
diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml
deleted file mode 100644
index 3392e2cc65..0000000000
--- a/doc/api_samples/os-attach-interfaces/attach-interfaces-list.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interfaceAttachments>
- <interfaceAttachment>
- <item>
- <port_state>ACTIVE</port_state>
- <fixed_ips>
- <fixed_ip>
- <subnet_id>f8a6e8f8-c2ec-497c-9f23-da9616de54ef</subnet_id>
- <ip_address>192.168.1.3</ip_address>
- </fixed_ip>
- </fixed_ips>
- <port_id>ce531f90-199f-48c0-816c-13e38010b442</port_id>
- <net_id>3cb9bc59-5699-4588-a4b1-b87f96708bc6</net_id>
- <mac_addr>fa:16:3e:4c:2c:30</mac_addr>
- </item>
- </interfaceAttachment>
-</interfaceAttachments>
diff --git a/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml b/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml
deleted file mode 100644
index ce3e2fec29..0000000000
--- a/doc/api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interfaceAttachment>
- <port_state>ACTIVE</port_state>
- <fixed_ips>
- <fixed_ip>
- <subnet_id>b6e47749-6bf0-4d6e-ae4b-ba6b5e238510</subnet_id>
- <ip_address>192.168.123.131</ip_address>
- </fixed_ip>
- </fixed_ips>
- <port_id>89e64f2e-86bd-4c19-9155-4548b36fdcb2</port_id>
- <net_id>a9efd207-2c1a-4cdd-a296-d3c7c3211302</net_id>
- <mac_addr>fa:16:3e:a4:1c:12</mac_addr>
-</interfaceAttachment>
diff --git a/doc/api_samples/os-attach-interfaces/server-post-req.xml b/doc/api_samples/os-attach-interfaces/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-attach-interfaces/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-attach-interfaces/server-post-resp.xml b/doc/api_samples/os-attach-interfaces/server-post-resp.xml
deleted file mode 100644
index 0efd9029d5..0000000000
--- a/doc/api_samples/os-attach-interfaces/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="71f1047f-f5db-42f9-b43f-85767bcafda6" adminPass="XVCtnj5P2MnJ">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/71f1047f-f5db-42f9-b43f-85767bcafda6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/71f1047f-f5db-42f9-b43f-85767bcafda6" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-req.xml b/doc/api_samples/os-availability-zone/availability-zone-post-req.xml
deleted file mode 100644
index cbecd35225..0000000000
--- a/doc/api_samples/os-availability-zone/availability-zone-post-req.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1"
- imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
- flavorRef="http://openstack.example.com/openstack/flavors/1"
- name="new-server-test"
- availability_zone="nova">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml b/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml
deleted file mode 100644
index e89bd74eba..0000000000
--- a/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="9196924a-9646-41e9-852a-77b39d7af053" adminPass="a4UHSHEwLeJk">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/9196924a-9646-41e9-852a-77b39d7af053" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/9196924a-9646-41e9-852a-77b39d7af053" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml
deleted file mode 100644
index 63ca9c21e7..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<add_interface
- address="aa:aa:aa:aa:aa:aa"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml
deleted file mode 100644
index 1da1dd2840..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-add-interface-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<interface datapath_id="None" id="1" port_no="None" address="aa:aa:aa:aa:aa:aa"/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml
deleted file mode 100644
index 5a910e3f92..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node
- service_host="host"
- cpus="8"
- memory_mb="8192"
- local_gb="128"
- pm_address="10.1.2.3"
- pm_user="pm_user"
- terminal_port="8000"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml
deleted file mode 100644
index a8b135a7f5..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node instance_uuid="None" pm_address="10.1.2.3" task_state="None" uuid="f76b453b-6392-4e21-9191-fe1e3ddb9b23" pxe_config_path="None" cpus="8" updated_at="None" memory_mb="8192" service_host="host" local_gb="128" id="1" pm_user="pm_user" terminal_port="8000">
- <interfaces/>
-</node> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml
deleted file mode 100644
index 3cbc3ea8a1..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-req.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node
- service_host="host"
- cpus="8"
- memory_mb="8192"
- local_gb="128"
- pm_address="10.1.2.3"
- pm_user="pm_user"
- prov_mac_address="12:34:56:78:90:ab"
- terminal_port="8000"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml
deleted file mode 100644
index 9ae9c30374..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-create-with-address-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node instance_uuid="None" pm_address="10.1.2.3" task_state="None" uuid="cbed812a-7126-41a9-a6c1-f563e7f9af1f" pxe_config_path="None" cpus="8" updated_at="None" memory_mb="8192" service_host="host" local_gb="128" id="1" pm_user="pm_user" terminal_port="8000">
- <interfaces>
- <interface datapath_id="None" id="1" port_no="None" address="12:34:56:78:90:ab"/>
- </interfaces>
-</node> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml
deleted file mode 100644
index 5c4558e969..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-list-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<nodes>
- <node instance_uuid="None" pm_address="10.1.2.3" task_state="None" uuid="f76b453b-6392-4e21-9191-fe1e3ddb9b23" pxe_config_path="None" cpus="8" updated_at="None" memory_mb="8192" service_host="host" local_gb="128" id="1" pm_user="pm_user" terminal_port="8000">
- <interfaces>
- <interface datapath_id="None" id="1" port_no="None" address="aa:aa:aa:aa:aa:aa"/>
- </interfaces>
- </node>
-</nodes> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml
deleted file mode 100644
index 6457b059bd..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-remove-interface-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<remove_interface
- address="aa:aa:aa:aa:aa:aa"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml
deleted file mode 100644
index 542c755b28..0000000000
--- a/doc/api_samples/os-baremetal-ext-status/baremetal-node-show-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node instance_uuid="None" pm_address="10.1.2.3" task_state="None" uuid="8a819ee6-fd03-4122-963c-d924c6cb729f" pxe_config_path="None" cpus="8" updated_at="None" memory_mb="8192" service_host="host" local_gb="128" id="1" pm_user="pm_user" terminal_port="8000">
- <interfaces>
- <interface datapath_id="None" id="1" port_no="None" address="aa:aa:aa:aa:aa:aa"/>
- </interfaces>
-</node> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml
deleted file mode 100644
index 63ca9c21e7..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<add_interface
- address="aa:aa:aa:aa:aa:aa"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml
deleted file mode 100644
index 1da1dd2840..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-add-interface-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<interface datapath_id="None" id="1" port_no="None" address="aa:aa:aa:aa:aa:aa"/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml
deleted file mode 100644
index a06b8d73fe..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node
- service_host="host"
- cpus="8"
- memory_mb="8192"
- local_gb="128"
- pm_address="10.1.2.3"
- pm_user="pm_user"
- terminal_port="8000"
-/>
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml
deleted file mode 100644
index 6a0b3a2666..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-resp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node
- instance_uuid="None"
- pm_address="10.1.2.3"
- cpus="8"
- memory_mb="8192"
- service_host="host"
- local_gb="128"
- id="1"
- pm_user="pm_user"
- terminal_port="8000">
- <interfaces/>
-</node> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml
deleted file mode 100644
index 8065c41c1d..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-req.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node
- service_host="host"
- cpus="8"
- memory_mb="8192"
- local_gb="128"
- pm_address="10.1.2.3"
- pm_user="pm_user"
- prov_mac_address="12:34:56:78:90:ab"
- terminal_port="8000"
-/>
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml
deleted file mode 100644
index 1432629ede..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-create-with-address-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node
- instance_uuid="None"
- pm_address="10.1.2.3"
- cpus="8"
- memory_mb="8192"
- service_host="host"
- local_gb="128"
- id="1"
- pm_user="pm_user"
- terminal_port="8000">
- <interfaces>
- <interface
- datapath_id="None"
- id="1"
- port_no="None"
- address="12:34:56:78:90:ab"/>
- </interfaces>
-</node>
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml
deleted file mode 100644
index 2afc47f67e..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<nodes>
- <node
- instance_uuid="None"
- pm_address="10.1.2.3"
- cpus="8"
- memory_mb="8192"
- service_host="host"
- local_gb="128"
- id="1"
- pm_user="pm_user"
- terminal_port="8000">
- <interfaces>
- <interface
- datapath_id="None"
- id="1"
- port_no="None"
- address="aa:aa:aa:aa:aa:aa"/>
- </interfaces>
- </node>
-</nodes> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml
deleted file mode 100644
index 6457b059bd..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-remove-interface-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<remove_interface
- address="aa:aa:aa:aa:aa:aa"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml b/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml
deleted file mode 100644
index 438ee5921a..0000000000
--- a/doc/api_samples/os-baremetal-nodes/baremetal-node-show-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<node
- instance_uuid="None"
- pm_address="10.1.2.3"
- cpus="8"
- memory_mb="8192"
- service_host="host"
- local_gb="128"
- id="1"
- pm_user="pm_user"
- terminal_port="8000">
- <interfaces>
- <interface
- datapath_id="None"
- id="1"
- port_no="None"
- address="aa:aa:aa:aa:aa:aa"/>
- </interfaces>
-</node> \ No newline at end of file
diff --git a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml b/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml
deleted file mode 100644
index fa791f6ad3..0000000000
--- a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-req.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
- <block_device_mapping_v2>
- <mapping device_name="/dev/sdb1" source_type="blank" destination_type="local" delete_on_termination="True" guest_format="swap" boot_index="-1"></mapping>
- <mapping device_name="/dev/sda1" source_type="volume" destination_type="volume" uuid="fake-volume-id-1" boot_index="0"></mapping>
- </block_device_mapping_v2>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml b/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml
deleted file mode 100644
index 5b4c8bf594..0000000000
--- a/doc/api_samples/os-block-device-mapping-v2-boot/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="fdbce07b-097e-4ab1-8141-b1c847861aa1" adminPass="zA62GVkFvN74">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/fdbce07b-097e-4ab1-8141-b1c847861aa1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/fdbce07b-097e-4ab1-8141-b1c847861aa1" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml b/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml
deleted file mode 100644
index 63672b00bd..0000000000
--- a/doc/api_samples/os-cell-capacities/cells-capacities-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cell xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
- <capacities>
- <ram_free total_mb="7680">
- <unit_by_mb unit="0" mb="8192"/>
- <unit_by_mb unit="13" mb="512"/>
- <unit_by_mb unit="1" mb="4096"/>
- <unit_by_mb unit="3" mb="2048"/>
- <unit_by_mb unit="0" mb="16384"/>
- </ram_free>
- <disk_free total_mb="1052672">
- <unit_by_mb unit="11" mb="81920"/>
- <unit_by_mb unit="46" mb="20480"/>
- <unit_by_mb unit="23" mb="40960"/>
- <unit_by_mb unit="5" mb="163840"/>
- <unit_by_mb unit="0" mb="0"/>
- </disk_free>
- </capacities>
-</cell>
diff --git a/doc/api_samples/os-cells/cells-get-resp.xml b/doc/api_samples/os-cells/cells-get-resp.xml
deleted file mode 100644
index 12256a5bdc..0000000000
--- a/doc/api_samples/os-cells/cells-get-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cell xmlns="http://docs.rackspacecloud.com/servers/api/v1.0" username="username3" rpc_host="None" type="child" name="cell3" rpc_port="None"/> \ No newline at end of file
diff --git a/doc/api_samples/os-cells/cells-list-empty-resp.xml b/doc/api_samples/os-cells/cells-list-empty-resp.xml
deleted file mode 100644
index 6ac77b4bd8..0000000000
--- a/doc/api_samples/os-cells/cells-list-empty-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cells xmlns="http://docs.rackspacecloud.com/servers/api/v1.0"/> \ No newline at end of file
diff --git a/doc/api_samples/os-cells/cells-list-resp.xml b/doc/api_samples/os-cells/cells-list-resp.xml
deleted file mode 100644
index 7d697bb918..0000000000
--- a/doc/api_samples/os-cells/cells-list-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cells xmlns="http://docs.rackspacecloud.com/servers/api/v1.0">
- <cell username="username1" rpc_host="None" type="child" name="cell1" rpc_port="None"/>
- <cell username="username3" rpc_host="None" type="child" name="cell3" rpc_port="None"/>
- <cell username="username5" rpc_host="None" type="child" name="cell5" rpc_port="None"/>
- <cell username="username2" rpc_host="None" type="parent" name="cell2" rpc_port="None"/>
- <cell username="username4" rpc_host="None" type="parent" name="cell4" rpc_port="None"/>
-</cells> \ No newline at end of file
diff --git a/doc/api_samples/os-certificates/certificate-create-req.xml b/doc/api_samples/os-certificates/certificate-create-req.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/api_samples/os-certificates/certificate-create-req.xml
+++ /dev/null
diff --git a/doc/api_samples/os-certificates/certificate-create-resp.xml b/doc/api_samples/os-certificates/certificate-create-resp.xml
deleted file mode 100644
index 07c535b55d..0000000000
--- a/doc/api_samples/os-certificates/certificate-create-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<certificate private_key="-----BEGIN RSA PRIVATE KEY-----&#10;MIICXAIBAAKBgQC4h2d63ijt9l0fIBRY37D3Yj2FYajCMUlftSoHNA4lEw0uTXnH&#10;Jjbd0j7HNlSADWeAMuaoSDNp7CIsXMt6iA/ASN5nFFTZlLRqIzYoI0RHiiSJjvSG&#10;d1n4Yrar1eC8tK3Rld1Zo6rj6tOuIxfFVJajJVZykCAHjGNNvulgfhBXFwIDAQAB&#10;AoGBAIjfxx4YU/vO1lwUC4OwyS92q3OYcPk6XdakJryZHDTb4NcLmNzjt6bqIK7b&#10;2enyB2fMWdNRWvGiueZ2HmiRLDyOGsAVdEsHvL4qbr9EZGTqC8Qxx+zTevWWf6pB&#10;F1zxzbXNQDFZDf9kVsSLCkbMHITnW1k4MrM++9gfCO3WrfehAkEA4nd8TyCCZazq&#10;KMOQwFLTNaiVLeTXCtvGopl4ZNiKYZ1qI3KDXb2wbAyArFuERlotxFlylXpwtlMo&#10;SlI/C/sYqwJBANCX1sdfRJq8DpdP44ThWqOkWFLB9rBiwyyBt8746fX8amwr8eyz&#10;H44/z5GT/Vyp8qFsjkuDzeP93eeDnr2qE0UCP1zipRnPO6x4P5J4o+Y+EmLvwkAQ&#10;nCLYAaCvUbILHrbq2Z2wWjEYnEO03RHUd2xjkGH4TgcBMTmW4e+ZzEIduwJACnIw&#10;LVfWBbG5QVac3EC021EVoz9XbUnk4Eu2usS4Yrs7USN6QBJQWD1V1cKFg6h3ICJh&#10;leKJ4wsJm9h5kKH9yQJBAN8CaX223MlTSuBOVuIOwNA+09iLfx4UCLiH1fGMKDpe&#10;xVcmkM3qCnTqNxrAPSFdT9IyB3IXiaLWbvzl7MfiOwQ=&#10;-----END RSA PRIVATE KEY-----&#10;" data="Certificate:&#10; Data:&#10; Version: 1 (0x0)&#10; Serial Number: 23 (0x17)&#10; Signature Algorithm: md5WithRSAEncryption&#10; Issuer: O=NOVA ROOT, L=Mountain View, ST=California, C=US&#10; Validity&#10; Not Before: Oct 2 19:31:45 2012 GMT&#10; Not After : Oct 2 19:31:45 2013 GMT&#10; Subject: C=US, ST=California, O=OpenStack, OU=NovaDev, CN=openstack-fake-2012-10-02T19:31:45Z&#10; Subject Public Key Info:&#10; Public Key Algorithm: rsaEncryption&#10; RSA Public Key: (1024 bit)&#10; Modulus (1024 bit):&#10; 00:b8:87:67:7a:de:28:ed:f6:5d:1f:20:14:58:df:&#10; b0:f7:62:3d:85:61:a8:c2:31:49:5f:b5:2a:07:34:&#10; 0e:25:13:0d:2e:4d:79:c7:26:36:dd:d2:3e:c7:36:&#10; 54:80:0d:67:80:32:e6:a8:48:33:69:ec:22:2c:5c:&#10; cb:7a:88:0f:c0:48:de:67:14:54:d9:94:b4:6a:23:&#10; 36:28:23:44:47:8a:24:89:8e:f4:86:77:59:f8:62:&#10; b6:ab:d5:e0:bc:b4:ad:d1:95:dd:59:a3:aa:e3:ea:&#10; d3:ae:23:17:c5:54:96:a3:25:56:72:90:20:07:8c:&#10; 63:4d:be:e9:60:7e:10:57:17&#10; Exponent: 65537 (0x10001)&#10; Signature Algorithm: md5WithRSAEncryption&#10; 32:82:ff:8b:92:0e:8d:9c:6b:ce:7e:fe:34:16:2a:4c:47:4f:&#10; c7:28:a2:33:1e:48:56:2e:4b:e8:e8:e3:48:b1:3d:a3:43:21:&#10; ef:83:e7:df:e2:10:91:7e:9a:c0:4d:1e:96:68:2b:b9:f7:84:&#10; 7f:ec:84:8a:bf:bc:5e:50:05:d9:ce:4a:1a:bf:d2:bf:0c:d1:&#10; 7e:ec:64:c3:a5:37:78:a3:a6:2b:a1:b7:1c:cc:c8:b9:78:61:&#10; 98:50:3c:e6:28:34:f1:0e:62:bb:b5:d7:a1:dd:1f:38:c6:0d:&#10; 58:9f:81:67:ff:9c:32:fc:52:7e:6d:8c:91:43:49:fe:e3:48:&#10; bb:40&#10;-----BEGIN CERTIFICATE-----&#10;MIICMzCCAZwCARcwDQYJKoZIhvcNAQEEBQAwTjESMBAGA1UEChMJTk9WQSBST09U&#10;MRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRMwEQYDVQQIEwpDYWxpZm9ybmlhMQsw&#10;CQYDVQQGEwJVUzAeFw0xMjEwMDIxOTMxNDVaFw0xMzEwMDIxOTMxNDVaMHYxCzAJ&#10;BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRIwEAYDVQQKEwlPcGVuU3Rh&#10;Y2sxEDAOBgNVBAsTB05vdmFEZXYxLDAqBgNVBAMTI29wZW5zdGFjay1mYWtlLTIw&#10;MTItMTAtMDJUMTk6MzE6NDVaMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4&#10;h2d63ijt9l0fIBRY37D3Yj2FYajCMUlftSoHNA4lEw0uTXnHJjbd0j7HNlSADWeA&#10;MuaoSDNp7CIsXMt6iA/ASN5nFFTZlLRqIzYoI0RHiiSJjvSGd1n4Yrar1eC8tK3R&#10;ld1Zo6rj6tOuIxfFVJajJVZykCAHjGNNvulgfhBXFwIDAQABMA0GCSqGSIb3DQEB&#10;BAUAA4GBADKC/4uSDo2ca85+/jQWKkxHT8coojMeSFYuS+jo40ixPaNDIe+D59/i&#10;EJF+msBNHpZoK7n3hH/shIq/vF5QBdnOShq/0r8M0X7sZMOlN3ijpiuhtxzMyLl4&#10;YZhQPOYoNPEOYru116HdHzjGDVifgWf/nDL8Un5tjJFDSf7jSLtA&#10;-----END CERTIFICATE-----&#10;"/> \ No newline at end of file
diff --git a/doc/api_samples/os-certificates/certificate-get-root-resp.xml b/doc/api_samples/os-certificates/certificate-get-root-resp.xml
deleted file mode 100644
index 4d7cd96982..0000000000
--- a/doc/api_samples/os-certificates/certificate-get-root-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<certificate private_key="None" data="-----BEGIN CERTIFICATE-----&#10;MIICyzCCAjSgAwIBAgIJAIJ/UoFWKoOUMA0GCSqGSIb3DQEBBAUAME4xEjAQBgNV&#10;BAoTCU5PVkEgUk9PVDEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzETMBEGA1UECBMK&#10;Q2FsaWZvcm5pYTELMAkGA1UEBhMCVVMwHhcNMTIxMDAyMTg1NzQ1WhcNMTMxMDAy&#10;MTg1NzQ1WjBOMRIwEAYDVQQKEwlOT1ZBIFJPT1QxFjAUBgNVBAcTDU1vdW50YWlu&#10;IFZpZXcxEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTMIGfMA0GCSqG&#10;SIb3DQEBAQUAA4GNADCBiQKBgQCg0Bn8WSqbJF3QNTZUxo1TzmFBxuqvhjZLKbnQ&#10;IiShdVIWUK7RC8frq8FJI7dgJNmvkIBn9njABWDoZmurQRCzD65yCSbUc4R2ea5H&#10;IK4wQIui0CJykvMBNjAe3bzztVVs8/ccDTsjtqq3F/KeQkKzQVfSWBrJSmYtG5tO&#10;G+dOSwIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFCljRfaNOsA/&#10;9mHuq0io7Lt83FtaMH4GA1UdIwR3MHWAFCljRfaNOsA/9mHuq0io7Lt83FtaoVKk&#10;UDBOMRIwEAYDVQQKEwlOT1ZBIFJPT1QxFjAUBgNVBAcTDU1vdW50YWluIFZpZXcx&#10;EzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVTggkAgn9SgVYqg5QwDQYJ&#10;KoZIhvcNAQEEBQADgYEAEbpJOOlpKCh5omwfAwAfFg1ml4h/FJiCH3PETmOCc+3l&#10;CtWTBd4MG8AoH7A3PU2JKAGVQ5XWo6+ihpW1RgfQpCnloI6vIeGcws+rSLnlzULt&#10;IvfCJpRg7iQdR3jZGt3295behtP1GsCqipJEulOkOaEIs8iLlXgSOG94Mkwlb4Q=&#10;-----END CERTIFICATE-----&#10;"/> \ No newline at end of file
diff --git a/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml b/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml
deleted file mode 100644
index 253b0426a8..0000000000
--- a/doc/api_samples/os-cloudpipe-update/cloud-pipe-update-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<configure_project>
- <vpn_ip>192.168.1.1</vpn_ip>
- <vpn_port>2000</vpn_port>
-</configure_project> \ No newline at end of file
diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml
deleted file mode 100644
index e80a9113dc..0000000000
--- a/doc/api_samples/os-cloudpipe/cloud-pipe-create-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<cloudpipe
- project_id="cloudpipe-6405f2ca-caf9-493b-a1f6-e55f595d75ab"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml
deleted file mode 100644
index fafa90a3be..0000000000
--- a/doc/api_samples/os-cloudpipe/cloud-pipe-create-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cloudpipe>
- <instance_id>1a17f615-343b-430f-976a-457c029eddb7</instance_id>
-</cloudpipe> \ No newline at end of file
diff --git a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml b/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml
deleted file mode 100644
index 6981aa5bd7..0000000000
--- a/doc/api_samples/os-cloudpipe/cloud-pipe-get-resp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<cloudpipes>
- <cloudpipe>
- <public_ip>127.0.0.1</public_ip>
- <created_at>2012-09-25T18:18:49Z</created_at>
- <public_port>22</public_port>
- <state>down</state>
- <instance_id>1a17f615-343b-430f-976a-457c029eddb7</instance_id>
- <internal_ip>192.168.0.3</internal_ip>
- <project_id>cloudpipe-6405f2ca-caf9-493b-a1f6-e55f595d75ab</project_id>
- </cloudpipe>
-</cloudpipes> \ No newline at end of file
diff --git a/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml b/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml
deleted file mode 100644
index 6bb4c5e7c1..0000000000
--- a/doc/api_samples/os-config-drive/server-config-drive-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-04T13:26:10Z" hostId="7a8c3fc15db5d6227d26d5ef559b77c880bbe99da5ce5f5871fc113e" name="new-server-test" created="2013-02-04T13:26:09Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="3b9e0572-3d7b-4e6f-9c21-35ad0f7dbf95" config_drive="">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/3b9e0572-3d7b-4e6f-9c21-35ad0f7dbf95" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/3b9e0572-3d7b-4e6f-9c21-35ad0f7dbf95" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-config-drive/server-post-req.xml b/doc/api_samples/os-config-drive/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-config-drive/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-config-drive/server-post-resp.xml b/doc/api_samples/os-config-drive/server-post-resp.xml
deleted file mode 100644
index 3cbb199ce3..0000000000
--- a/doc/api_samples/os-config-drive/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="00bba779-f8ae-403e-901d-1af18bcb9187" adminPass="XJqvFkH62TZh">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/00bba779-f8ae-403e-901d-1af18bcb9187" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/00bba779-f8ae-403e-901d-1af18bcb9187" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml b/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml
deleted file mode 100644
index 6de687a91a..0000000000
--- a/doc/api_samples/os-config-drive/servers-config-drive-details-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2013-02-04T13:26:27Z" hostId="2a00edcff768661880eb9c96c951f56c2c5dcd873bb652361008efc7" name="new-server-test" created="2013-02-04T13:26:27Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="515d94d3-aee4-4bd5-bb4e-9601c657372f" config_drive="">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/515d94d3-aee4-4bd5-bb4e-9601c657372f" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/515d94d3-aee4-4bd5-bb4e-9601c657372f" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml b/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml
deleted file mode 100644
index 18ab81e4c3..0000000000
--- a/doc/api_samples/os-console-auth-tokens/get-console-connect-info-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<console>
- <instance_uuid>b48316c5-71e8-45e4-9884-6c78055b9b13</instance_uuid>
- <host>localhost</host>
- <port>5900</port>
- <internal_access_path>51af38c3-555e-4884-a314-6c8cdde37444</internal_access_path>
-</console>
diff --git a/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml b/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml
deleted file mode 100644
index 16cf28832d..0000000000
--- a/doc/api_samples/os-console-auth-tokens/get-rdp-console-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getRDPConsole type="rdp-html5" />
diff --git a/doc/api_samples/os-console-auth-tokens/server-post-req.xml b/doc/api_samples/os-console-auth-tokens/server-post-req.xml
deleted file mode 100644
index 077dd7618c..0000000000
--- a/doc/api_samples/os-console-auth-tokens/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/os-console-auth-tokens/server-post-resp.xml b/doc/api_samples/os-console-auth-tokens/server-post-resp.xml
deleted file mode 100644
index 68f0933c77..0000000000
--- a/doc/api_samples/os-console-auth-tokens/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" adminPass="MVk5HPrazHcG">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/os-console-output/console-output-post-req.xml b/doc/api_samples/os-console-output/console-output-post-req.xml
deleted file mode 100644
index 9024061fcf..0000000000
--- a/doc/api_samples/os-console-output/console-output-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getConsoleOutput length="50" /> \ No newline at end of file
diff --git a/doc/api_samples/os-console-output/console-output-post-resp.xml b/doc/api_samples/os-console-output/console-output-post-resp.xml
deleted file mode 100644
index 9c5bad625f..0000000000
--- a/doc/api_samples/os-console-output/console-output-post-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<output>FAKE CONSOLE OUTPUT
-ANOTHER
-LAST LINE</output> \ No newline at end of file
diff --git a/doc/api_samples/os-console-output/server-post-req.xml b/doc/api_samples/os-console-output/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-console-output/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-console-output/server-post-resp.xml b/doc/api_samples/os-console-output/server-post-resp.xml
deleted file mode 100644
index 0efd9029d5..0000000000
--- a/doc/api_samples/os-console-output/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="71f1047f-f5db-42f9-b43f-85767bcafda6" adminPass="XVCtnj5P2MnJ">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/71f1047f-f5db-42f9-b43f-85767bcafda6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/71f1047f-f5db-42f9-b43f-85767bcafda6" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-consoles/get-rdp-console-post-req.xml b/doc/api_samples/os-consoles/get-rdp-console-post-req.xml
deleted file mode 100644
index 16cf28832d..0000000000
--- a/doc/api_samples/os-consoles/get-rdp-console-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getRDPConsole type="rdp-html5" />
diff --git a/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml b/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml
deleted file mode 100644
index 6c45d6e269..0000000000
--- a/doc/api_samples/os-consoles/get-rdp-console-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<console>
- <type>rdp-html5</type>
- <url>http://example.com:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
-</console>
diff --git a/doc/api_samples/os-consoles/get-serial-console-post-req.xml b/doc/api_samples/os-consoles/get-serial-console-post-req.xml
deleted file mode 100644
index 15c423c930..0000000000
--- a/doc/api_samples/os-consoles/get-serial-console-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getSerialConsole type="serial" />
diff --git a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml b/doc/api_samples/os-consoles/get-serial-console-post-resp.xml
deleted file mode 100644
index 7216750b5f..0000000000
--- a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<console>
- <type>serial</type>
- <url>ws://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
-</console>
diff --git a/doc/api_samples/os-consoles/get-spice-console-post-req.xml b/doc/api_samples/os-consoles/get-spice-console-post-req.xml
deleted file mode 100644
index 59052abea2..0000000000
--- a/doc/api_samples/os-consoles/get-spice-console-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getSPICEConsole type="spice-html5" />
diff --git a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml b/doc/api_samples/os-consoles/get-spice-console-post-resp.xml
deleted file mode 100644
index 113b982afd..0000000000
--- a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<console>
- <type>spice-html5</type>
- <url>http://example.com:6082/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
-</console>
diff --git a/doc/api_samples/os-consoles/get-vnc-console-post-req.xml b/doc/api_samples/os-consoles/get-vnc-console-post-req.xml
deleted file mode 100644
index 00f32c6b92..0000000000
--- a/doc/api_samples/os-consoles/get-vnc-console-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-getVNCConsole type="novnc" />
diff --git a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml b/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
deleted file mode 100644
index 3c7e0c4a38..0000000000
--- a/doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<console>
- <type>novnc</type>
- <url>http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
-</console>
diff --git a/doc/api_samples/os-consoles/server-post-req.xml b/doc/api_samples/os-consoles/server-post-req.xml
deleted file mode 100644
index 077dd7618c..0000000000
--- a/doc/api_samples/os-consoles/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/os-consoles/server-post-resp.xml b/doc/api_samples/os-consoles/server-post-resp.xml
deleted file mode 100644
index 68f0933c77..0000000000
--- a/doc/api_samples/os-consoles/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" adminPass="MVk5HPrazHcG">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/os-deferred-delete/force-delete-post-req.xml b/doc/api_samples/os-deferred-delete/force-delete-post-req.xml
deleted file mode 100644
index ab3477c9c0..0000000000
--- a/doc/api_samples/os-deferred-delete/force-delete-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<forceDelete /> \ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/restore-post-req.xml b/doc/api_samples/os-deferred-delete/restore-post-req.xml
deleted file mode 100644
index a43bef2f54..0000000000
--- a/doc/api_samples/os-deferred-delete/restore-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<restore /> \ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-req.xml b/doc/api_samples/os-deferred-delete/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-deferred-delete/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-resp.xml b/doc/api_samples/os-deferred-delete/server-post-resp.xml
deleted file mode 100644
index 1562cf7165..0000000000
--- a/doc/api_samples/os-deferred-delete/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="43008037-cd16-436e-948d-e084d17c37eb" adminPass="eDu5JojvmLQC">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/43008037-cd16-436e-948d-e084d17c37eb" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/43008037-cd16-436e-948d-e084d17c37eb" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-evacuate/server-evacuate-req.xml b/doc/api_samples/os-evacuate/server-evacuate-req.xml
deleted file mode 100644
index d9f4824b7c..0000000000
--- a/doc/api_samples/os-evacuate/server-evacuate-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<evacuate xmlns="http://docs.openstack.org/compute/api/v2"
- host="TargetHost"
- adminPass="MySecretPass"
- onSharedStorage="True"/>
diff --git a/doc/api_samples/os-evacuate/server-evacuate-resp.xml b/doc/api_samples/os-evacuate/server-evacuate-resp.xml
deleted file mode 100644
index 5823886702..0000000000
--- a/doc/api_samples/os-evacuate/server-evacuate-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<adminPass>MySecretPass</adminPass> \ No newline at end of file
diff --git a/doc/api_samples/os-evacuate/server-post-req.xml b/doc/api_samples/os-evacuate/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-evacuate/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-evacuate/server-post-resp.xml b/doc/api_samples/os-evacuate/server-post-resp.xml
deleted file mode 100644
index 3a31871ba9..0000000000
--- a/doc/api_samples/os-evacuate/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="70b4263f-bae1-4ac4-a1c5-e5bb193767bc" adminPass="ttv8YPD3tRPm">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml
deleted file mode 100644
index 4faf14a785..0000000000
--- a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<evacuate xmlns="http://docs.openstack.org/compute/api/v2"
- adminPass="MySecretPass"
- onSharedStorage="False"/> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml
deleted file mode 100644
index 5823886702..0000000000
--- a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<adminPass>MySecretPass</adminPass> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml
deleted file mode 100644
index ad40d9e731..0000000000
--- a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="b7fe468c-c283-4757-ba25-7e313fa55617" adminPass="CiyJLbaJS3j3">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b7fe468c-c283-4757-ba25-7e313fa55617" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b7fe468c-c283-4757-ba25-7e313fa55617" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/api_samples/os-extended-floating-ips/floating-ips-create-nopool-req.xml
+++ /dev/null
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml
deleted file mode 100644
index f77525e749..0000000000
--- a/doc/api_samples/os-extended-floating-ips/floating-ips-create-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<pool>nova</pool> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml
deleted file mode 100644
index e0f68ef503..0000000000
--- a/doc/api_samples/os-extended-floating-ips/floating-ips-create-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml
deleted file mode 100644
index da6f0d4ce9..0000000000
--- a/doc/api_samples/os-extended-floating-ips/floating-ips-list-empty-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips/> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml b/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml
deleted file mode 100644
index 78348be553..0000000000
--- a/doc/api_samples/os-extended-floating-ips/floating-ips-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips>
- <floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>
- <floating_ip instance_id="None" ip="10.10.10.2" fixed_ip="None" id="2" pool="nova"/>
-</floating_ips> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml
deleted file mode 100644
index 4fd6ea8f9e..0000000000
--- a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisor vcpus_used="0" hypervisor_type="fake" local_gb_used="0" hypervisor_hostname="fake-mini" memory_mb_used="512" memory_mb="8192" current_workload="0" vcpus="1" cpu_info="?" running_vms="0" free_disk_gb="1028" hypervisor_version="1000" disk_available_least="0" host_ip="1.1.1.1" local_gb="1028" free_ram_mb="7680" id="1">
- <service host="807e1a43ceb740138eea32969c3e9fe5" id="2"/>
-</hypervisor>
diff --git a/doc/api_samples/os-extended-networks/network-create-req.xml b/doc/api_samples/os-extended-networks/network-create-req.xml
deleted file mode 100644
index 3cc79bd837..0000000000
--- a/doc/api_samples/os-extended-networks/network-create-req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<network>
- <label>new net 111</label>
- <cidr>10.20.105.0/24</cidr>
- <mtu>9000</mtu>
- <dhcp_server>10.20.105.2</dhcp_server>
- <enable_dhcp>False</enable_dhcp>
- <share_address>True</share_address>
- <allowed_start>10.20.105.10</allowed_start>
- <allowed_end>10.20.105.200</allowed_end>
-</network>
diff --git a/doc/api_samples/os-extended-networks/network-create-resp.xml b/doc/api_samples/os-extended-networks/network-create-resp.xml
deleted file mode 100644
index 9f16171ed7..0000000000
--- a/doc/api_samples/os-extended-networks/network-create-resp.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network>
- <bridge>None</bridge>
- <vpn_public_port>None</vpn_public_port>
- <dhcp_start>10.20.105.2</dhcp_start>
- <bridge_interface>None</bridge_interface>
- <share_address>True</share_address>
- <updated_at>None</updated_at>
- <id>a931ead3-4c5c-4b85-a90e-b248ffa71134</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.20.105.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>new net 111</label>
- <priority>None</priority>
- <project_id>None</project_id>
- <vpn_private_address>None</vpn_private_address>
- <deleted>False</deleted>
- <vlan>None</vlan>
- <broadcast>10.20.105.255</broadcast>
- <netmask>255.255.255.0</netmask>
- <injected>None</injected>
- <cidr>10.20.105.0/24</cidr>
- <vpn_public_address>None</vpn_public_address>
- <multi_host>None</multi_host>
- <enable_dhcp>False</enable_dhcp>
- <dns2>None</dns2>
- <created_at>None</created_at>
- <host>None</host>
- <mtu>9000</mtu>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dhcp_server>10.20.105.2</dhcp_server>
- <dns1>None</dns1>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-networks/network-show-resp.xml b/doc/api_samples/os-extended-networks/network-show-resp.xml
deleted file mode 100644
index 2f3176fbc3..0000000000
--- a/doc/api_samples/os-extended-networks/network-show-resp.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network>
- <bridge>br100</bridge>
- <vpn_public_port>1000</vpn_public_port>
- <dhcp_start>10.0.0.3</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <share_address>False</share_address>
- <updated_at>2011-08-16 09:26:13.048257</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_0</label>
- <priority>None</priority>
- <project_id>1234</project_id>
- <vpn_private_address>10.0.0.2</vpn_private_address>
- <deleted>False</deleted>
- <vlan>100</vlan>
- <broadcast>10.0.0.7</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.0/29</cidr>
- <vpn_public_address>127.0.0.1</vpn_public_address>
- <multi_host>False</multi_host>
- <enable_dhcp>True</enable_dhcp>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.387525</created_at>
- <host>nsokolov-desktop</host>
- <mtu>None</mtu>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dhcp_server>10.0.0.1</dhcp_server>
- <dns1>None</dns1>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-networks/networks-list-resp.xml b/doc/api_samples/os-extended-networks/networks-list-resp.xml
deleted file mode 100644
index b3b6e8885f..0000000000
--- a/doc/api_samples/os-extended-networks/networks-list-resp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<networks>
- <network>
- <bridge>br100</bridge>
- <vpn_public_port>1000</vpn_public_port>
- <dhcp_start>10.0.0.3</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <share_address>False</share_address>
- <updated_at>2011-08-16 09:26:13.048257</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_0</label>
- <priority>None</priority>
- <project_id>1234</project_id>
- <vpn_private_address>10.0.0.2</vpn_private_address>
- <deleted>False</deleted>
- <vlan>100</vlan>
- <broadcast>10.0.0.7</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.0/29</cidr>
- <vpn_public_address>127.0.0.1</vpn_public_address>
- <multi_host>False</multi_host>
- <enable_dhcp>True</enable_dhcp>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.387525</created_at>
- <host>nsokolov-desktop</host>
- <mtu>None</mtu>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dhcp_server>10.0.0.1</dhcp_server>
- <dns1>None</dns1>
- </network>
- <network>
- <bridge>br101</bridge>
- <vpn_public_port>1001</vpn_public_port>
- <dhcp_start>10.0.0.11</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <share_address>False</share_address>
- <updated_at>None</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf000</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.9</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_1</label>
- <priority>None</priority>
- <project_id>None</project_id>
- <vpn_private_address>10.0.0.10</vpn_private_address>
- <deleted>False</deleted>
- <vlan>101</vlan>
- <broadcast>10.0.0.15</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.10/29</cidr>
- <vpn_public_address>None</vpn_public_address>
- <multi_host>False</multi_host>
- <enable_dhcp>True</enable_dhcp>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.885495</created_at>
- <host>None</host>
- <mtu>None</mtu>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dhcp_server>10.0.0.9</dhcp_server>
- <dns1>None</dns1>
- </network>
-</networks> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml b/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml
deleted file mode 100644
index 499b890f03..0000000000
--- a/doc/api_samples/os-extended-quotas/quotas-update-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <force>True</force>
- <instances>45</instances>
-</quota_set> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml b/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml
deleted file mode 100644
index cd1b80ba0f..0000000000
--- a/doc/api_samples/os-extended-quotas/quotas-update-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>45</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml b/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml
deleted file mode 100644
index b0da738c4c..0000000000
--- a/doc/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="RESCUE" updated="2012-09-19T11:44:22Z" hostId="8eb4062a49009f6ee8066fbe1ed4c60d67b0a4ebd4434f51d8f03293" name="new-server-test" created="2012-09-19T11:44:22Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="eb2b2fbb-a6f8-4363-9007-e9a9098ea080">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml b/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-extended-rescue-with-image/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml b/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml
deleted file mode 100644
index 3a31871ba9..0000000000
--- a/doc/api_samples/os-extended-rescue-with-image/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="70b4263f-bae1-4ac4-a1c5-e5bb193767bc" adminPass="ttv8YPD3tRPm">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml b/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml
deleted file mode 100644
index 7372633729..0000000000
--- a/doc/api_samples/os-extended-rescue-with-image/server-rescue-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rescue xmlns="http://docs.openstack.org/compute/api/v1.1"
- adminPass="MySecretPass"/> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml b/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml
deleted file mode 100644
index 5823886702..0000000000
--- a/doc/api_samples/os-extended-rescue-with-image/server-rescue.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<adminPass>MySecretPass</adminPass> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-services-delete/services-get-resp.xml b/doc/api_samples/os-extended-services-delete/services-get-resp.xml
deleted file mode 100644
index b5182a38be..0000000000
--- a/doc/api_samples/os-extended-services-delete/services-get-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<services>
- <service status="disabled" binary="nova-scheduler" zone="internal" state="up" host="host1" updated_at="2012-10-29 13:42:02" id="1"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="up" host="host1" updated_at="2012-10-29 13:42:05" id="2"/>
- <service status="enabled" binary="nova-scheduler" zone="internal" state="down" host="host2" updated_at="2012-09-19 06:55:34" id="3"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="down" host="host2" updated_at="2012-09-18 08:03:38" id="4"/>
-</services>
diff --git a/doc/api_samples/os-extended-volumes/server-get-resp.xml b/doc/api_samples/os-extended-volumes/server-get-resp.xml
deleted file mode 100644
index ea839a2af3..0000000000
--- a/doc/api_samples/os-extended-volumes/server-get-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-07T19:35:10Z" hostId="372afb648339fb6f22faa0b75fdd8834e2382fe02b352af8d7ee0b84" name="new-server-test" created="2013-02-07T19:35:09Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="68647408-85a7-4d9b-85e7-7f1e238983ad">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <os-extended-volumes:volume_attached id="volume_id1"/>
- <os-extended-volumes:volume_attached id="volume_id2"/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-extended-volumes/server-post-req.xml b/doc/api_samples/os-extended-volumes/server-post-req.xml
deleted file mode 100644
index 077dd7618c..0000000000
--- a/doc/api_samples/os-extended-volumes/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/os-extended-volumes/server-post-resp.xml b/doc/api_samples/os-extended-volumes/server-post-resp.xml
deleted file mode 100644
index 68f0933c77..0000000000
--- a/doc/api_samples/os-extended-volumes/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" adminPass="MVk5HPrazHcG">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/os-extended-volumes/servers-detail-resp.xml b/doc/api_samples/os-extended-volumes/servers-detail-resp.xml
deleted file mode 100644
index e95c17b44d..0000000000
--- a/doc/api_samples/os-extended-volumes/servers-detail-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-12-05T07:35:57Z" hostId="20171312b8f2c42b69b09360e08d7fe257b2e021107be687d0302a96" name="new-server-test" created="2012-12-05T07:35:56Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="085c76aa-a58f-45b8-ba78-4d1e541d5f89">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <os-extended-volumes:volume_attached id="volume_id1"/>
- <os-extended-volumes:volume_attached id="volume_id2"/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/085c76aa-a58f-45b8-ba78-4d1e541d5f89" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/085c76aa-a58f-45b8-ba78-4d1e541d5f89" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-fixed-ips/fixedip-post-req.xml b/doc/api_samples/os-fixed-ips/fixedip-post-req.xml
deleted file mode 100644
index e29b685be2..0000000000
--- a/doc/api_samples/os-fixed-ips/fixedip-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reserve>None</reserve> \ No newline at end of file
diff --git a/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml b/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml
deleted file mode 100644
index a9676721f3..0000000000
--- a/doc/api_samples/os-fixed-ips/fixedips-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<fixed_ip>
- <cidr>192.168.1.0/24</cidr>
- <hostname>openstack</hostname>
- <host>host</host>
- <address>192.168.1.1</address>
-</fixed_ip> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
deleted file mode 100644
index ab9ec8ba70..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addTenantAccess>
- <tenant>fake_tenant</tenant>
-</addTenantAccess> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
deleted file mode 100644
index 1e55ad2f95..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-add-tenant-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor_access>
- <access tenant_id="fake_tenant" flavor_id="10"/>
-</flavor_access> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-req.xml b/doc/api_samples/os-flavor-access/flavor-access-create-req.xml
deleted file mode 100644
index 81256cf256..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-create-req.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
- xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v1.1"
- name="test_flavor"
- ram="1024"
- vcpus="2"
- disk="10"
- id="10"
- os-flavor-access:is_public="False"
-/> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml
deleted file mode 100644
index 5c40d3aeaa..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-create-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="test_flavor" id="10" os-flavor-access:is_public="False">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/10" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/10" rel="bookmark"/>
-</flavor> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
deleted file mode 100644
index 3099fa98f8..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-detail-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors>
diff --git a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
deleted file mode 100644
index 1e55ad2f95..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-list-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor_access>
- <access tenant_id="fake_tenant" flavor_id="10"/>
-</flavor_access> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
deleted file mode 100644
index fc296c3022..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<removeTenantAccess>
- <tenant>fake_tenant</tenant>
-</removeTenantAccess> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
deleted file mode 100644
index 80d1ecc48c..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-remove-tenant-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor_access/>
diff --git a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml b/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
deleted file mode 100644
index 3fa7f0c431..0000000000
--- a/doc/api_samples/os-flavor-access/flavor-access-show-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml
deleted file mode 100644
index 95c1daab9f..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<extra_specs>
- <key1>value1</key1>
- <key2>value2</key2>
-</extra_specs> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml
deleted file mode 100644
index 06b01a9fca..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extra_specs>
- <key2>value2</key2>
- <key1>value1</key1>
-</extra_specs> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml
deleted file mode 100644
index d57579ba64..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extra_spec key="key1">value1</extra_spec> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml
deleted file mode 100644
index 06b01a9fca..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extra_specs>
- <key2>value2</key2>
- <key1>value1</key1>
-</extra_specs> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml
deleted file mode 100644
index b7ae6732b4..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <key1>new_value1</key1> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml b/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml
deleted file mode 100644
index 13208ad7c9..0000000000
--- a/doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extra_spec key="key1">new_value1</extra_spec> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml b/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml
deleted file mode 100644
index b90c108d0c..0000000000
--- a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flavor>
- <name>test_flavor</name>
- <ram>1024</ram>
- <vcpus>2</vcpus>
- <disk>10</disk>
- <id>10</id>
-</flavor>
diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml b/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml
deleted file mode 100644
index e213ddb311..0000000000
--- a/doc/api_samples/os-flavor-manage/flavor-create-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="test_flavor" id="10">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/10" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/10" rel="bookmark"/>
-</flavor> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
deleted file mode 100644
index a07dfcfb99..0000000000
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
deleted file mode 100644
index c204e7cdfc..0000000000
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" rxtx_factor="1.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors>
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml
deleted file mode 100644
index 7038e1b882..0000000000
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
- xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
- name="flavortest"
- ram="1024"
- vcpus="2"
- disk="10"
- id="100"
- rxtx_factor="2.0" /> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml b/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
deleted file mode 100644
index 8fb4f46be5..0000000000
--- a/doc/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="flavortest" id="100" rxtx_factor="2.0">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/100" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/100" rel="bookmark"/>
-</flavor> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
deleted file mode 100644
index 2cf38aa6cd..0000000000
--- a/doc/api_samples/os-flavor-swap/flavor-swap-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
-</flavor>
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
deleted file mode 100644
index d9a40dd962..0000000000
--- a/doc/api_samples/os-flavor-swap/flavor-swap-list-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <flavor disk="20" vcpus="1" ram="2048" name="m1.small" id="2" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
- </flavor>
- <flavor disk="40" vcpus="2" ram="4096" name="m1.medium" id="3" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
- </flavor>
- <flavor disk="80" vcpus="4" ram="8192" name="m1.large" id="4" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
- </flavor>
- <flavor disk="160" vcpus="8" ram="16384" name="m1.xlarge" id="5" swap="">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
- </flavor>
-</flavors>
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml b/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml
deleted file mode 100644
index b604f9bdf0..0000000000
--- a/doc/api_samples/os-flavor-swap/flavor-swap-post-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
- xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
- name="flavortest"
- ram="1024"
- vcpus="2"
- disk="10"
- id="100"
- swap="5" /> \ No newline at end of file
diff --git a/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml b/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml
deleted file mode 100644
index 7b779cf3f8..0000000000
--- a/doc/api_samples/os-flavor-swap/flavor-swap-post-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="flavortest" id="100" swap="5">
- <atom:link href="http://openstack.example.com/v2/openstack/flavors/100" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/flavors/100" rel="bookmark"/>
-</flavor> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml
deleted file mode 100644
index 36fa411207..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<dns_entry>
- <ip>192.168.53.11</ip>
- <dns_type>A</dns_type>
-</dns_entry> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml
deleted file mode 100644
index 25afe599a9..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-entry-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<dns_entry ip="192.168.1.1" domain="domain1.example.org" type="A" id="None" name="instance1"/> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml
deleted file mode 100644
index df12b61cf9..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<domain_entry>
- <domain>domain1.example.org</domain>
- <scope>public</scope>
- <project>project1</project>
-</domain_entry> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml
deleted file mode 100644
index 8bdf42c41d..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-create-or-update-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<domain_entry project="project1" scope="public" domain="domain1.example.org" availability_zone="None"/> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml
deleted file mode 100644
index 441b977e69..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-get-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<dns_entry ip="192.168.1.1" domain="domain1.example.org" type="None" id="None" name="instance1"/> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml
deleted file mode 100644
index 8d910e09bf..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-entry-list-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<dns_entries>
- <dns_entry ip="192.168.1.1" domain="domain1.example.org" type="None" id="None" name="instance1"/>
-</dns_entries> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml b/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml
deleted file mode 100644
index d874ef058f..0000000000
--- a/doc/api_samples/os-floating-ip-dns/floating-ip-dns-list-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<domain_entries>
- <domain_entry project="project1" scope="public" domain="domain1.example.org" availability_zone="None"/>
-</domain_entries> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml b/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml
deleted file mode 100644
index ca09fbf955..0000000000
--- a/doc/api_samples/os-floating-ip-pools/floatingippools-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ip_pools>
- <floating_ip_pool name="pool1"/>
- <floating_ip_pool name="pool2"/>
-</floating_ip_pools> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml
deleted file mode 100644
index 1fc7305090..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips_bulk_create>
-<ip_range>192.168.1.0/24</ip_range>
-<pool>nova</pool>
-<interface>eth0</interface>
-</floating_ips_bulk_create> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml
deleted file mode 100644
index db80bbfc10..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-create-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips_bulk_create>
- <interface>eth0</interface>
- <ip_range>192.168.1.0/24</ip_range>
- <pool>nova</pool>
-</floating_ips_bulk_create> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml
deleted file mode 100644
index c40f28dc34..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ip_range>192.168.1.0/24</ip_range> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml
deleted file mode 100644
index 3d77af334a..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-delete-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips_bulk_delete>192.168.1.0/24</floating_ips_bulk_delete> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml
deleted file mode 100644
index f8f78c8a23..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-by-host-resp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ip_info>
- <item>
- <interface>eth0</interface>
- <instance_uuid>None</instance_uuid>
- <fixed_ip>None</fixed_ip>
- <project_id>None</project_id>
- <pool>nova</pool>
- <address>10.10.10.3</address>
- </item>
-</floating_ip_info> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml b/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml
deleted file mode 100644
index d632fe46fb..0000000000
--- a/doc/api_samples/os-floating-ips-bulk/floating-ips-bulk-list-resp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ip_info>
- <item>
- <interface>eth0</interface>
- <instance_uuid>None</instance_uuid>
- <fixed_ip>None</fixed_ip>
- <project_id>None</project_id>
- <pool>nova</pool>
- <address>10.10.10.1</address>
- </item>
- <item>
- <interface>eth0</interface>
- <instance_uuid>None</instance_uuid>
- <fixed_ip>None</fixed_ip>
- <project_id>None</project_id>
- <pool>nova</pool>
- <address>10.10.10.2</address>
- </item>
- <item>
- <interface>eth0</interface>
- <instance_uuid>None</instance_uuid>
- <fixed_ip>None</fixed_ip>
- <project_id>None</project_id>
- <pool>nova</pool>
- <address>10.10.10.3</address>
- </item>
-</floating_ip_info> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml b/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml
+++ /dev/null
diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-req.xml b/doc/api_samples/os-floating-ips/floating-ips-create-req.xml
deleted file mode 100644
index f77525e749..0000000000
--- a/doc/api_samples/os-floating-ips/floating-ips-create-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<pool>nova</pool> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml
deleted file mode 100644
index e0f68ef503..0000000000
--- a/doc/api_samples/os-floating-ips/floating-ips-create-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml
deleted file mode 100644
index da6f0d4ce9..0000000000
--- a/doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips/> \ No newline at end of file
diff --git a/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml b/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml
deleted file mode 100644
index 78348be553..0000000000
--- a/doc/api_samples/os-floating-ips/floating-ips-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<floating_ips>
- <floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>
- <floating_ip instance_id="None" ip="10.10.10.2" fixed_ip="None" id="2" pool="nova"/>
-</floating_ips> \ No newline at end of file
diff --git a/doc/api_samples/os-fping/fping-get-details-resp.xml b/doc/api_samples/os-fping/fping-get-details-resp.xml
deleted file mode 100644
index 5b3cb47852..0000000000
--- a/doc/api_samples/os-fping/fping-get-details-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server>
- <project_id>openstack</project_id>
- <id>69d3caab-ed51-4ee7-9d4b-941ee1b45484</id>
- <alive>False</alive>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-fping/fping-get-resp.xml b/doc/api_samples/os-fping/fping-get-resp.xml
deleted file mode 100644
index dbf03778b8..0000000000
--- a/doc/api_samples/os-fping/fping-get-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers>
- <server>
- <project_id>openstack</project_id>
- <id>6a576ebe-8777-473a-ab95-8df34a50dedd</id>
- <alive>False</alive>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-fping/server-post-req.xml b/doc/api_samples/os-fping/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-fping/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-fping/server-post-resp.xml b/doc/api_samples/os-fping/server-post-resp.xml
deleted file mode 100644
index 7f84ac03df..0000000000
--- a/doc/api_samples/os-fping/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" adminPass="uF9wWxBh3mWL">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml b/doc/api_samples/os-hide-server-addresses/server-get-resp.xml
deleted file mode 100644
index caa4a2fa53..0000000000
--- a/doc/api_samples/os-hide-server-addresses/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-12-19T20:32:39Z" hostId="4ae230cb1f554a4a4e02b03bc79c2da5354c3051a70cef6298ace888" name="new-server-test" created="2012-12-19T20:32:37Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="b8b02dd4-b2bb-441d-b52a-ee5c89c832d2">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-hide-server-addresses/server-post-req.xml b/doc/api_samples/os-hide-server-addresses/server-post-req.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/doc/api_samples/os-hide-server-addresses/server-post-req.xml
+++ /dev/null
diff --git a/doc/api_samples/os-hide-server-addresses/server-post-resp.xml b/doc/api_samples/os-hide-server-addresses/server-post-resp.xml
deleted file mode 100644
index 446fe5a9cf..0000000000
--- a/doc/api_samples/os-hide-server-addresses/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="cc81aaca-5c3c-4ac6-bffe-79eb7a12def2" adminPass="4Z9kWS2YcY9f">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/cc81aaca-5c3c-4ac6-bffe-79eb7a12def2" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/cc81aaca-5c3c-4ac6-bffe-79eb7a12def2" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml
deleted file mode 100644
index 0296cc1673..0000000000
--- a/doc/api_samples/os-hide-server-addresses/servers-details-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-12-19T20:32:42Z" hostId="120a7c150d2ad92ce84590d0780c67b9e8be59b7084d0bc292ec0378" name="new-server-test" created="2012-12-19T20:32:40Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="55db7849-8ec4-46dd-8897-492d82282f29">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml b/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml
deleted file mode 100644
index 3225a4c36b..0000000000
--- a/doc/api_samples/os-hide-server-addresses/servers-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server name="new-server-test" id="7c3e9b55-f06c-499b-9d72-266e7806ce5a">
- <atom:link href="http://openstack.example.com/v2/openstack/servers/7c3e9b55-f06c-499b-9d72-266e7806ce5a" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/7c3e9b55-f06c-499b-9d72-266e7806ce5a" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-get-reboot.xml b/doc/api_samples/os-hosts/host-get-reboot.xml
deleted file mode 100644
index 3b3fe27b50..0000000000
--- a/doc/api_samples/os-hosts/host-get-reboot.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<host host="ce8c5f8cde4a46ffb01dec0788ad4dfc" power_action="reboot"/> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-get-resp.xml b/doc/api_samples/os-hosts/host-get-resp.xml
deleted file mode 100644
index 197812c875..0000000000
--- a/doc/api_samples/os-hosts/host-get-resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<host>
- <resource>
- <project>(total)</project>
- <memory_mb>8192</memory_mb>
- <host>ecf3458ac6bf4a299cc2e0efa740f426</host>
- <cpu>1</cpu>
- <disk_gb>1028</disk_gb>
- </resource>
- <resource>
- <project>(used_now)</project>
- <memory_mb>512</memory_mb>
- <host>ecf3458ac6bf4a299cc2e0efa740f426</host>
- <cpu>0</cpu>
- <disk_gb>0</disk_gb>
- </resource>
- <resource>
- <project>(used_max)</project>
- <memory_mb>0</memory_mb>
- <host>ecf3458ac6bf4a299cc2e0efa740f426</host>
- <cpu>0</cpu>
- <disk_gb>0</disk_gb>
- </resource>
-</host> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-get-shutdown.xml b/doc/api_samples/os-hosts/host-get-shutdown.xml
deleted file mode 100644
index 4f5f1a758b..0000000000
--- a/doc/api_samples/os-hosts/host-get-shutdown.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<host host="c82ca6da579440ac930ddee0e6530176" power_action="shutdown"/> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-get-startup.xml b/doc/api_samples/os-hosts/host-get-startup.xml
deleted file mode 100644
index 8d6959946b..0000000000
--- a/doc/api_samples/os-hosts/host-get-startup.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<host host="7fae168ed18140d5a785ade2ac1bd420" power_action="startup"/> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-put-maintenance-req.xml b/doc/api_samples/os-hosts/host-put-maintenance-req.xml
deleted file mode 100644
index 42b995b5d5..0000000000
--- a/doc/api_samples/os-hosts/host-put-maintenance-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<updates>
- <status>enable</status>
- <maintenance_mode>disable</maintenance_mode>
-</updates> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/host-put-maintenance-resp.xml b/doc/api_samples/os-hosts/host-put-maintenance-resp.xml
deleted file mode 100644
index c4d1656281..0000000000
--- a/doc/api_samples/os-hosts/host-put-maintenance-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<host status="enabled" maintenance_mode="off_maintenance" host="d85f05519b57457c83da18c39fa8e00d"/> \ No newline at end of file
diff --git a/doc/api_samples/os-hosts/hosts-list-resp.xml b/doc/api_samples/os-hosts/hosts-list-resp.xml
deleted file mode 100644
index b651e732cb..0000000000
--- a/doc/api_samples/os-hosts/hosts-list-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hosts>
- <host zone="internal" host_name="02ff30050a0d4ce486e60e946a97d28f" service="conductor"/>
- <host zone="nova" host_name="69dd365b9eae459883a50d1fe7b3c40b" service="compute"/>
- <host zone="internal" host_name="059ca4da76cf49e8a3d08d2303542157" service="cert"/>
- <host zone="internal" host_name="ea70b9f0c530497fba8571deb4835ab0" service="network"/>
- <host zone="internal" host_name="7d52ad3988504fb18b0cdfd94dbd267b" service="scheduler"/>
- <host zone="internal" host_name="dc36bce962cc49c2ab916287bcf6c9d3" service="cells"/>
- <host zone="internal" host_name="4bd7bbcc80064d21a5fd0bd53318c6fa" service="consoleauth"/>
-</hosts>
diff --git a/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml b/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml
deleted file mode 100644
index dbfec700ce..0000000000
--- a/doc/api_samples/os-hypervisor-status/hypervisors-show-with-status-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisor vcpus_used="0" hypervisor_type="fake" local_gb_used="0" hypervisor_hostname="fake-mini" memory_mb_used="512" memory_mb="8192" current_workload="0" vcpus="1" cpu_info="?" running_vms="0" free_disk_gb="1028" hypervisor_version="1000" disk_available_least="0" local_gb="1028" free_ram_mb="7680" id="1" state="up" status="enabled">
- <service host="807e1a43ceb740138eea32969c3e9fe5" id="2" disabled_reason="None"/>
-</hypervisor>
diff --git a/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml
deleted file mode 100644
index 6904c089c8..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-detail-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisors>
- <hypervisor vcpus_used="0" hypervisor_type="fake" local_gb_used="0" hypervisor_hostname="fake-mini" memory_mb_used="512" memory_mb="8192" current_workload="0" vcpus="1" cpu_info="?" running_vms="0" free_disk_gb="1028" hypervisor_version="1000" disk_available_least="None" local_gb="1028" free_ram_mb="7680" id="1">
- <service host="4400f556a66d44ce95dfa61e75a23aaf" id="2"/>
- </hypervisor>
-</hypervisors>
diff --git a/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml
deleted file mode 100644
index 8a784c592f..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-list-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisors>
- <hypervisor id="1" hypervisor_hostname="fake-mini"/>
-</hypervisors> \ No newline at end of file
diff --git a/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml
deleted file mode 100644
index 8a784c592f..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-search-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisors>
- <hypervisor id="1" hypervisor_hostname="fake-mini"/>
-</hypervisors> \ No newline at end of file
diff --git a/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml
deleted file mode 100644
index 950a5ab11f..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-servers-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisors>
- <hypervisor id="1" hypervisor_hostname="fake-mini">
- <servers/>
- </hypervisor>
-</hypervisors> \ No newline at end of file
diff --git a/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml
deleted file mode 100644
index 471709fb24..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-show-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisor vcpus_used="0" hypervisor_type="fake" local_gb_used="0" hypervisor_hostname="fake-mini" memory_mb_used="512" memory_mb="8192" current_workload="0" vcpus="1" cpu_info="?" running_vms="0" free_disk_gb="1028" hypervisor_version="1000" disk_available_least="0" local_gb="1028" free_ram_mb="7680" id="1">
- <service host="807e1a43ceb740138eea32969c3e9fe5" id="2"/>
-</hypervisor>
diff --git a/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml
deleted file mode 100644
index 5d10411e3a..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-statistics-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisor_statistics count="1" vcpus_used="0" local_gb_used="0" memory_mb="8192" current_workload="0" vcpus="1" running_vms="0" free_disk_gb="1028" disk_available_least="0" local_gb="1028" free_ram_mb="7680" memory_mb_used="512"/> \ No newline at end of file
diff --git a/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml b/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml
deleted file mode 100644
index 5c1b2cd7dd..0000000000
--- a/doc/api_samples/os-hypervisors/hypervisors-uptime-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hypervisor uptime=" 08:32:11 up 93 days, 18:25, 12 users, load average: 0.20, 0.12, 0.14" id="1" hypervisor_hostname="fake-mini"/> \ No newline at end of file
diff --git a/doc/api_samples/os-instance-actions/instance-action-get-resp.xml b/doc/api_samples/os-instance-actions/instance-action-get-resp.xml
deleted file mode 100644
index 0fa985798c..0000000000
--- a/doc/api_samples/os-instance-actions/instance-action-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<instanceAction instance_uuid="b48316c5-71e8-45e4-9884-6c78055b9b13" user_id="789" start_time="2012-12-05 00:00:00.000000" request_id="req-3293a3f1-b44c-4609-b8d2-d81b105636b8" action="reboot" message="" project_id="147">
- <events finish_time="2012-12-05 01:02:00.000000" start_time="2012-12-05 01:00:02.000000" traceback="" event="schedule" result="Success"/>
- <events finish_time="2012-12-05 01:04:00.000000" start_time="2012-12-05 01:03:00.000000" traceback="" event="compute_create" result="Success"/>
-</instanceAction>
diff --git a/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml b/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml
deleted file mode 100644
index 33896df919..0000000000
--- a/doc/api_samples/os-instance-actions/instance-actions-list-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<instanceActions>
- <instanceAction instance_uuid="b48316c5-71e8-45e4-9884-6c78055b9b13" user_id="789" start_time="2012-12-05 01:00:00.000000" request_id="req-25517360-b757-47d3-be45-0e8d2a01b36a" action="resize" message="" project_id="842"/>
- <instanceAction instance_uuid="b48316c5-71e8-45e4-9884-6c78055b9b13" user_id="789" start_time="2012-12-05 00:00:00.000000" request_id="req-3293a3f1-b44c-4609-b8d2-d81b105636b8" action="reboot" message="" project_id="147"/>
-</instanceActions> \ No newline at end of file
diff --git a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml b/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml
deleted file mode 100644
index 82d157fb95..0000000000
--- a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-index-get-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<instance_usage_audit_logs>
- <total_errors>0</total_errors>
- <total_instances>0</total_instances>
- <log/>
- <num_hosts_running>0</num_hosts_running>
- <num_hosts_done>0</num_hosts_done>
- <num_hosts_not_run>1</num_hosts_not_run>
- <hosts_not_run>
- <item>107debd115684f098d4c73ffac7ec515</item>
- </hosts_not_run>
- <overall_status>0 of 1 hosts done. 0 errors.</overall_status>
- <period_ending>2013-01-01 00:00:00</period_ending>
- <period_beginning>2012-12-01 00:00:00</period_beginning>
- <num_hosts>1</num_hosts>
-</instance_usage_audit_logs> \ No newline at end of file
diff --git a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml b/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml
deleted file mode 100644
index 4536897373..0000000000
--- a/doc/api_samples/os-instance_usage_audit_log/inst-usage-audit-log-show-get-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<instance_usage_audit_log>
- <total_errors>0</total_errors>
- <total_instances>0</total_instances>
- <log/>
- <num_hosts_running>0</num_hosts_running>
- <num_hosts_done>0</num_hosts_done>
- <num_hosts_not_run>1</num_hosts_not_run>
- <hosts_not_run>
- <item>4b54478b73734afcbf0e2676a3303d1a</item>
- </hosts_not_run>
- <overall_status>0 of 1 hosts done. 0 errors.</overall_status>
- <period_ending>2012-07-01 00:00:00</period_ending>
- <period_beginning>2012-06-01 00:00:00</period_beginning>
- <num_hosts>1</num_hosts>
-</instance_usage_audit_log> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.xml b/doc/api_samples/os-keypairs/keypairs-get-resp.xml
deleted file mode 100644
index 131308bf7f..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-get-resp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<keypair>
- <public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTWIBcXl7SSxGWOmzryHuYFYFQajo7uZXACg2juI92lRnQt1yy8aJ1710QZWaBlfluJYaOqBMccYXGxAR1vmZTONuW+lpBjRMqYgNG6ZC46p6z+Akp7Okbf1w1aqZ2rF2kq9OsjpU1x1SuB+xwC9stDv5MXEW2Gt/VPVcl3fVQLgvIoANhQPA5UJU5fRoeWgq0F/GCQtEGo7cQOQO3PC6IOshUPWAI/vRHt1dFGKnJjKJTkTbAuQkH2AnkMEWn6DvFFy8frBl3PwCYWnrResmOuPLvL5MG+Q5c1IrXpQm9ifTpEAstMalLJfHA0h5amQvIeWsj2y2yWyttcHoHg9K5 Generated-by-Nova
-</public_key>
- <user_id>fake</user_id>
- <name>keypair-8cabfb98-b13f-48cb-af1a-068b585eaaf5</name>
- <deleted>False</deleted>
- <created_at>2014-05-07 12:06:00.402696+00:00</created_at>
- <updated_at>None</updated_at>
- <fingerprint>ee:f5:79:02:69:af:ee:07:0f:ce:79:37:fd:5d:94:25</fingerprint>
- <deleted_at>None</deleted_at>
- <id>1</id>
-</keypair> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-import-post-req.xml b/doc/api_samples/os-keypairs/keypairs-import-post-req.xml
deleted file mode 100644
index 6c5f387aa9..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-import-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<keypair>
- <name>keypair-96bbe50e-05e1-4d59-9115-4779a3ebcc2e</name>
- <public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova</public_key>
-</keypair> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml b/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml
deleted file mode 100644
index 18cfce47bd..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-import-post-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<keypair>
- <public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Generated-by-Nova</public_key>
- <user_id>fake</user_id>
- <name>keypair-96bbe50e-05e1-4d59-9115-4779a3ebcc2e</name>
- <fingerprint>1e:2c:9b:56:79:4b:45:77:f9:ca:7a:98:2c:b0:d5:3c</fingerprint>
-</keypair> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-list-resp.xml b/doc/api_samples/os-keypairs/keypairs-list-resp.xml
deleted file mode 100644
index 9771597f7e..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-list-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<keypairs>
- <keypair>
- <public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCWdUoGD7qz9kjbLoY2L0S5CdhUS8RvQ1g62OTgvmWE/bEKDLwaTIFEEpN/0huGk/nxvVZ6VOhv1eSKC3o9dZ2NDk0C4sBsrvJ41uWd1hbq72sDGzVEkJ+925CraioSAbMpRK5Ea7UPWbR8laqrY1TsKtcuxiGJ936bOPIXW12h6Q== Generated-by-Nova
-</public_key>
- <name>keypair-a4c7d228-218b-4c4c-9d99-62e7878ebb1b</name>
- <fingerprint>62:32:23:67:56:ee:6f:51:4c:03:ce:b8:00:f9:41:ff</fingerprint>
- </keypair>
-</keypairs> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-post-req.xml b/doc/api_samples/os-keypairs/keypairs-post-req.xml
deleted file mode 100644
index 4dc4ce4836..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-post-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<keypair>
- <name>keypair-b03122a0-102b-445b-a128-dba267c7cd2a</name>
-</keypair> \ No newline at end of file
diff --git a/doc/api_samples/os-keypairs/keypairs-post-resp.xml b/doc/api_samples/os-keypairs/keypairs-post-resp.xml
deleted file mode 100644
index 88e514cdbe..0000000000
--- a/doc/api_samples/os-keypairs/keypairs-post-resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<keypair>
- <public_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDNa8e/Gfe4572GwEDXlLsCqxsMcuUiF8Fr9RSeW30EuWg8Me5HM/rzqaShmzdHZbN5dvGH15H1yMXTUg8cxcLaOU04IQi/g+BHkGzbxV3gCdODWqjF+5928Ljg6x87e5lxxB6WAoyoGuzghaJXikOihRZSzdityb3DlYuYRfaRMw== Generated-by-Nova
-</public_key>
- <private_key>-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDNa8e/Gfe4572GwEDXlLsCqxsMcuUiF8Fr9RSeW30EuWg8Me5H
-M/rzqaShmzdHZbN5dvGH15H1yMXTUg8cxcLaOU04IQi/g+BHkGzbxV3gCdODWqjF
-+5928Ljg6x87e5lxxB6WAoyoGuzghaJXikOihRZSzdityb3DlYuYRfaRMwIDAQAB
-AoGBAL67q4zqHJRIQDcE/W/t/jI9E3FcoRoluod12P4sbolbacgyiE7+ma1yv5T6
-HLqjWKCYay05YKI5GE3dbIDHsuHnnhd1S5tE2SNY85as8zC0QT6N8eFexh5/0Px4
-dVl3tXKj+Oaovb0tCKoiPVUHIZTsihNPwYqFS2kMuHnUwthxAkEA99Bw2FIWbgq9
-gj37qNGP5Vm2pmK9xU0aSyG2NJKH77CrERgmqrBT41a97BdsJbzuIaAwi4RJaDqm
-AsTFBw312wJBANQ02vVin5NYD4BAfMyCsoNI7pQBCkq6UeK3VAC9ozCBE5BIDqat
-VTx2ijbdlfwGqQVM6g773xuuNebgZJrbrYkCQQDV4YXzfe2z7fsf1MVGMBBkn2h/
-9ErbZa9i1ua+OxWt7qnGaDS/Ls5IMQ5cHN8PNx/Dz9D2KSd+GNg9HXz7mLXvAkEA
-0GvZYomrEZy8HMs5x+PWUPug19ztrtew9Wv6JYAcd9dOz7b2LN6xiOEkfx7D4PTp
-rTsN6AmZ6CYC6vAZ379DgQJAPMZjO9Z9KZ2t2VFu0YgK9LbQ4upbhew7YUmWA5dV
-djCVjJ/0AZgQofvvUDe9FZHtSLt6IN5+jsLAi35Q3iQp9g==
------END RSA PRIVATE KEY-----
-</private_key>
- <user_id>fake</user_id>
- <name>keypair-b03122a0-102b-445b-a128-dba267c7cd2a</name>
- <fingerprint>7f:97:1c:83:27:a3:6b:c5:a6:a2:37:90:4c:be:73:86</fingerprint>
-</keypair> \ No newline at end of file
diff --git a/doc/api_samples/os-migrations/migrations-get.xml b/doc/api_samples/os-migrations/migrations-get.xml
deleted file mode 100644
index f5c59c7f1b..0000000000
--- a/doc/api_samples/os-migrations/migrations-get.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<migrations>
- <migration dest_host="1.2.3.4" status="Done" old_instance_type_id="1" updated_at="2012-10-29 13:42:02" dest_compute="compute2" created_at="2012-10-29 13:42:02" source_node="node1" instance_uuid="instance_id_123" dest_node="node2" id="1234" new_instance_type_id="2" source_compute="compute1"/>
- <migration dest_host="5.6.7.8" status="Done" old_instance_type_id="5" updated_at="2013-10-22 13:42:02" dest_compute="compute20" created_at="2013-10-22 13:42:02" source_node="node10" instance_uuid="instance_id_456" dest_node="node20" id="5678" new_instance_type_id="6" source_compute="compute10"/>
-</migrations> \ No newline at end of file
diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml
deleted file mode 100644
index 7ed374b3f8..0000000000
--- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1"
- imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
- flavorRef="http://openstack.example.com/openstack/flavors/1"
- name="new-server-test"
- min_count="2"
- max_count="3">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml
deleted file mode 100644
index de1df128dd..0000000000
--- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="0857bea2-df83-4810-876a-093a6b9afb15" adminPass="edBzA3AnJP67">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/0857bea2-df83-4810-876a-093a6b9afb15" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/0857bea2-df83-4810-876a-093a6b9afb15" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-multiple-create/multiple-create-post-req.xml b/doc/api_samples/os-multiple-create/multiple-create-post-req.xml
deleted file mode 100644
index abe36f7ff6..0000000000
--- a/doc/api_samples/os-multiple-create/multiple-create-post-req.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1"
- imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
- flavorRef="http://openstack.example.com/openstack/flavors/1"
- name="new-server-test"
- min_count="2"
- max_count="3"
- return_reservation_id="True">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml b/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml
deleted file mode 100644
index 8db4ac2eb2..0000000000
--- a/doc/api_samples/os-multiple-create/multiple-create-post-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" reservation_id="r-fq0lg4za"/> \ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-associate-host-req.xml b/doc/api_samples/os-networks-associate/network-associate-host-req.xml
deleted file mode 100644
index 3221be61d4..0000000000
--- a/doc/api_samples/os-networks-associate/network-associate-host-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<associate_host>testHost</associate_host> \ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml
deleted file mode 100644
index 3c2cc0d843..0000000000
--- a/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<disassociate_host/> \ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml
deleted file mode 100644
index be94feb9f2..0000000000
--- a/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<disassociate_project/> \ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-req.xml
deleted file mode 100644
index bcad8e0a80..0000000000
--- a/doc/api_samples/os-networks-associate/network-disassociate-req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<disassociate/> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-add-req.xml b/doc/api_samples/os-networks/network-add-req.xml
deleted file mode 100644
index 3ba873da36..0000000000
--- a/doc/api_samples/os-networks/network-add-req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<id>1</id> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-req.xml b/doc/api_samples/os-networks/network-create-req.xml
deleted file mode 100644
index 890d7bf3a1..0000000000
--- a/doc/api_samples/os-networks/network-create-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
- <label>new net 111</label>
- <cidr>10.20.105.0/24</cidr>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-resp.xml b/doc/api_samples/os-networks/network-create-resp.xml
deleted file mode 100644
index f638228ef5..0000000000
--- a/doc/api_samples/os-networks/network-create-resp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network>
- <bridge>None</bridge>
- <vpn_public_port>None</vpn_public_port>
- <dhcp_start>10.20.105.2</dhcp_start>
- <bridge_interface>None</bridge_interface>
- <updated_at>None</updated_at>
- <id>1bbbed2b-0daa-47a1-b869-1981c29150b1</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.20.105.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>new net 111</label>
- <priority>None</priority>
- <project_id>None</project_id>
- <vpn_private_address>None</vpn_private_address>
- <deleted>False</deleted>
- <vlan>None</vlan>
- <broadcast>10.20.105.255</broadcast>
- <netmask>255.255.255.0</netmask>
- <injected>None</injected>
- <cidr>10.20.105.0/24</cidr>
- <vpn_public_address>None</vpn_public_address>
- <multi_host>None</multi_host>
- <dns2>None</dns2>
- <created_at>None</created_at>
- <host>None</host>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dns1>None</dns1>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-show-resp.xml b/doc/api_samples/os-networks/network-show-resp.xml
deleted file mode 100644
index 2faed7a286..0000000000
--- a/doc/api_samples/os-networks/network-show-resp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network>
- <bridge>br100</bridge>
- <vpn_public_port>1000</vpn_public_port>
- <dhcp_start>10.0.0.3</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <updated_at>2011-08-16 09:26:13.048257</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_0</label>
- <priority>None</priority>
- <project_id>1234</project_id>
- <vpn_private_address>10.0.0.2</vpn_private_address>
- <deleted>False</deleted>
- <vlan>100</vlan>
- <broadcast>10.0.0.7</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.0/29</cidr>
- <vpn_public_address>127.0.0.1</vpn_public_address>
- <multi_host>False</multi_host>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.387525</created_at>
- <host>nsokolov-desktop</host>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dns1>None</dns1>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-disassociate-req.xml b/doc/api_samples/os-networks/networks-disassociate-req.xml
deleted file mode 100644
index 85762fd0df..0000000000
--- a/doc/api_samples/os-networks/networks-disassociate-req.xml
+++ /dev/null
@@ -1 +0,0 @@
-<disassociate>None</disassociate> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-list-resp.xml b/doc/api_samples/os-networks/networks-list-resp.xml
deleted file mode 100644
index 59620c228b..0000000000
--- a/doc/api_samples/os-networks/networks-list-resp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<networks>
- <network>
- <bridge>br100</bridge>
- <vpn_public_port>1000</vpn_public_port>
- <dhcp_start>10.0.0.3</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <updated_at>2011-08-16 09:26:13.048257</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.1</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_0</label>
- <priority>None</priority>
- <project_id>1234</project_id>
- <vpn_private_address>10.0.0.2</vpn_private_address>
- <deleted>False</deleted>
- <vlan>100</vlan>
- <broadcast>10.0.0.7</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.0/29</cidr>
- <vpn_public_address>127.0.0.1</vpn_public_address>
- <multi_host>False</multi_host>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.387525</created_at>
- <host>nsokolov-desktop</host>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dns1>None</dns1>
- </network>
- <network>
- <bridge>br101</bridge>
- <vpn_public_port>1001</vpn_public_port>
- <dhcp_start>10.0.0.11</dhcp_start>
- <bridge_interface>eth0</bridge_interface>
- <updated_at>None</updated_at>
- <id>20c8acc0-f747-4d71-a389-46d078ebf000</id>
- <cidr_v6>None</cidr_v6>
- <deleted_at>None</deleted_at>
- <gateway>10.0.0.9</gateway>
- <rxtx_base>None</rxtx_base>
- <label>mynet_1</label>
- <priority>None</priority>
- <project_id>None</project_id>
- <vpn_private_address>10.0.0.10</vpn_private_address>
- <deleted>False</deleted>
- <vlan>101</vlan>
- <broadcast>10.0.0.15</broadcast>
- <netmask>255.255.255.248</netmask>
- <injected>False</injected>
- <cidr>10.0.0.10/29</cidr>
- <vpn_public_address>None</vpn_public_address>
- <multi_host>False</multi_host>
- <dns2>None</dns2>
- <created_at>2011-08-15 06:19:19.885495</created_at>
- <host>None</host>
- <gateway_v6>None</gateway_v6>
- <netmask_v6>None</netmask_v6>
- <dns1>None</dns1>
- </network>
-</networks> \ No newline at end of file
diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml
deleted file mode 100644
index bc18e7405b..0000000000
--- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-12-30T12:28:05Z" hostId="29cf2103bf26495b084577ca87c0134abf5e2c46f284403a2637aebf" name="foobar" created="2013-12-30T12:28:04Z" userId="fake" tenantId="openstack" accessIPv4="1.2.3.4" accessIPv6="fe80::100" progress="0" id="26248125-6c64-4ef4-9d14-5f63ba1f8a60" adminPass="seekr3t">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/26248125-6c64-4ef4-9d14-5f63ba1f8a60" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/26248125-6c64-4ef4-9d14-5f63ba1f8a60" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml
deleted file mode 100644
index e755dfa8bc..0000000000
--- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebuild
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- name="foobar"
- imageRef="http://openstack.example.com/v1.1/32278/images/70a599e0-31e7-49b7-b260-868f441e862b"
- accessIPv4="1.2.3.4"
- accessIPv6="fe80::100"
- adminPass="seekr3t"
- preserve_ephemeral="false">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</rebuild> \ No newline at end of file
diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml b/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml
deleted file mode 100644
index ecdb860089..0000000000
--- a/doc/api_samples/os-preserve-ephemeral-rebuild/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="26248125-6c64-4ef4-9d14-5f63ba1f8a60" adminPass="MAvcr8ZtqSHf">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/26248125-6c64-4ef4-9d14-5f63ba1f8a60" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/26248125-6c64-4ef4-9d14-5f63ba1f8a60" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
deleted file mode 100644
index 91929d34ad..0000000000
--- a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_class_set id="test_class">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_class_set>
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
deleted file mode 100644
index d147854820..0000000000
--- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<quota_class_set>
- <cores>50</cores>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>50</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_class_set>
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
deleted file mode 100644
index 23eb5088c7..0000000000
--- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_class_set>
- <cores>50</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>50</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_class_set>
diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
deleted file mode 100644
index 76a9292c13..0000000000
--- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml
deleted file mode 100644
index 76a9292c13..0000000000
--- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-req.xml b/doc/api_samples/os-quota-sets/quotas-update-post-req.xml
deleted file mode 100644
index 4bb7b3a474..0000000000
--- a/doc/api_samples/os-quota-sets/quotas-update-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <security_groups>45</security_groups>
-</quota_set> \ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml
deleted file mode 100644
index e03a0bf5e4..0000000000
--- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>45</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-rescue/server-get-resp-rescue.xml b/doc/api_samples/os-rescue/server-get-resp-rescue.xml
deleted file mode 100644
index b0da738c4c..0000000000
--- a/doc/api_samples/os-rescue/server-get-resp-rescue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="RESCUE" updated="2012-09-19T11:44:22Z" hostId="8eb4062a49009f6ee8066fbe1ed4c60d67b0a4ebd4434f51d8f03293" name="new-server-test" created="2012-09-19T11:44:22Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="eb2b2fbb-a6f8-4363-9007-e9a9098ea080">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/eb2b2fbb-a6f8-4363-9007-e9a9098ea080" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-get-resp-unrescue.xml b/doc/api_samples/os-rescue/server-get-resp-unrescue.xml
deleted file mode 100644
index 41fce846a1..0000000000
--- a/doc/api_samples/os-rescue/server-get-resp-unrescue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-09-19T11:44:23Z" hostId="40fdb0f0760c536d8c2bc816c39a8997b80ddcc6368bb8470c009015" name="new-server-test" created="2012-09-19T11:44:23Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="70b4263f-bae1-4ac4-a1c5-e5bb193767bc">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-post-req.xml b/doc/api_samples/os-rescue/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-rescue/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-post-resp.xml b/doc/api_samples/os-rescue/server-post-resp.xml
deleted file mode 100644
index 3a31871ba9..0000000000
--- a/doc/api_samples/os-rescue/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="70b4263f-bae1-4ac4-a1c5-e5bb193767bc" adminPass="ttv8YPD3tRPm">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/70b4263f-bae1-4ac4-a1c5-e5bb193767bc" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-rescue-req.xml b/doc/api_samples/os-rescue/server-rescue-req.xml
deleted file mode 100644
index 7372633729..0000000000
--- a/doc/api_samples/os-rescue/server-rescue-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rescue xmlns="http://docs.openstack.org/compute/api/v1.1"
- adminPass="MySecretPass"/> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-rescue.xml b/doc/api_samples/os-rescue/server-rescue.xml
deleted file mode 100644
index 5823886702..0000000000
--- a/doc/api_samples/os-rescue/server-rescue.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<adminPass>MySecretPass</adminPass> \ No newline at end of file
diff --git a/doc/api_samples/os-rescue/server-unrescue-req.xml b/doc/api_samples/os-rescue/server-unrescue-req.xml
deleted file mode 100644
index 6a87f8fb21..0000000000
--- a/doc/api_samples/os-rescue/server-unrescue-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<unrescue xmlns="http://docs.openstack.org/compute/api/v1.1"/> \ No newline at end of file
diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml
deleted file mode 100644
index 7fa3af7d9d..0000000000
--- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-req.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group_default_rule>
- <ip_protocol>TCP</ip_protocol>
- <from_port>80</from_port>
- <to_port>80</to_port>
- <cidr>10.10.12.0/24</cidr>
-</security_group_default_rule> \ No newline at end of file
diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml
deleted file mode 100644
index 9e700969ff..0000000000
--- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-create-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group_default_rule xmlns="http://docs.openstack.org/compute/api/v1.1" id="1">
- <ip_protocol>TCP</ip_protocol>
- <from_port>80</from_port>
- <to_port>80</to_port>
- <ip_range>
- <cidr>10.10.10.0/24</cidr>
- </ip_range>
-</security_group_default_rule> \ No newline at end of file
diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml
deleted file mode 100644
index f009bf80f1..0000000000
--- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-list-resp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group_default_rules xmlns="http://docs.openstack.org/compute/api/v1.1">
- <security_group_default_rule id="1">
- <ip_protocol>TCP</ip_protocol>
- <from_port>80</from_port>
- <to_port>80</to_port>
- <ip_range>
- <cidr>10.10.10.0/24</cidr>
- </ip_range>
- </security_group_default_rule>
-</security_group_default_rules> \ No newline at end of file
diff --git a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml b/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml
deleted file mode 100644
index 9181abd387..0000000000
--- a/doc/api_samples/os-security-group-default-rules/security-group-default-rules-show-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group_default_rule xmlns="http://docs.openstack.org/compute/api/v1.1" id="1">
- <from_port>80</from_port>
- <to_port>80</to_port>
- <ip_protocol>TCP</ip_protocol>
- <ip_range>
- <cidr>10.10.10.0/24</cidr>
- </ip_range>
-</security_group_default_rule> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-group-add-post-req.xml b/doc/api_samples/os-security-groups/security-group-add-post-req.xml
deleted file mode 100644
index e9e20739b8..0000000000
--- a/doc/api_samples/os-security-groups/security-group-add-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addSecurityGroup>
- <name>test</name>
-</addSecurityGroup> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-group-post-req.xml b/doc/api_samples/os-security-groups/security-group-post-req.xml
deleted file mode 100644
index 03ccbd5c48..0000000000
--- a/doc/api_samples/os-security-groups/security-group-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<security_group name="test">
- <description>
- description
- </description>
-</security_group> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-group-remove-post-req.xml b/doc/api_samples/os-security-groups/security-group-remove-post-req.xml
deleted file mode 100644
index 74ac139b83..0000000000
--- a/doc/api_samples/os-security-groups/security-group-remove-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<removeSecurityGroup>
- <name>test</name>
-</removeSecurityGroup> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-groups-create-resp.xml b/doc/api_samples/os-security-groups/security-groups-create-resp.xml
deleted file mode 100644
index 045387ea62..0000000000
--- a/doc/api_samples/os-security-groups/security-groups-create-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="2" name="test">
- <description>
- description
- </description>
- <rules/>
-</security_group> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-groups-get-resp.xml b/doc/api_samples/os-security-groups/security-groups-get-resp.xml
deleted file mode 100644
index 140f58b4e5..0000000000
--- a/doc/api_samples/os-security-groups/security-groups-get-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_group xmlns="http://docs.openstack.org/compute/api/v1.1" tenant_id="openstack" id="1" name="default">
- <description>default</description>
- <rules/>
-</security_group> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml b/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml
deleted file mode 100644
index f4266adef3..0000000000
--- a/doc/api_samples/os-security-groups/security-groups-list-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
- <security_group tenant_id="openstack" id="1" name="default">
- <description>default</description>
- <rules/>
- </security_group>
-</security_groups> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/server-post-req.xml b/doc/api_samples/os-security-groups/server-post-req.xml
deleted file mode 100644
index 77f8db2eff..0000000000
--- a/doc/api_samples/os-security-groups/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/ openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/server-post-resp.xml b/doc/api_samples/os-security-groups/server-post-resp.xml
deleted file mode 100644
index 31af00c24e..0000000000
--- a/doc/api_samples/os-security-groups/server-post-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="d324fb9c-c7b6-49ef-9f52-e7cca5ac1b23" adminPass="2oTyCGxjDu8p">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/d324fb9c-c7b6-49ef-9f52-e7cca5ac1b23" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/d324fb9c-c7b6-49ef-9f52-e7cca5ac1b23" rel="bookmark"/>
- <security_groups>
- <security_group name="default"/>
- </security_groups>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml b/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml
deleted file mode 100644
index f4266adef3..0000000000
--- a/doc/api_samples/os-security-groups/server-security-groups-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<security_groups xmlns="http://docs.openstack.org/compute/api/v1.1">
- <security_group tenant_id="openstack" id="1" name="default">
- <description>default</description>
- <rules/>
- </security_group>
-</security_groups> \ No newline at end of file
diff --git a/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml b/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml
deleted file mode 100644
index 776419f82f..0000000000
--- a/doc/api_samples/os-server-diagnostics/server-diagnostics-get-resp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<diagnostics xmlns="http://docs.openstack.org/compute/api/v1.1">
- <memory>524288</memory>
- <vda_write>5778432</vda_write>
- <vnet1_rx_packets>26701</vnet1_rx_packets>
- <vnet1_rx_drop>0</vnet1_rx_drop>
- <vnet1_tx_drop>0</vnet1_tx_drop>
- <vnet1_rx>2070139</vnet1_rx>
- <vda_read>262144</vda_read>
- <vda_write_req>488</vda_write_req>
- <vnet1_tx>140208</vnet1_tx>
- <vnet1_tx_errors>0</vnet1_tx_errors>
- <vnet1_tx_packets>662</vnet1_tx_packets>
- <vnet1_rx_errors>0</vnet1_rx_errors>
- <cpu0_time>17300000000</cpu0_time>
- <vda_read_req>112</vda_read_req>
- <vda_errors>-1</vda_errors>
-</diagnostics> \ No newline at end of file
diff --git a/doc/api_samples/os-server-diagnostics/server-post-req.xml b/doc/api_samples/os-server-diagnostics/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-server-diagnostics/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-diagnostics/server-post-resp.xml b/doc/api_samples/os-server-diagnostics/server-post-resp.xml
deleted file mode 100644
index b7210473d5..0000000000
--- a/doc/api_samples/os-server-diagnostics/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="1d946791-e7c9-41fc-9b03-550c94b7216a" adminPass="km2Dr44vFMaK">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/1d946791-e7c9-41fc-9b03-550c94b7216a" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/1d946791-e7c9-41fc-9b03-550c94b7216a" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-external-events/event-create-req.xml b/doc/api_samples/os-server-external-events/event-create-req.xml
deleted file mode 100644
index cb1d7ecbd1..0000000000
--- a/doc/api_samples/os-server-external-events/event-create-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <events>
- <event>
- <name>test-event</name>
- <tag>foo</tag>
- <status>completed</status>
- <server_uuid>7dd63360-256e-4304-ba46-7d87311fbf33</server_uuid>
- </event>
- </events>
diff --git a/doc/api_samples/os-server-external-events/event-create-resp.xml b/doc/api_samples/os-server-external-events/event-create-resp.xml
deleted file mode 100644
index 0188eb519f..0000000000
--- a/doc/api_samples/os-server-external-events/event-create-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<events>
- <event>
- <status>completed</status>
- <tag>foo</tag>
- <name>network-changed</name>
- <server_uuid>8544aae8-a2e0-4429-8537-d3aaeaf55dc2</server_uuid>
- <code>200</code>
- </event>
-</events> \ No newline at end of file
diff --git a/doc/api_samples/os-server-external-events/server-post-req.xml b/doc/api_samples/os-server-external-events/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-server-external-events/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-external-events/server-post-resp.xml b/doc/api_samples/os-server-external-events/server-post-resp.xml
deleted file mode 100644
index ff4c02fda4..0000000000
--- a/doc/api_samples/os-server-external-events/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="7dd63360-256e-4304-ba46-7d87311fbf33" adminPass="WVbjXpE5s7cp">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/7dd63360-256e-4304-ba46-7d87311fbf33" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/7dd63360-256e-4304-ba46-7d87311fbf33" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-group-quotas/limit-get-resp.xml b/doc/api_samples/os-server-group-quotas/limit-get-resp.xml
deleted file mode 100644
index 6ea2da0484..0000000000
--- a/doc/api_samples/os-server-group-quotas/limit-get-resp.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <rates>
- <rate regex=".*" uri="*">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
- </rate>
- <rate regex="^/servers" uri="*/servers">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- </rate>
- <rate regex=".*changes-since.*" uri="*changes-since*">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
- </rate>
- <rate regex="^/os-fping" uri="*/os-fping">
- <limit next-available="2012-11-27T17:22:18Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
- </rate>
- </rates>
- <absolute>
- <limit name="maxServerMeta" value="128"/>
- <limit name="maxPersonality" value="5"/>
- <limit name="maxImageMeta" value="128"/>
- <limit name="maxPersonalitySize" value="10240"/>
- <limit name="maxSecurityGroupRules" value="20"/>
- <limit name="maxTotalKeypairs" value="100"/>
- <limit name="maxSecurityGroups" value="10"/>
- <limit name="maxTotalCores" value="20"/>
- <limit name="maxTotalFloatingIps" value="10"/>
- <limit name="maxTotalInstances" value="10"/>
- <limit name="maxTotalRAMSize" value="51200"/>
- <limit name="maxServerGroups" value="10"/>
- <limit name="maxServerGroupMembers" value="10"/>
- </absolute>
-</limits>
diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml b/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml
deleted file mode 100644
index 7d3954a2b2..0000000000
--- a/doc/api_samples/os-server-group-quotas/quota-classes-show-get-resp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_class_set id="test_class">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_class_set>
diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml b/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml
deleted file mode 100644
index 5fccc0bea9..0000000000
--- a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-req.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<quota_class_set>
- <cores>50</cores>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>50</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_class_set>
diff --git a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml b/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml
deleted file mode 100644
index d87af34f41..0000000000
--- a/doc/api_samples/os-server-group-quotas/quota-classes-update-post-resp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_class_set>
- <cores>50</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>50</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_class_set>
diff --git a/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml
deleted file mode 100644
index c926f82bb7..0000000000
--- a/doc/api_samples/os-server-group-quotas/quotas-show-defaults-get-resp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_set>
diff --git a/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml
deleted file mode 100644
index c926f82bb7..0000000000
--- a/doc/api_samples/os-server-group-quotas/quotas-show-get-resp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_set>
diff --git a/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml b/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml
deleted file mode 100644
index 4bb7b3a474..0000000000
--- a/doc/api_samples/os-server-group-quotas/quotas-update-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <security_groups>45</security_groups>
-</quota_set> \ No newline at end of file
diff --git a/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml b/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml
deleted file mode 100644
index 47c01bf124..0000000000
--- a/doc/api_samples/os-server-group-quotas/quotas-update-post-resp.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>45</security_groups>
- <server_groups>10</server_groups>
- <server_group_members>10</server_group_members>
-</quota_set>
diff --git a/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml b/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml
deleted file mode 100644
index 69e34e83eb..0000000000
--- a/doc/api_samples/os-server-group-quotas/usedlimits-get-resp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <rates>
- <rate regex=".*" uri="*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
- </rate>
- <rate regex="^/servers" uri="*/servers">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- </rate>
- <rate regex=".*changes-since.*" uri="*changes-since*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
- </rate>
- <rate regex="^/os-fping" uri="*/os-fping">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
- </rate>
- </rates>
- <absolute>
- <limit name="maxServerMeta" value="128"/>
- <limit name="maxPersonality" value="5"/>
- <limit name="maxImageMeta" value="128"/>
- <limit name="maxPersonalitySize" value="10240"/>
- <limit name="maxSecurityGroupRules" value="20"/>
- <limit name="maxTotalKeypairs" value="100"/>
- <limit name="totalRAMUsed" value="0"/>
- <limit name="totalInstancesUsed" value="0"/>
- <limit name="maxSecurityGroups" value="10"/>
- <limit name="totalFloatingIpsUsed" value="0"/>
- <limit name="maxTotalCores" value="20"/>
- <limit name="totalSecurityGroupsUsed" value="0"/>
- <limit name="maxTotalFloatingIps" value="10"/>
- <limit name="maxTotalInstances" value="10"/>
- <limit name="totalCoresUsed" value="0"/>
- <limit name="maxTotalRAMSize" value="51200"/>
- <limit name="maxServerGroups" value="10"/>
- <limit name="totalServerGroupsUsed" value="0"/>
- <limit name="maxServerGroupMembers" value="10"/>
- </absolute>
-</limits>
diff --git a/doc/api_samples/os-server-groups/server-groups-get-resp.xml b/doc/api_samples/os-server-groups/server-groups-get-resp.xml
deleted file mode 100644
index 65d7ba23e0..0000000000
--- a/doc/api_samples/os-server-groups/server-groups-get-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server_group xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" name="test">
- <policies>
- <policy>anti-affinity</policy>
- </policies>
- <members/>
- <metadata/>
-</server_group>
diff --git a/doc/api_samples/os-server-groups/server-groups-list-resp.xml b/doc/api_samples/os-server-groups/server-groups-list-resp.xml
deleted file mode 100644
index 0123bb0782..0000000000
--- a/doc/api_samples/os-server-groups/server-groups-list-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server_groups xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server_group id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" name="test">
- <policies>
- <policy>anti-affinity</policy>
- </policies>
- <members/>
- <metadata/>
-</server_group>
-</server_groups>
diff --git a/doc/api_samples/os-server-groups/server-groups-post-req.xml b/doc/api_samples/os-server-groups/server-groups-post-req.xml
deleted file mode 100644
index abe8459549..0000000000
--- a/doc/api_samples/os-server-groups/server-groups-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<server_group name="test">
- <policies>
- <policy>anti-affinity</policy>
- </policies>
-</server_group>
diff --git a/doc/api_samples/os-server-groups/server-groups-post-resp.xml b/doc/api_samples/os-server-groups/server-groups-post-resp.xml
deleted file mode 100644
index 65d7ba23e0..0000000000
--- a/doc/api_samples/os-server-groups/server-groups-post-resp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server_group xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="5bbcc3c4-1da2-4437-a48a-66f15b1b13f9" name="test">
- <policies>
- <policy>anti-affinity</policy>
- </policies>
- <members/>
- <metadata/>
-</server_group>
diff --git a/doc/api_samples/os-server-list-multi-status/server-post-req.xml b/doc/api_samples/os-server-list-multi-status/server-post-req.xml
deleted file mode 100644
index 2dbbb4438d..0000000000
--- a/doc/api_samples/os-server-list-multi-status/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/os-server-list-multi-status/server-post-resp.xml b/doc/api_samples/os-server-list-multi-status/server-post-resp.xml
deleted file mode 100644
index 9725f33bf4..0000000000
--- a/doc/api_samples/os-server-list-multi-status/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ea8417a1-7957-4ed5-8b3c-0befc1724308" adminPass="FoFw84XtQj3c">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml b/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml
deleted file mode 100644
index cbd7892e73..0000000000
--- a/doc/api_samples/os-server-list-multi-status/servers-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server name="new-server-test" id="b626796d-d585-4874-b178-78c65289bba4">
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/os-server-password/get-password-resp.xml b/doc/api_samples/os-server-password/get-password-resp.xml
deleted file mode 100644
index 64b46a5712..0000000000
--- a/doc/api_samples/os-server-password/get-password-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<password>xlozO3wLCBRWAa2yDjCCVx8vwNPypxnypmRYDa/zErlQ+EzPe1S/Gz6nfmC52mOlOSCRuUOmG7kqqgejPof6M7bOezS387zjq4LSvvwp28zUknzy4YzfFGhnHAdai3TxUJ26pfQCYrq8UTzmKF2Bq8ioSEtVVzM0A96pDh8W2i7BOz6MdoiVyiev/I1K2LsuipfxSJR7Wdke4zNXJjHHP2RfYsVbZ/k9ANu+Nz4iIH8/7Cacud/pphH7EjrY6a4RZNrjQskrhKYed0YERpotyjYk1eDtRe72GrSiXteqCM4biaQ5w3ruS+AcX//PXk3uJ5kC7d67fPXaVz4WaQRYMg==</password> \ No newline at end of file
diff --git a/doc/api_samples/os-server-password/server-post-req.xml b/doc/api_samples/os-server-password/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-server-password/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-password/server-post-resp.xml b/doc/api_samples/os-server-password/server-post-resp.xml
deleted file mode 100644
index cac50bc9b9..0000000000
--- a/doc/api_samples/os-server-password/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="b68e3354-0b1a-4e92-a664-8b332cff27f5" adminPass="sLV7uLzmgoHu">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b68e3354-0b1a-4e92-a664-8b332cff27f5" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b68e3354-0b1a-4e92-a664-8b332cff27f5" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-sort-keys/server-post-req.xml b/doc/api_samples/os-server-sort-keys/server-post-req.xml
deleted file mode 100644
index d5cc736ee8..0000000000
--- a/doc/api_samples/os-server-sort-keys/server-post-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
-</server>
diff --git a/doc/api_samples/os-server-sort-keys/server-post-resp.xml b/doc/api_samples/os-server-sort-keys/server-post-resp.xml
deleted file mode 100644
index 742d5158e2..0000000000
--- a/doc/api_samples/os-server-sort-keys/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="e08e6d34-fcc1-480e-b11e-24a675b479f8" adminPass="jDje6SdBHGfQ">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8" rel="bookmark"/>
-</server>
diff --git a/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml b/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml
deleted file mode 100644
index abd876a7a5..0000000000
--- a/doc/api_samples/os-server-sort-keys/server-sort-keys-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server name="new-server-test" id="e08e6d34-fcc1-480e-b11e-24a675b479f8">
- <atom:link href="http://openstack.example.com/v2/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8" rel="bookmark"/>
- </server>
-</servers>
diff --git a/doc/api_samples/os-server-start-stop/server-post-req.xml b/doc/api_samples/os-server-start-stop/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-server-start-stop/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-start-stop/server-post-resp.xml b/doc/api_samples/os-server-start-stop/server-post-resp.xml
deleted file mode 100644
index 7f84ac03df..0000000000
--- a/doc/api_samples/os-server-start-stop/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" adminPass="uF9wWxBh3mWL">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-server-start-stop/server_start_stop.xml b/doc/api_samples/os-server-start-stop/server_start_stop.xml
deleted file mode 100644
index 974e415a52..0000000000
--- a/doc/api_samples/os-server-start-stop/server_start_stop.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<os-stop/> \ No newline at end of file
diff --git a/doc/api_samples/os-services/service-disable-log-put-req.xml b/doc/api_samples/os-services/service-disable-log-put-req.xml
deleted file mode 100644
index f8eec8173f..0000000000
--- a/doc/api_samples/os-services/service-disable-log-put-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" disabled_reason="test2"/>
diff --git a/doc/api_samples/os-services/service-disable-log-put-resp.xml b/doc/api_samples/os-services/service-disable-log-put-resp.xml
deleted file mode 100644
index 1ddf273b16..0000000000
--- a/doc/api_samples/os-services/service-disable-log-put-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" status="disabled" disabled_reason="test2" />
diff --git a/doc/api_samples/os-services/service-disable-put-req.xml b/doc/api_samples/os-services/service-disable-put-req.xml
deleted file mode 100644
index 598ffc0ca9..0000000000
--- a/doc/api_samples/os-services/service-disable-put-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" />
diff --git a/doc/api_samples/os-services/service-disable-put-resp.xml b/doc/api_samples/os-services/service-disable-put-resp.xml
deleted file mode 100644
index f7569159d9..0000000000
--- a/doc/api_samples/os-services/service-disable-put-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" status="disabled" />
diff --git a/doc/api_samples/os-services/service-enable-put-req.xml b/doc/api_samples/os-services/service-enable-put-req.xml
deleted file mode 100644
index 598ffc0ca9..0000000000
--- a/doc/api_samples/os-services/service-enable-put-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" />
diff --git a/doc/api_samples/os-services/service-enable-put-resp.xml b/doc/api_samples/os-services/service-enable-put-resp.xml
deleted file mode 100644
index 04c29ffa03..0000000000
--- a/doc/api_samples/os-services/service-enable-put-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<service host="host1" binary="nova-compute" status="enabled" />
diff --git a/doc/api_samples/os-services/services-get-resp.xml b/doc/api_samples/os-services/services-get-resp.xml
deleted file mode 100644
index f011bf7b1b..0000000000
--- a/doc/api_samples/os-services/services-get-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<services>
- <service status="disabled" binary="nova-scheduler" zone="internal" state="up" host="host1" updated_at="2012-10-29 13:42:02" disabled_reason="test1"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="up" host="host1" updated_at="2012-10-29 13:42:05" disabled_reason="test2"/>
- <service status="enabled" binary="nova-scheduler" zone="internal" state="down" host="host2" updated_at="2012-09-19 06:55:34" disabled_reason="None"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="down" host="host2" updated_at="2012-09-18 08:03:38" disabled_reason="test4"/>
-</services>
diff --git a/doc/api_samples/os-services/services-list-get-resp.xml b/doc/api_samples/os-services/services-list-get-resp.xml
deleted file mode 100644
index e9868c2f26..0000000000
--- a/doc/api_samples/os-services/services-list-get-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<services>
- <service status="disabled" binary="nova-scheduler" zone="internal" state="up" host="host1" updated_at="2012-10-29 13:42:02"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="up" host="host1" updated_at="2012-10-29 13:42:05" />
- <service status="enabled" binary="nova-scheduler" zone="internal" state="down" host="host2" updated_at="2012-09-19 06:55:34"/>
- <service status="disabled" binary="nova-compute" zone="nova" state="down" host="host2" updated_at="2012-09-18 08:03:38"/>
-</services>
diff --git a/doc/api_samples/os-shelve/os-shelve-offload.xml b/doc/api_samples/os-shelve/os-shelve-offload.xml
deleted file mode 100644
index 0d6e379123..0000000000
--- a/doc/api_samples/os-shelve/os-shelve-offload.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <shelveOffload/>
diff --git a/doc/api_samples/os-shelve/os-shelve.xml b/doc/api_samples/os-shelve/os-shelve.xml
deleted file mode 100644
index 687b1b1f58..0000000000
--- a/doc/api_samples/os-shelve/os-shelve.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <shelve/> \ No newline at end of file
diff --git a/doc/api_samples/os-shelve/os-unshelve.xml b/doc/api_samples/os-shelve/os-unshelve.xml
deleted file mode 100644
index e56b78a83c..0000000000
--- a/doc/api_samples/os-shelve/os-unshelve.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <unshelve/>
diff --git a/doc/api_samples/os-shelve/server-post-req.xml b/doc/api_samples/os-shelve/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-shelve/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-shelve/server-post-resp.xml b/doc/api_samples/os-shelve/server-post-resp.xml
deleted file mode 100644
index 7b789b2246..0000000000
--- a/doc/api_samples/os-shelve/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="380d8ce9-bd82-4182-b643-b72232cd11d0" adminPass="LePA926cLP3R">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/380d8ce9-bd82-4182-b643-b72232cd11d0" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/380d8ce9-bd82-4182-b643-b72232cd11d0" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-simple-tenant-usage/server-post-req.xml b/doc/api_samples/os-simple-tenant-usage/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-simple-tenant-usage/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml b/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml
deleted file mode 100644
index 7b0c8a439d..0000000000
--- a/doc/api_samples/os-simple-tenant-usage/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="df5f4368-be09-47cc-a84f-c1382459284d" adminPass="foPQHkv8H66R">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/df5f4368-be09-47cc-a84f-c1382459284d" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/df5f4368-be09-47cc-a84f-c1382459284d" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
deleted file mode 100644
index 56f95edc48..0000000000
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<tenant_usage>
- <tenant_id>openstack</tenant_id>
- <total_local_gb_usage>1.0</total_local_gb_usage>
- <total_vcpus_usage>1.0</total_vcpus_usage>
- <total_memory_mb_usage>512.0</total_memory_mb_usage>
- <total_hours>1.0</total_hours>
- <start>2012-10-08 20:10:51.902640</start>
- <stop>2012-10-08 21:10:51.902640</stop>
- <server_usages>
- <server_usage>
- <instance_id>e4521f3b-d9ad-4454-be8a-e2732f0630ef</instance_id>
- <name>new-server-test</name>
- <hours>1.0</hours>
- <memory_mb>512</memory_mb>
- <local_gb>1</local_gb>
- <vcpus>1</vcpus>
- <tenant_id>openstack</tenant_id>
- <flavor>m1.tiny</flavor>
- <started_at>2012-10-08 20:10:51.854331</started_at>
- <ended_at>None</ended_at>
- <state>active</state>
- <uptime>3600</uptime>
- </server_usage>
- </server_usages>
-</tenant_usage>
diff --git a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml b/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
deleted file mode 100644
index 8807691b74..0000000000
--- a/doc/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<tenant_usages>
- <tenant_usage>
- <tenant_id>openstack</tenant_id>
- <total_local_gb_usage>1.0</total_local_gb_usage>
- <total_vcpus_usage>1.0</total_vcpus_usage>
- <total_memory_mb_usage>512.0</total_memory_mb_usage>
- <total_hours>1.0</total_hours>
- <start>2012-10-08 21:10:51.902640</start>
- <stop>2012-10-08 22:10:51.902640</stop>
- <server_usages/>
- </tenant_usage>
-</tenant_usages>
diff --git a/doc/api_samples/os-tenant-networks/networks-list-res.xml b/doc/api_samples/os-tenant-networks/networks-list-res.xml
deleted file mode 100644
index 6aaeec85bb..0000000000
--- a/doc/api_samples/os-tenant-networks/networks-list-res.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<networks>
- <network>
- <cidr>10.0.0.0/29</cidr>
- <id>cf3fb0f1-9967-4dac-8284-2d103e904099</id>
- <label>test_0</label>
- </network>
- <network>
- <cidr>10.0.0.8/29</cidr>
- <id>434385bc-a7ac-4778-b295-56f8134fddbc</id>
- <label>test_1</label>
- </network>
-</networks> \ No newline at end of file
diff --git a/doc/api_samples/os-tenant-networks/networks-post-req.xml b/doc/api_samples/os-tenant-networks/networks-post-req.xml
deleted file mode 100644
index f4c06aa9d8..0000000000
--- a/doc/api_samples/os-tenant-networks/networks-post-req.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<network>
- <label>public</label>
- <cidr>172.0.0.0/24</cidr>
- <vlan_start>1</vlan_start>
- <num_networks>1</num_networks>
- <network_size>255</network_size>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-tenant-networks/networks-post-res.xml b/doc/api_samples/os-tenant-networks/networks-post-res.xml
deleted file mode 100644
index 7bbc6a4b68..0000000000
--- a/doc/api_samples/os-tenant-networks/networks-post-res.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network>
- <cidr>172.0.0.0/24</cidr>
- <id>9ac30188-57d8-4349-94d1-dbad63b20e4d</id>
- <label>public</label>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml b/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml
deleted file mode 100644
index a403c5eff5..0000000000
--- a/doc/api_samples/os-used-limits-for-admin/usedlimitsforadmin-get-resp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <rates>
- <rate regex=".*" uri="*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
- </rate>
- <rate regex="^/servers" uri="*/servers">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- </rate>
- <rate regex=".*changes-since.*" uri="*changes-since*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
- </rate>
- <rate regex="^/os-fping" uri="*/os-fping">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
- </rate>
- </rates>
- <absolute>
- <limit name="maxServerMeta" value="128"/>
- <limit name="maxPersonality" value="5"/>
- <limit name="maxImageMeta" value="128"/>
- <limit name="maxPersonalitySize" value="10240"/>
- <limit name="maxSecurityGroupRules" value="20"/>
- <limit name="maxTotalKeypairs" value="100"/>
- <limit name="totalRAMUsed" value="0"/>
- <limit name="totalInstancesUsed" value="0"/>
- <limit name="maxSecurityGroups" value="10"/>
- <limit name="totalFloatingIpsUsed" value="0"/>
- <limit name="maxTotalCores" value="20"/>
- <limit name="totalSecurityGroupsUsed" value="0"/>
- <limit name="maxTotalFloatingIps" value="10"/>
- <limit name="maxTotalInstances" value="10"/>
- <limit name="totalCoresUsed" value="0"/>
- <limit name="maxTotalRAMSize" value="51200"/>
- </absolute>
-</limits>
diff --git a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml b/doc/api_samples/os-used-limits/usedlimits-get-resp.xml
deleted file mode 100644
index a403c5eff5..0000000000
--- a/doc/api_samples/os-used-limits/usedlimits-get-resp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<limits xmlns:os-used-limits="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <rates>
- <rate regex=".*" uri="*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="PUT" remaining="120" value="120"/>
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="DELETE" remaining="120" value="120"/>
- </rate>
- <rate regex="^/servers" uri="*/servers">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="POST" remaining="120" value="120"/>
- </rate>
- <rate regex=".*changes-since.*" uri="*changes-since*">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="120" value="120"/>
- </rate>
- <rate regex="^/os-fping" uri="*/os-fping">
- <limit next-available="2012-11-27T17:24:53Z" unit="MINUTE" verb="GET" remaining="12" value="12"/>
- </rate>
- </rates>
- <absolute>
- <limit name="maxServerMeta" value="128"/>
- <limit name="maxPersonality" value="5"/>
- <limit name="maxImageMeta" value="128"/>
- <limit name="maxPersonalitySize" value="10240"/>
- <limit name="maxSecurityGroupRules" value="20"/>
- <limit name="maxTotalKeypairs" value="100"/>
- <limit name="totalRAMUsed" value="0"/>
- <limit name="totalInstancesUsed" value="0"/>
- <limit name="maxSecurityGroups" value="10"/>
- <limit name="totalFloatingIpsUsed" value="0"/>
- <limit name="maxTotalCores" value="20"/>
- <limit name="totalSecurityGroupsUsed" value="0"/>
- <limit name="maxTotalFloatingIps" value="10"/>
- <limit name="maxTotalInstances" value="10"/>
- <limit name="totalCoresUsed" value="0"/>
- <limit name="maxTotalRAMSize" value="51200"/>
- </absolute>
-</limits>
diff --git a/doc/api_samples/os-user-data/userdata-post-req.xml b/doc/api_samples/os-user-data/userdata-post-req.xml
deleted file mode 100644
index f2b427c314..0000000000
--- a/doc/api_samples/os-user-data/userdata-post-req.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1"
- imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b"
- flavorRef="http://openstack.example.com/openstack/flavors/1"
- name="new-server-test">
- <user_data>
- IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==
- </user_data>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-user-data/userdata-post-resp.xml b/doc/api_samples/os-user-data/userdata-post-resp.xml
deleted file mode 100644
index 24f94ba218..0000000000
--- a/doc/api_samples/os-user-data/userdata-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="c5958eff-37b7-43fd-94ba-cb067918ebb7" adminPass="iiaNUtHi5xEa">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/c5958eff-37b7-43fd-94ba-cb067918ebb7" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/c5958eff-37b7-43fd-94ba-cb067918ebb7" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
deleted file mode 100644
index 76a9292c13..0000000000
--- a/doc/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <cores>20</cores>
- <fixed_ips>-1</fixed_ips>
- <floating_ips>10</floating_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>10</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml
deleted file mode 100644
index c5084d44e6..0000000000
--- a/doc/api_samples/os-user-quotas/user-quotas-update-post-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set id="fake_tenant">
- <force>True</force>
- <instances>9</instances>
-</quota_set>
diff --git a/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
deleted file mode 100644
index 43c36c7da3..0000000000
--- a/doc/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<quota_set>
- <cores>20</cores>
- <floating_ips>10</floating_ips>
- <fixed_ips>-1</fixed_ips>
- <injected_file_content_bytes>10240</injected_file_content_bytes>
- <injected_file_path_bytes>255</injected_file_path_bytes>
- <injected_files>5</injected_files>
- <instances>9</instances>
- <key_pairs>100</key_pairs>
- <metadata_items>128</metadata_items>
- <ram>51200</ram>
- <security_group_rules>20</security_group_rules>
- <security_groups>10</security_groups>
-</quota_set>
diff --git a/doc/api_samples/os-virtual-interfaces/server-post-req.xml b/doc/api_samples/os-virtual-interfaces/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-virtual-interfaces/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-virtual-interfaces/server-post-resp.xml b/doc/api_samples/os-virtual-interfaces/server-post-resp.xml
deleted file mode 100644
index d620ed00b0..0000000000
--- a/doc/api_samples/os-virtual-interfaces/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="37443b33-eb80-4eea-90d8-f90778f53dea" adminPass="ffV6E5gsNPpi">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/37443b33-eb80-4eea-90d8-f90778f53dea" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml b/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml
deleted file mode 100644
index 73aafe09b0..0000000000
--- a/doc/api_samples/os-virtual-interfaces/vifs-list-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<virtual_interfaces xmlns="http://docs.openstack.org/compute/api/v1.1">
- <virtual_interface id="94edf7aa-565a-469a-8f45-656b4acf8229" mac_address="fa:16:3e:7d:31:9a"/>
-</virtual_interfaces> \ No newline at end of file
diff --git a/doc/api_samples/os-volume-attachment-update/server-post-req.xml b/doc/api_samples/os-volume-attachment-update/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-volume-attachment-update/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-volume-attachment-update/server-post-resp.xml b/doc/api_samples/os-volume-attachment-update/server-post-resp.xml
deleted file mode 100644
index 558e1abbfc..0000000000
--- a/doc/api_samples/os-volume-attachment-update/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="611a0c5d-64ec-4d6a-a6ed-56ccf90921c6" adminPass="RoXt8zgxNxAR">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/611a0c5d-64ec-4d6a-a6ed-56ccf90921c6" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/611a0c5d-64ec-4d6a-a6ed-56ccf90921c6" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-volume-attachment-update/update-volume-req.xml b/doc/api_samples/os-volume-attachment-update/update-volume-req.xml
deleted file mode 100644
index 37d7f84630..0000000000
--- a/doc/api_samples/os-volume-attachment-update/update-volume-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volumeAttachment volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f805" device="/dev/sdd" /> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/attach-volume-to-server-req.xml b/doc/api_samples/os-volumes/attach-volume-to-server-req.xml
deleted file mode 100644
index eedfc329a8..0000000000
--- a/doc/api_samples/os-volumes/attach-volume-to-server-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<volumeAttachment volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803" device="/dev/vdd" /> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml b/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml
deleted file mode 100644
index aaa85dd43f..0000000000
--- a/doc/api_samples/os-volumes/attach-volume-to-server-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumeAttachment device="/dev/vdd" serverId="20f0cb44-7b00-4019-a612-364777cd2931" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/list-volume-attachments-resp.xml b/doc/api_samples/os-volumes/list-volume-attachments-resp.xml
deleted file mode 100644
index 7d70882c08..0000000000
--- a/doc/api_samples/os-volumes/list-volume-attachments-resp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumeAttachments>
- <volumeAttachment device="/dev/sdd" serverId="4335bab6-6086-4247-8274-8b8b048edaaa" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/>
- <volumeAttachment device="/dev/sdc" serverId="4335bab6-6086-4247-8274-8b8b048edaaa" id="a26887c6-c47b-4654-abb5-dfadf7d3f804" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f804"/>
-</volumeAttachments> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/os-volumes-detail-resp.xml b/doc/api_samples/os-volumes/os-volumes-detail-resp.xml
deleted file mode 100644
index c6ff8c23e7..0000000000
--- a/doc/api_samples/os-volumes/os-volumes-detail-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes>
- <volume status="in-use" displayDescription="Volume Description" availabilityZone="zone1:host1" displayName="Volume Name" volumeType="Backup" snapshotId="None" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" createdAt="2008-12-01 11:01:55" size="100">
- <attachments>
- <attachment device="/" serverId="3912f2b4-c5ba-4aec-9165-872876fe202e" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/>
- </attachments>
- <metadata/>
- </volume>
-</volumes>
diff --git a/doc/api_samples/os-volumes/os-volumes-get-resp.xml b/doc/api_samples/os-volumes/os-volumes-get-resp.xml
deleted file mode 100644
index a65b78c9de..0000000000
--- a/doc/api_samples/os-volumes/os-volumes-get-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume status="in-use" displayDescription="Volume Description" availabilityZone="zone1:host1" displayName="Volume Name" volumeType="Backup" snapshotId="None" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" createdAt="2008-12-01 11:01:55" size="100">
- <attachments>
- <attachment device="/" serverId="3912f2b4-c5ba-4aec-9165-872876fe202e" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/>
- </attachments>
- <metadata/>
-</volume>
diff --git a/doc/api_samples/os-volumes/os-volumes-index-resp.xml b/doc/api_samples/os-volumes/os-volumes-index-resp.xml
deleted file mode 100644
index c6ff8c23e7..0000000000
--- a/doc/api_samples/os-volumes/os-volumes-index-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumes>
- <volume status="in-use" displayDescription="Volume Description" availabilityZone="zone1:host1" displayName="Volume Name" volumeType="Backup" snapshotId="None" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" createdAt="2008-12-01 11:01:55" size="100">
- <attachments>
- <attachment device="/" serverId="3912f2b4-c5ba-4aec-9165-872876fe202e" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/>
- </attachments>
- <metadata/>
- </volume>
-</volumes>
diff --git a/doc/api_samples/os-volumes/os-volumes-post-req.xml b/doc/api_samples/os-volumes/os-volumes-post-req.xml
deleted file mode 100644
index 68a0b58643..0000000000
--- a/doc/api_samples/os-volumes/os-volumes-post-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
- <volume displayDescription="Volume Description" availabilityZone="zone1:host1" displayName="Volume Name" size="100"/>
-
diff --git a/doc/api_samples/os-volumes/os-volumes-post-resp.xml b/doc/api_samples/os-volumes/os-volumes-post-resp.xml
deleted file mode 100644
index a65b78c9de..0000000000
--- a/doc/api_samples/os-volumes/os-volumes-post-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volume status="in-use" displayDescription="Volume Description" availabilityZone="zone1:host1" displayName="Volume Name" volumeType="Backup" snapshotId="None" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" createdAt="2008-12-01 11:01:55" size="100">
- <attachments>
- <attachment device="/" serverId="3912f2b4-c5ba-4aec-9165-872876fe202e" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/>
- </attachments>
- <metadata/>
-</volume>
diff --git a/doc/api_samples/os-volumes/server-post-req.xml b/doc/api_samples/os-volumes/server-post-req.xml
deleted file mode 100644
index 0a3c8bb530..0000000000
--- a/doc/api_samples/os-volumes/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/server-post-resp.xml b/doc/api_samples/os-volumes/server-post-resp.xml
deleted file mode 100644
index b2474027d1..0000000000
--- a/doc/api_samples/os-volumes/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="b11339a0-3a3e-496d-ade0-4539dbb5d816" adminPass="J3qyiuLMEWV3">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b11339a0-3a3e-496d-ade0-4539dbb5d816" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b11339a0-3a3e-496d-ade0-4539dbb5d816" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/snapshot-create-req.xml b/doc/api_samples/os-volumes/snapshot-create-req.xml
deleted file mode 100644
index e5001cf06f..0000000000
--- a/doc/api_samples/os-volumes/snapshot-create-req.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <snapshot>
- <display_name>snap-001</display_name>
- <display_description>Daily backup</display_description>
- <volume_id>521752a6-acf6-4b2d-bc7a-119f9148cd8c</volume_id>
- <force>false</force>
- </snapshot> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/snapshot-create-resp.xml b/doc/api_samples/os-volumes/snapshot-create-resp.xml
deleted file mode 100644
index 654bf3d34b..0000000000
--- a/doc/api_samples/os-volumes/snapshot-create-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot status="available" displayDescription="Daily backup" displayName="snap-001" volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c" id="100" createdAt="2013-02-25 16:27:36.840121" size="100"/> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/snapshots-detail-resp.xml b/doc/api_samples/os-volumes/snapshots-detail-resp.xml
deleted file mode 100644
index 5e946939f8..0000000000
--- a/doc/api_samples/os-volumes/snapshots-detail-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshots>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="100" createdAt="2013-02-25 16:27:36.862459" size="100"/>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="101" createdAt="2013-02-25 16:27:36.862466" size="100"/>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="102" createdAt="2013-02-25 16:27:36.862469" size="100"/>
-</snapshots> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/snapshots-list-resp.xml b/doc/api_samples/os-volumes/snapshots-list-resp.xml
deleted file mode 100644
index 6714c98bc1..0000000000
--- a/doc/api_samples/os-volumes/snapshots-list-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshots>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="100" createdAt="2013-02-25 16:27:36.769149" size="100"/>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="101" createdAt="2013-02-25 16:27:36.769154" size="100"/>
- <snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="102" createdAt="2013-02-25 16:27:36.769157" size="100"/>
-</snapshots> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/snapshots-show-resp.xml b/doc/api_samples/os-volumes/snapshots-show-resp.xml
deleted file mode 100644
index 3c70cf033f..0000000000
--- a/doc/api_samples/os-volumes/snapshots-show-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<snapshot status="available" displayDescription="Default description" displayName="Default name" volumeId="12" id="100" createdAt="2013-02-25 16:27:36.854206" size="100"/> \ No newline at end of file
diff --git a/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml b/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml
deleted file mode 100644
index dea2352927..0000000000
--- a/doc/api_samples/os-volumes/volume-attachment-detail-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<volumeAttachment device="/dev/sdd" serverId="20f12907-3993-44f7-a680-d51e2ceedbd9" id="a26887c6-c47b-4654-abb5-dfadf7d3f803" volumeId="a26887c6-c47b-4654-abb5-dfadf7d3f803"/> \ No newline at end of file
diff --git a/doc/api_samples/server-action-changepassword.xml b/doc/api_samples/server-action-changepassword.xml
deleted file mode 100644
index 4326e01617..0000000000
--- a/doc/api_samples/server-action-changepassword.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<changePassword
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- adminPass="foo"/> \ No newline at end of file
diff --git a/doc/api_samples/server-action-confirmresize.xml b/doc/api_samples/server-action-confirmresize.xml
deleted file mode 100644
index ffad7f16ae..0000000000
--- a/doc/api_samples/server-action-confirmresize.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confirmResize
- xmlns="http://docs.openstack.org/compute/api/v1.1"/> \ No newline at end of file
diff --git a/doc/api_samples/server-action-createimage.xml b/doc/api_samples/server-action-createimage.xml
deleted file mode 100644
index faa6ae7660..0000000000
--- a/doc/api_samples/server-action-createimage.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<createImage
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- name="foo-image">
- <metadata>
- <meta key="myvar">foobar</meta>
- </metadata>
-</createImage> \ No newline at end of file
diff --git a/doc/api_samples/server-action-reboot.xml b/doc/api_samples/server-action-reboot.xml
deleted file mode 100644
index b36d35801f..0000000000
--- a/doc/api_samples/server-action-reboot.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<reboot
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- type="SOFT"/> \ No newline at end of file
diff --git a/doc/api_samples/server-action-rebuild-resp.xml b/doc/api_samples/server-action-rebuild-resp.xml
deleted file mode 100644
index b31c861f07..0000000000
--- a/doc/api_samples/server-action-rebuild-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-09-14T16:41:46Z" hostId="a0e37e3bd9f674600aabeeccb123d80ae2717ace90893d79cd4abc46" name="foobar" created="2012-09-14T16:41:45Z" userId="fake" tenantId="openstack" accessIPv4="1.2.3.4" accessIPv6="fe80::100" progress="0" id="943acea5-2fc8-4f31-bab6-8f7b9ac923ca" adminPass="seekr3t">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/943acea5-2fc8-4f31-bab6-8f7b9ac923ca" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/943acea5-2fc8-4f31-bab6-8f7b9ac923ca" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/server-action-rebuild.xml b/doc/api_samples/server-action-rebuild.xml
deleted file mode 100644
index d39b9d8a38..0000000000
--- a/doc/api_samples/server-action-rebuild.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rebuild
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- name="foobar"
- imageRef="http://openstack.example.com/v1.1/32278/images/70a599e0-31e7-49b7-b260-868f441e862b"
- accessIPv4="1.2.3.4"
- accessIPv6="fe80::100"
- adminPass="seekr3t">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</rebuild> \ No newline at end of file
diff --git a/doc/api_samples/server-action-resize.xml b/doc/api_samples/server-action-resize.xml
deleted file mode 100644
index 8dfb53c6a8..0000000000
--- a/doc/api_samples/server-action-resize.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resize
- xmlns="http://docs.openstack.org/compute/api/v1.1"
- flavorRef="2"/> \ No newline at end of file
diff --git a/doc/api_samples/server-action-revertresize.xml b/doc/api_samples/server-action-revertresize.xml
deleted file mode 100644
index 7981753e75..0000000000
--- a/doc/api_samples/server-action-revertresize.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<revertResize
- xmlns="http://docs.openstack.org/compute/api/v1.1"/> \ No newline at end of file
diff --git a/doc/api_samples/server-get-resp.xml b/doc/api_samples/server-get-resp.xml
deleted file mode 100644
index e59319e426..0000000000
--- a/doc/api_samples/server-get-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-08-20T21:11:10Z" hostId="1746536de20daadad89a6fab8d6968b1214b0ba9fb37b29e7098e0b9" name="new-server-test" created="2012-08-20T21:11:10Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="3f9f7d18-aaf3-4703-b368-ea9b4d609c95">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/server-ips-network-resp.xml b/doc/api_samples/server-ips-network-resp.xml
deleted file mode 100644
index 30c7678c4f..0000000000
--- a/doc/api_samples/server-ips-network-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<network xmlns="http://docs.openstack.org/compute/api/v1.1" id="private">
- <ip version="4" addr="192.168.0.3"/>
-</network> \ No newline at end of file
diff --git a/doc/api_samples/server-ips-resp.xml b/doc/api_samples/server-ips-resp.xml
deleted file mode 100644
index 2679457ff4..0000000000
--- a/doc/api_samples/server-ips-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<addresses xmlns="http://docs.openstack.org/compute/api/v1.1">
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
-</addresses> \ No newline at end of file
diff --git a/doc/api_samples/server-metadata-all-req.xml b/doc/api_samples/server-metadata-all-req.xml
deleted file mode 100644
index 72811e3025..0000000000
--- a/doc/api_samples/server-metadata-all-req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="foo">Foo Value</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/server-metadata-all-resp.xml b/doc/api_samples/server-metadata-all-resp.xml
deleted file mode 100644
index 55c949c577..0000000000
--- a/doc/api_samples/server-metadata-all-resp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
- <meta key="foo">Foo Value</meta>
-</metadata> \ No newline at end of file
diff --git a/doc/api_samples/server-metadata-req.xml b/doc/api_samples/server-metadata-req.xml
deleted file mode 100644
index f237b2b369..0000000000
--- a/doc/api_samples/server-metadata-req.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="foo">Bar Value</meta> \ No newline at end of file
diff --git a/doc/api_samples/server-metadata-resp.xml b/doc/api_samples/server-metadata-resp.xml
deleted file mode 100644
index c01e16a47a..0000000000
--- a/doc/api_samples/server-metadata-resp.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="foo">Bar Value</meta> \ No newline at end of file
diff --git a/doc/api_samples/server-post-req.xml b/doc/api_samples/server-post-req.xml
deleted file mode 100644
index 2dbbb4438d..0000000000
--- a/doc/api_samples/server-post-req.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <personality>
- <file path="/etc/banner.txt">
- ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
- dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
- IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
- c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
- QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
- ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
- dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
- c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
- b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
- </file>
- </personality>
-</server>
diff --git a/doc/api_samples/server-post-resp.xml b/doc/api_samples/server-post-resp.xml
deleted file mode 100644
index 9725f33bf4..0000000000
--- a/doc/api_samples/server-post-resp.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ea8417a1-7957-4ed5-8b3c-0befc1724308" adminPass="FoFw84XtQj3c">
- <metadata/>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="bookmark"/>
-</server> \ No newline at end of file
diff --git a/doc/api_samples/servers-details-resp.xml b/doc/api_samples/servers-details-resp.xml
deleted file mode 100644
index 83bcf0f79b..0000000000
--- a/doc/api_samples/servers-details-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server status="ACTIVE" updated="2012-09-07T17:11:46Z" hostId="1b3afbff40723a9649091142a647b83eb6e5b49973239cdeb3d1973c" name="new-server-test" created="2012-09-07T17:11:45Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="7c3c0f79-343e-4b99-93bc-2ade47641e64">
- <image id="70a599e0-31e7-49b7-b260-868f441e862b">
- <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
- </image>
- <flavor id="1">
- <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
- </flavor>
- <metadata>
- <meta key="My Server Name">Apache1</meta>
- </metadata>
- <addresses>
- <network id="private">
- <ip version="4" addr="192.168.0.3"/>
- </network>
- </addresses>
- <atom:link href="http://openstack.example.com/v2/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/servers-list-resp.xml b/doc/api_samples/servers-list-resp.xml
deleted file mode 100644
index cbd7892e73..0000000000
--- a/doc/api_samples/servers-list-resp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
- <server name="new-server-test" id="b626796d-d585-4874-b178-78c65289bba4">
- <atom:link href="http://openstack.example.com/v2/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="self"/>
- <atom:link href="http://openstack.example.com/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="bookmark"/>
- </server>
-</servers> \ No newline at end of file
diff --git a/doc/api_samples/versions-get-resp.xml b/doc/api_samples/versions-get-resp.xml
deleted file mode 100644
index 09c4a52f9e..0000000000
--- a/doc/api_samples/versions-get-resp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<versions xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
- <version status="CURRENT" updated="2011-01-21T11:33:21Z" id="v2.0">
- <atom:link href="http://openstack.example.com/v2/" rel="self"/>
- </version>
- <version status="EXPERIMENTAL" updated="2013-07-23T11:33:21Z" id="v2.1">
- <atom:link href="http://openstack.example.com/v2/" rel="self"/>
- </version>
-</versions>