From 1397c31240331d8da80771a1014badc41e172fb2 Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Sun, 23 Feb 2014 09:17:35 -0600 Subject: [PATCH] Fix JSON validation errors Closes-Bug: #1283712 Change-Id: Iea9a63251b7702a33fcdb54c71bfc638774d0418 author: diane fleming --- v2.0/api_samples/network-post-req.json | 7 - v2.0/api_samples/network-post-req.xml | 3 - v2.0/api_samples/network-post-resp.json | 13 - v2.0/api_samples/network-post-resp.xml | 13 - v2.0/api_samples/network-put-update-resp.json | 12 - v2.0/api_samples/network-put-update-resp.xml | 16 - v2.0/api_samples/network-put-update.req.json | 6 - v2.0/api_samples/network-put-update.req.xml | 3 - .../networks-create-bulk-resp.json | 34 - .../api_samples/networks-create-bulk-resp.xml | 33 - .../api_samples/networks-get-detail-resp.json | 12 - v2.0/api_samples/networks-get-detail-resp.xml | 16 - v2.0/api_samples/networks-get-resp.json | 31 - v2.0/api_samples/networks-get-resp.xml | 36 - .../networks-post-create-bulk-req.json | 12 - .../networks-post-create-bulk-req.xml | 8 - v2.0/api_samples/port-get-resp.json | 25 - v2.0/api_samples/port-get-resp.xml | 25 - v2.0/api_samples/port-post-create-req.json | 8 - .../port_create_or_update_resp.json | 26 - .../port_create_or_update_resp.xml | 24 - v2.0/api_samples/ports-create-bulk-resp.json | 48 -- v2.0/api_samples/ports-create-bulk-resp.xml | 46 -- v2.0/api_samples/ports-get-resp.json | 88 --- v2.0/api_samples/ports-get-resp.xml | 87 --- .../ports-post-create-bulk-req.json | 14 - .../ports-post-create-bulk-req.xml | 10 - v2.0/api_samples/quotas-list-res.json | 10 - v2.0/api_samples/quotas-put-req.json | 9 - v2.0/api_samples/quotas-put-res.json | 9 - v2.0/api_samples/quotas-show-res.json | 9 - v2.0/api_samples/subnet-get-detail-res.json | 12 - v2.0/api_samples/subnet-get-detail-res.xml | 6 - v2.0/api_samples/subnet-get-res.json | 8 - v2.0/api_samples/subnet-get-res.xml | 3 - v2.0/api_samples/subnet-post-req.json | 16 - v2.0/api_samples/subnet-post-req.xml | 2 - v2.0/api_samples/subnet-post-res.json | 24 - v2.0/api_samples/subnet-post-res.xml | 2 - .../api_samples/subnets-create-bulk-resp.json | 28 - v2.0/api_samples/subnets-create-bulk-resp.xml | 41 -- v2.0/api_samples/subnets-get-detail-res.json | 18 - v2.0/api_samples/subnets-get-detail-res.xml | 8 - v2.0/api_samples/subnets-get-res.json | 40 -- v2.0/api_samples/subnets-get-res.xml | 6 - v2.0/api_samples/subnets-get-resp.json | 40 -- .../subnets-post-create-bulk-req.json | 14 - .../subnets-post-create-bulk-req.xml | 14 - v2.0/api_samples/subnets_get_resp.json | 29 - ...s.json => agents-delete-res-json-http.txt} | 0 v2.0/samples/agents-list-res.json | 50 +- v2.0/samples/agents-put-res.json | 47 +- v2.0/samples/agents-show-res.json | 47 +- v2.0/samples/extraroute-put-req.json | 19 +- ...son => floatingips-post-req-json-http.txt} | 0 v2.0/samples/floatingips-put-ass-req.json | 10 +- v2.0/samples/floatingips-put-disass-req.json | 9 +- .../health_monitors-list-res.json | 50 +- v2.0/samples/metering-label-create-req.json | 13 - v2.0/samples/metering-label-create-resp.json | 8 - v2.0/samples/metering-label-delete-req.json | 6 - v2.0/samples/metering-label-delete-resp.json | 1 - v2.0/samples/metering-label-get-req.json | 6 - v2.0/samples/metering-label-get-resp.json | 8 - .../metering-label-rule-create-req.json | 14 - .../metering-label-rule-create-resp.json | 9 - .../metering-label-rule-delete-req.json | 6 - .../metering-label-rule-delete-resp.json | 1 - v2.0/samples/metering-label-rule-get-req.json | 6 - .../samples/metering-label-rule-get-resp.json | 9 - .../metering-label-rules-list-get-req.json | 6 - .../metering-label-rules-list-get-resp.json | 18 - .../samples/metering-labels-list-get-req.json | 6 - .../metering-labels-list-get-resp.json | 16 - v2.0/samples/network-post-res.json | 24 +- v2.0/samples/network-post-resp.json | 26 +- v2.0/samples/networks-put-req-extnet.json | 11 +- v2.0/samples/ports-put-req-prov.json | 16 +- ...=> router-create-enablesnat-json-http.txt} | 0 v2.0/samples/router-update-enablesnat-1.json | 10 + .../samples/router-update-enablesnat-1.sample | 55 -- v2.0/samples/router-update-enablesnat-1b.json | 13 + v2.0/samples/router-update-enablesnat-1c.json | 13 + v2.0/samples/router-update-enablesnat-1d.json | 8 + v2.0/samples/router-update-enablesnat-2.json | 10 + .../samples/router-update-enablesnat-2.sample | 55 -- v2.0/samples/router-update-enablesnat-2b.json | 13 + v2.0/samples/router-update-enablesnat-2c.json | 7 + v2.0/samples/router-update-enablesnat-2d.json | 13 + v2.0/samples/router-update-enablesnat-3.json | 14 + .../samples/router-update-enablesnat-3.sample | 56 -- v2.0/samples/router-update-enablesnat-3b.json | 13 + v2.0/samples/router-update-enablesnat-3c.json | 8 + v2.0/samples/router-update-enablesnat-3d.json | 13 + v2.0/samples/routers-post-req.json | 12 +- v2.0/samples/routers-put-req.json | 15 +- ...-security-groups-create-req-json-http.txt} | 0 ...-security-groups-delete-req-json-http.txt} | 0 ...security-groups-delete-resp-json-http.txt} | 0 ...les-security-groups-get-req-json-http.txt} | 0 ...ecurity-groups-list-get-req-json-http.txt} | 0 ...es-security-groups-post-req-json-http.txt} | 0 v2.0/samples/sche-dhcp-list-res.json | 50 +- v2.0/samples/sche-l3-list-res.json | 56 +- ...on => sche-network-dhcp-res-json-http.txt} | 0 v2.0/samples/sche-network-list-res.json | 90 +-- ....json => sche-router-l3-res-json-http.txt} | 0 v2.0/samples/sche-router-list-res.json | 28 +- ... => security-group-post-req-json-http.txt} | 0 v2.0/samples/security-groups-create-req.json | 2 - ... security-groups-delete-req-json-http.txt} | 0 ...security-groups-delete-resp-json-http.txt} | 0 ... => security-groups-get-req-json-http.txt} | 0 ...ecurity-groups-list-get-req-json-http.txt} | 0 v2.0/samples/subnet-get-detail-res.json | 17 +- v2.0/samples/subnet-post-req.json | 30 +- v2.0/samples/subnet-post-res.json | 44 +- v2.0/samples/subnets-get-detail-res.json | 32 +- v2.0/samples/subnets_get_resp.json | 61 +- v2.0/section_neutron-agent-ext.xml | 2 +- v2.0/section_neutron-extgwmodes-ext.xml | 17 +- v2.0/section_neutron-l3-ext.xml | 2 +- v2.0/section_neutron-metering-ext.xml | 2 +- v2.0/section_neutron-scheduler-ext.xml | 4 +- v2.0/wadl/common.ent | 618 ------------------ v2.0/wadl/metering-labels.wadl | 444 ------------- v2.0/wadl/os-networks.wadl | 539 --------------- 127 files changed, 503 insertions(+), 3309 deletions(-) delete mode 100644 v2.0/api_samples/network-post-req.json delete mode 100644 v2.0/api_samples/network-post-req.xml delete mode 100644 v2.0/api_samples/network-post-resp.json delete mode 100644 v2.0/api_samples/network-post-resp.xml delete mode 100644 v2.0/api_samples/network-put-update-resp.json delete mode 100644 v2.0/api_samples/network-put-update-resp.xml delete mode 100644 v2.0/api_samples/network-put-update.req.json delete mode 100644 v2.0/api_samples/network-put-update.req.xml delete mode 100644 v2.0/api_samples/networks-create-bulk-resp.json delete mode 100644 v2.0/api_samples/networks-create-bulk-resp.xml delete mode 100644 v2.0/api_samples/networks-get-detail-resp.json delete mode 100644 v2.0/api_samples/networks-get-detail-resp.xml delete mode 100644 v2.0/api_samples/networks-get-resp.json delete mode 100644 v2.0/api_samples/networks-get-resp.xml delete mode 100644 v2.0/api_samples/networks-post-create-bulk-req.json delete mode 100644 v2.0/api_samples/networks-post-create-bulk-req.xml delete mode 100644 v2.0/api_samples/port-get-resp.json delete mode 100644 v2.0/api_samples/port-get-resp.xml delete mode 100644 v2.0/api_samples/port-post-create-req.json delete mode 100644 v2.0/api_samples/port_create_or_update_resp.json delete mode 100644 v2.0/api_samples/port_create_or_update_resp.xml delete mode 100644 v2.0/api_samples/ports-create-bulk-resp.json delete mode 100644 v2.0/api_samples/ports-create-bulk-resp.xml delete mode 100644 v2.0/api_samples/ports-get-resp.json delete mode 100644 v2.0/api_samples/ports-get-resp.xml delete mode 100644 v2.0/api_samples/ports-post-create-bulk-req.json delete mode 100644 v2.0/api_samples/ports-post-create-bulk-req.xml delete mode 100644 v2.0/api_samples/quotas-list-res.json delete mode 100644 v2.0/api_samples/quotas-put-req.json delete mode 100644 v2.0/api_samples/quotas-put-res.json delete mode 100644 v2.0/api_samples/quotas-show-res.json delete mode 100644 v2.0/api_samples/subnet-get-detail-res.json delete mode 100644 v2.0/api_samples/subnet-get-detail-res.xml delete mode 100644 v2.0/api_samples/subnet-get-res.json delete mode 100644 v2.0/api_samples/subnet-get-res.xml delete mode 100644 v2.0/api_samples/subnet-post-req.json delete mode 100644 v2.0/api_samples/subnet-post-req.xml delete mode 100644 v2.0/api_samples/subnet-post-res.json delete mode 100644 v2.0/api_samples/subnet-post-res.xml delete mode 100644 v2.0/api_samples/subnets-create-bulk-resp.json delete mode 100644 v2.0/api_samples/subnets-create-bulk-resp.xml delete mode 100644 v2.0/api_samples/subnets-get-detail-res.json delete mode 100644 v2.0/api_samples/subnets-get-detail-res.xml delete mode 100644 v2.0/api_samples/subnets-get-res.json delete mode 100644 v2.0/api_samples/subnets-get-res.xml delete mode 100644 v2.0/api_samples/subnets-get-resp.json delete mode 100644 v2.0/api_samples/subnets-post-create-bulk-req.json delete mode 100644 v2.0/api_samples/subnets-post-create-bulk-req.xml delete mode 100644 v2.0/api_samples/subnets_get_resp.json rename v2.0/samples/{agents-delete-res.json => agents-delete-res-json-http.txt} (100%) rename v2.0/samples/{floatingips-post-req.json => floatingips-post-req-json-http.txt} (100%) delete mode 100644 v2.0/samples/metering-label-create-req.json delete mode 100644 v2.0/samples/metering-label-create-resp.json delete mode 100644 v2.0/samples/metering-label-delete-req.json delete mode 100644 v2.0/samples/metering-label-delete-resp.json delete mode 100644 v2.0/samples/metering-label-get-req.json delete mode 100644 v2.0/samples/metering-label-get-resp.json delete mode 100644 v2.0/samples/metering-label-rule-create-req.json delete mode 100644 v2.0/samples/metering-label-rule-create-resp.json delete mode 100644 v2.0/samples/metering-label-rule-delete-req.json delete mode 100644 v2.0/samples/metering-label-rule-delete-resp.json delete mode 100644 v2.0/samples/metering-label-rule-get-req.json delete mode 100644 v2.0/samples/metering-label-rule-get-resp.json delete mode 100644 v2.0/samples/metering-label-rules-list-get-req.json delete mode 100644 v2.0/samples/metering-label-rules-list-get-resp.json delete mode 100644 v2.0/samples/metering-labels-list-get-req.json delete mode 100644 v2.0/samples/metering-labels-list-get-resp.json rename v2.0/samples/{router-create-enablesnat.sample => router-create-enablesnat-json-http.txt} (100%) create mode 100644 v2.0/samples/router-update-enablesnat-1.json delete mode 100644 v2.0/samples/router-update-enablesnat-1.sample create mode 100644 v2.0/samples/router-update-enablesnat-1b.json create mode 100644 v2.0/samples/router-update-enablesnat-1c.json create mode 100644 v2.0/samples/router-update-enablesnat-1d.json create mode 100644 v2.0/samples/router-update-enablesnat-2.json delete mode 100644 v2.0/samples/router-update-enablesnat-2.sample create mode 100644 v2.0/samples/router-update-enablesnat-2b.json create mode 100644 v2.0/samples/router-update-enablesnat-2c.json create mode 100644 v2.0/samples/router-update-enablesnat-2d.json create mode 100644 v2.0/samples/router-update-enablesnat-3.json delete mode 100644 v2.0/samples/router-update-enablesnat-3.sample create mode 100644 v2.0/samples/router-update-enablesnat-3b.json create mode 100644 v2.0/samples/router-update-enablesnat-3c.json create mode 100644 v2.0/samples/router-update-enablesnat-3d.json rename v2.0/samples/{rules-security-groups-create-req.json => rules-security-groups-create-req-json-http.txt} (100%) rename v2.0/samples/{rules-security-groups-delete-req.json => rules-security-groups-delete-req-json-http.txt} (100%) rename v2.0/samples/{rules-security-groups-delete-resp.json => rules-security-groups-delete-resp-json-http.txt} (100%) rename v2.0/samples/{rules-security-groups-get-req.json => rules-security-groups-get-req-json-http.txt} (100%) rename v2.0/samples/{rules-security-groups-list-get-req.json => rules-security-groups-list-get-req-json-http.txt} (100%) rename v2.0/samples/{rules-security-groups-post-req.json => rules-security-groups-post-req-json-http.txt} (100%) rename v2.0/samples/{sche-network-dhcp-res.json => sche-network-dhcp-res-json-http.txt} (100%) rename v2.0/samples/{sche-router-l3-res.json => sche-router-l3-res-json-http.txt} (100%) rename v2.0/samples/{security-group-post-req.json => security-group-post-req-json-http.txt} (100%) rename v2.0/samples/{security-groups-delete-req.json => security-groups-delete-req-json-http.txt} (100%) rename v2.0/samples/{security-groups-delete-resp.json => security-groups-delete-resp-json-http.txt} (100%) rename v2.0/samples/{security-groups-get-req.json => security-groups-get-req-json-http.txt} (100%) rename v2.0/samples/{security-groups-list-get-req.json => security-groups-list-get-req-json-http.txt} (100%) delete mode 100644 v2.0/wadl/common.ent delete mode 100644 v2.0/wadl/metering-labels.wadl delete mode 100644 v2.0/wadl/os-networks.wadl diff --git a/v2.0/api_samples/network-post-req.json b/v2.0/api_samples/network-post-req.json deleted file mode 100644 index 52075f4..0000000 --- a/v2.0/api_samples/network-post-req.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "network": - { - "name": "sample_network", - "admin_state_up": false - } -} \ No newline at end of file diff --git a/v2.0/api_samples/network-post-req.xml b/v2.0/api_samples/network-post-req.xml deleted file mode 100644 index e39bc94..0000000 --- a/v2.0/api_samples/network-post-req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - sample_network - diff --git a/v2.0/api_samples/network-post-resp.json b/v2.0/api_samples/network-post-resp.json deleted file mode 100644 index 83d5ae2..0000000 --- a/v2.0/api_samples/network-post-resp.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "network":{ - "admin_state_up":true, - "id":"850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", - "name":"sample_network", - "shared":false, - "status":"ACTIVE", - "subnets":[ - - ], - "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce" - } -} diff --git a/v2.0/api_samples/network-post-resp.xml b/v2.0/api_samples/network-post-resp.xml deleted file mode 100644 index 4101965..0000000 --- a/v2.0/api_samples/network-post-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - ACTIVE - - sample_network - 4be6b806faa0491eb358018bbe9f0d4e - True - False - 0657ef52-d3f6-4320-9c26-015a3e9badea - diff --git a/v2.0/api_samples/network-put-update-resp.json b/v2.0/api_samples/network-put-update-resp.json deleted file mode 100644 index f9b1f94..0000000 --- a/v2.0/api_samples/network-put-update-resp.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "network": - { - "status": "ACTIVE", - "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"], - "name": "private", - "admin_state_up": true, - "tenant_id": "625887121e364204873d362b553ab171", - "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a", - "shared": false - } -} diff --git a/v2.0/api_samples/network-put-update-resp.xml b/v2.0/api_samples/network-put-update-resp.xml deleted file mode 100644 index 3e90de6..0000000 --- a/v2.0/api_samples/network-put-update-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ACTIVE - - e12f0c45-46e3-446a-b207-9474b27687a6 - - private - - True - 625887121e364204873d362b553ab171 - local - False - False - 9d83c053-b0a4-4682-ae80-c00df269ce0a - - diff --git a/v2.0/api_samples/network-put-update.req.json b/v2.0/api_samples/network-put-update.req.json deleted file mode 100644 index 37fe569..0000000 --- a/v2.0/api_samples/network-put-update.req.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "network": - { - "name": "updated_name" - } -} diff --git a/v2.0/api_samples/network-put-update.req.xml b/v2.0/api_samples/network-put-update.req.xml deleted file mode 100644 index d43bdde..0000000 --- a/v2.0/api_samples/network-put-update.req.xml +++ /dev/null @@ -1,3 +0,0 @@ - - nova2 - diff --git a/v2.0/api_samples/networks-create-bulk-resp.json b/v2.0/api_samples/networks-create-bulk-resp.json deleted file mode 100644 index d2136bf..0000000 --- a/v2.0/api_samples/networks-create-bulk-resp.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "networks":[ - { - "status":"ACTIVE", - "subnets":[ - - ], - "name":"sample_network_1", - "provider:physical_network":null, - "admin_state_up":false, - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", - "provider:network_type":"local", - "router:external":false, - "shared":false, - "id":"e9330b1f-a2ef-4160-a951-169ee6ab17f5", - "provider:segmentation_id":null - }, - { - "status":"ACTIVE", - "subnets":[ - - ], - "name":"sample_network_2", - "provider:physical_network":null, - "admin_state_up":false, - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", - "provider:network_type":"local", - "router:external":false, - "shared":false, - "id":"cfb5f52c-dfe2-4357-a10d-a225693e2b84", - "provider:segmentation_id":null - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/networks-create-bulk-resp.xml b/v2.0/api_samples/networks-create-bulk-resp.xml deleted file mode 100644 index e297861..0000000 --- a/v2.0/api_samples/networks-create-bulk-resp.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - ACTIVE - - sample_network_1 - - True - 60cd4f6dbc2f491982a284e7b83b5be3 - local - False - False - 9eb3ce34-183b-4a75-b08f-d6a3d241e68b - - - - ACTIVE - - sample_network_2 - - True - 60cd4f6dbc2f491982a284e7b83b5be3 - local - False - False - df679a25-915d-41ed-b5ec-721481ddfd56 - - - diff --git a/v2.0/api_samples/networks-get-detail-resp.json b/v2.0/api_samples/networks-get-detail-resp.json deleted file mode 100644 index f9b1f94..0000000 --- a/v2.0/api_samples/networks-get-detail-resp.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "network": - { - "status": "ACTIVE", - "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"], - "name": "private", - "admin_state_up": true, - "tenant_id": "625887121e364204873d362b553ab171", - "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a", - "shared": false - } -} diff --git a/v2.0/api_samples/networks-get-detail-resp.xml b/v2.0/api_samples/networks-get-detail-resp.xml deleted file mode 100644 index 3e90de6..0000000 --- a/v2.0/api_samples/networks-get-detail-resp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - ACTIVE - - e12f0c45-46e3-446a-b207-9474b27687a6 - - private - - True - 625887121e364204873d362b553ab171 - local - False - False - 9d83c053-b0a4-4682-ae80-c00df269ce0a - - diff --git a/v2.0/api_samples/networks-get-resp.json b/v2.0/api_samples/networks-get-resp.json deleted file mode 100644 index c204d4a..0000000 --- a/v2.0/api_samples/networks-get-resp.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "networks": [ - { - "status": "ACTIVE", - "subnets": ["a318fcb4-9ff0-4485-b78c-9e6738c21b26"], - "name": "private", - "admin_state_up": true, - "tenant_id": "625887121e364204873d362b553ab171", - "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a", - "shared": false - }, - { - "status": "ACTIVE", - "subnets": ["aca4d43c-c48c-4a2c-9bb6-ba374ef7e135"], - "name": "nova", - "admin_state_up": true, - "tenant_id": "63878e4c5dd649d2a980e37aefddfa87", - "id": "ebda9658-093b-41ba-80ce-0cf8cb8365d4", - "shared": false - }, - { - "status": "ACTIVE", - "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"], - "name": "network_3", - "admin_state_up": true, - "tenant_id": "ed680f49ff714162ab3612d7876ffce5", - "id": "afc75773-640e-403c-9fff-62ba98db1f19", - "shared": true - } - ] -} diff --git a/v2.0/api_samples/networks-get-resp.xml b/v2.0/api_samples/networks-get-resp.xml deleted file mode 100644 index 14d0f7f..0000000 --- a/v2.0/api_samples/networks-get-resp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - ACTIVE - - a318fcb4-9ff0-4485-b78c-9e6738c21b26 - - private - - True - 625887121e364204873d362b553ab171 - local - False - False - 9d83c053-b0a4-4682-ae80-c00df269ce0a - - - - ACTIVE - - aca4d43c-c48c-4a2c-9bb6-ba374ef7e135 - - nova - - True - 63878e4c5dd649d2a980e37aefddfa87 - local - True - False - ebda9658-093b-41ba-80ce-0cf8cb8365d4 - - - diff --git a/v2.0/api_samples/networks-post-create-bulk-req.json b/v2.0/api_samples/networks-post-create-bulk-req.json deleted file mode 100644 index 858f505..0000000 --- a/v2.0/api_samples/networks-post-create-bulk-req.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "networks":[ - { - "name":"sample_network_1", - "admin_state_up":false - }, - { - "name":"sample_network_2", - "admin_state_up":false - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/networks-post-create-bulk-req.xml b/v2.0/api_samples/networks-post-create-bulk-req.xml deleted file mode 100644 index cfc344f..0000000 --- a/v2.0/api_samples/networks-post-create-bulk-req.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - sample_network_1 - - - sample_network_2 - - diff --git a/v2.0/api_samples/port-get-resp.json b/v2.0/api_samples/port-get-resp.json deleted file mode 100644 index 6e6bf67..0000000 --- a/v2.0/api_samples/port-get-resp.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "port":[ - { - "status":"ACTIVE", - "name":"", - "admin_state_up":true, - "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4", - "tenant_id":"63878e4c5dd649d2a980e37aefddfa87", - "binding:vif_type":"ovs", - "device_owner":"compute:None", - "binding:capabilities":{ - "port_filter":false - }, - "mac_address":"fa:16:3e:b9:ef:05", - "fixed_ips":[ - { - "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135", - "ip_address":"172.24.4.227" - } - ], - "id":"664ebd1a-facd-4c20-948c-07a784475ab0", - "device_id":"f288bb5f-920d-4276-8345-2c0319c16f58" - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/port-get-resp.xml b/v2.0/api_samples/port-get-resp.xml deleted file mode 100644 index 2ff1616..0000000 --- a/v2.0/api_samples/port-get-resp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - ACTIVE - - True - ebda9658-093b-41ba-80ce-0cf8cb8365d4 - 63878e4c5dd649d2a980e37aefddfa87 - ovs - compute:None - - False - - fa:16:3e:b9:ef:05 - - - aca4d43c-c48c-4a2c-9bb6-ba374ef7e135 - 172.24.4.227 - - - 664ebd1a-facd-4c20-948c-07a784475ab0 - f288bb5f-920d-4276-8345-2c0319c16f58 - diff --git a/v2.0/api_samples/port-post-create-req.json b/v2.0/api_samples/port-post-create-req.json deleted file mode 100644 index 26c40f2..0000000 --- a/v2.0/api_samples/port-post-create-req.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "port": { - "admin_state_up": true, - "device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0", - "name": "port1", - "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12" - } -} \ No newline at end of file diff --git a/v2.0/api_samples/port_create_or_update_resp.json b/v2.0/api_samples/port_create_or_update_resp.json deleted file mode 100644 index f0e9014..0000000 --- a/v2.0/api_samples/port_create_or_update_resp.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "port":[ - { - "status":"DOWN", - "binding:host_id":null, - "name":"sample_port_1", - "admin_state_up":true, - "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce", - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", - "binding:vif_type":"ovs", - "device_owner":"", - "binding:capabilities":{ - "port_filter":true - }, - "mac_address":"fa:16:3e:2e:7c:8a", - "fixed_ips":[ - - ], - "id":"8fb361d8-bab0-418d-b1b8-7204a230fb06", - "security_groups":[ - "99f465bc-0d7c-4142-8829-7ae0179f2fa8" - ], - "device_id":"" - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/port_create_or_update_resp.xml b/v2.0/api_samples/port_create_or_update_resp.xml deleted file mode 100644 index d529505..0000000 --- a/v2.0/api_samples/port_create_or_update_resp.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - DOWN - - test_port_1 - True - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 60cd4f6dbc2f491982a284e7b83b5be3 - ovs - - - True - - fa:16:3e:c9:8d:cf - - 7f0aa3f1-883a-43b2-8d1b-e85fac52b417 - - 99f465bc-0d7c-4142-8829-7ae0179f2fa8 - - - diff --git a/v2.0/api_samples/ports-create-bulk-resp.json b/v2.0/api_samples/ports-create-bulk-resp.json deleted file mode 100644 index 7780db1..0000000 --- a/v2.0/api_samples/ports-create-bulk-resp.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "ports":[ - { - "status":"DOWN", - "binding:host_id":null, - "name":"sample_port_1", - "admin_state_up":true, - "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce", - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", - "binding:vif_type":"ovs", - "device_owner":"", - "binding:capabilities":{ - "port_filter":true - }, - "mac_address":"fa:16:3e:2e:7c:8a", - "fixed_ips":[ - - ], - "id":"8fb361d8-bab0-418d-b1b8-7204a230fb06", - "security_groups":[ - "99f465bc-0d7c-4142-8829-7ae0179f2fa8" - ], - "device_id":"" - }, - { - "status":"DOWN", - "binding:host_id":null, - "name":"sample_port_2", - "admin_state_up":false, - "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce", - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", - "binding:vif_type":"ovs", - "device_owner":"", - "binding:capabilities":{ - "port_filter":true - }, - "mac_address":"fa:16:3e:0a:4e:13", - "fixed_ips":[ - - ], - "id":"d4c93b0b-f593-424e-a199-d648478a5a3c", - "security_groups":[ - "99f465bc-0d7c-4142-8829-7ae0179f2fa8" - ], - "device_id":"" - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/ports-create-bulk-resp.xml b/v2.0/api_samples/ports-create-bulk-resp.xml deleted file mode 100644 index fb62a7b..0000000 --- a/v2.0/api_samples/ports-create-bulk-resp.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - DOWN - - test_port_1 - True - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 60cd4f6dbc2f491982a284e7b83b5be3 - ovs - - - True - - fa:16:3e:c9:8d:cf - - 7f0aa3f1-883a-43b2-8d1b-e85fac52b417 - - 99f465bc-0d7c-4142-8829-7ae0179f2fa8 - - - - - DOWN - - test_port_2 - True - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 60cd4f6dbc2f491982a284e7b83b5be3 - ovs - - - True - - fa:16:3e:79:90:81 - - a4a81484-c1c4-4b2b-95bc-f8c4484241d0 - - 99f465bc-0d7c-4142-8829-7ae0179f2fa8 - - - - diff --git a/v2.0/api_samples/ports-get-resp.json b/v2.0/api_samples/ports-get-resp.json deleted file mode 100644 index dc2dde2..0000000 --- a/v2.0/api_samples/ports-get-resp.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "ports":[ - { - "status":"ACTIVE", - "name":"", - "admin_state_up":true, - "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4", - "tenant_id":"63878e4c5dd649d2a980e37aefddfa87", - "binding:vif_type":"ovs", - "device_owner":"compute:None", - "binding:capabilities":{ - "port_filter":false - }, - "mac_address":"fa:16:3e:b9:ef:05", - "fixed_ips":[ - { - "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135", - "ip_address":"172.24.4.227" - } - ], - "id":"664ebd1a-facd-4c20-948c-07a784475ab0", - "device_id":"f288bb5f-920d-4276-8345-2c0319c16f58" - }, - { - "status":"DOWN", - "name":"", - "admin_state_up":true, - "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4", - "tenant_id":"", - "binding:vif_type":"ovs", - "device_owner":"network:router_gateway", - "binding:capabilities":{ - "port_filter":false - }, - "mac_address":"fa:16:3e:4a:3a:a2", - "fixed_ips":[ - { - "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135", - "ip_address":"172.24.4.226" - } - ], - "id":"c5ca7017-c390-4ccc-8cd7-333747e57fef", - "device_id":"0dc517bf-9169-4aa6-88b7-569219962881" - }, - { - "status":"ACTIVE", - "name":"", - "admin_state_up":true, - "network_id":"9d83c053-b0a4-4682-ae80-c00df269ce0a", - "tenant_id":"625887121e364204873d362b553ab171", - "binding:vif_type":"ovs", - "device_owner":"network:router_interface", - "binding:capabilities":{ - "port_filter":false - }, - "mac_address":"fa:16:3e:2d:dc:7e", - "fixed_ips":[ - { - "subnet_id":"a318fcb4-9ff0-4485-b78c-9e6738c21b26", - "ip_address":"10.0.0.1" - } - ], - "id":"d7815f5b-a228-47bb-a5e5-f139c4e476f6", - "device_id":"0dc517bf-9169-4aa6-88b7-569219962881" - }, - { - "status":"ACTIVE", - "name":"", - "admin_state_up":true, - "network_id":"9d83c053-b0a4-4682-ae80-c00df269ce0a", - "tenant_id":"625887121e364204873d362b553ab171", - "binding:vif_type":"ovs", - "device_owner":"network:dhcp", - "binding:capabilities":{ - "port_filter":false - }, - "mac_address":"fa:16:3e:73:6d:1c", - "fixed_ips":[ - { - "subnet_id":"a318fcb4-9ff0-4485-b78c-9e6738c21b26", - "ip_address":"10.0.0.2" - } - ], - "id":"f8639521-fab2-4879-94b2-83a47bee8a26", - "device_id":"dhcpe1b8334f-9be9-5e49-aeee-b31e6df6c847-9d83c053-b0a4-4682-ae80-c00df269ce0a" - } - ] -} \ No newline at end of file diff --git a/v2.0/api_samples/ports-get-resp.xml b/v2.0/api_samples/ports-get-resp.xml deleted file mode 100644 index faa9cbf..0000000 --- a/v2.0/api_samples/ports-get-resp.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - ACTIVE - - True - ebda9658-093b-41ba-80ce-0cf8cb8365d4 - 63878e4c5dd649d2a980e37aefddfa87 - ovs - compute:None - - False - - fa:16:3e:b9:ef:05 - - - aca4d43c-c48c-4a2c-9bb6-ba374ef7e135 - 172.24.4.227 - - - 664ebd1a-facd-4c20-948c-07a784475ab0 - f288bb5f-920d-4276-8345-2c0319c16f58 - - - DOWN - - True - ebda9658-093b-41ba-80ce-0cf8cb8365d4 - - ovs - network:router_gateway - - False - - fa:16:3e:4a:3a:a2 - - - aca4d43c-c48c-4a2c-9bb6-ba374ef7e135 - 172.24.4.226 - - - c5ca7017-c390-4ccc-8cd7-333747e57fef - 0dc517bf-9169-4aa6-88b7-569219962881 - - - ACTIVE - - True - 9d83c053-b0a4-4682-ae80-c00df269ce0a - 625887121e364204873d362b553ab171 - ovs - network:router_interface - - False - - fa:16:3e:2d:dc:7e - - - a318fcb4-9ff0-4485-b78c-9e6738c21b26 - 10.0.0.1 - - - d7815f5b-a228-47bb-a5e5-f139c4e476f6 - 0dc517bf-9169-4aa6-88b7-569219962881 - - - ACTIVE - - True - 9d83c053-b0a4-4682-ae80-c00df269ce0a - 625887121e364204873d362b553ab171 - ovs - network:dhcp - - False - - fa:16:3e:73:6d:1c - - - a318fcb4-9ff0-4485-b78c-9e6738c21b26 - 10.0.0.2 - - - f8639521-fab2-4879-94b2-83a47bee8a26 - dhcpe1b8334f-9be9-5e49-aeee-b31e6df6c847-9d83c053-b0a4-4682-ae80-c00df269ce0a - - diff --git a/v2.0/api_samples/ports-post-create-bulk-req.json b/v2.0/api_samples/ports-post-create-bulk-req.json deleted file mode 100644 index 1430d74..0000000 --- a/v2.0/api_samples/ports-post-create-bulk-req.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ports":[ - { - "name":"sample_port_1", - "admin_state_up":false, - "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce" - }, - { - "name":"sample_port_2", - "admin_state_up":false, - "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce" - } - ] -} diff --git a/v2.0/api_samples/ports-post-create-bulk-req.xml b/v2.0/api_samples/ports-post-create-bulk-req.xml deleted file mode 100644 index 2bda50c..0000000 --- a/v2.0/api_samples/ports-post-create-bulk-req.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - test_port_1 - a3775a7d-9f8b-4148-be81-c84bbd0837ce - - - test_port_2 - a3775a7d-9f8b-4148-be81-c84bbd0837ce - - diff --git a/v2.0/api_samples/quotas-list-res.json b/v2.0/api_samples/quotas-list-res.json deleted file mode 100644 index 4e4f15f..0000000 --- a/v2.0/api_samples/quotas-list-res.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "quotas": [{ - "subnet": 10, - "network": 10, - "floatingip": 50, - "tenant_id": "b7445f221cda4f4a8ac7db6b218b1339", - "router": 10, - "port": 30 - }] -} \ No newline at end of file diff --git a/v2.0/api_samples/quotas-put-req.json b/v2.0/api_samples/quotas-put-req.json deleted file mode 100644 index c7e298e..0000000 --- a/v2.0/api_samples/quotas-put-req.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "quota": { - "subnet": 40, - "router": 50, - "network": 10, - "floatingip": 30, - "port": 30 - } -} \ No newline at end of file diff --git a/v2.0/api_samples/quotas-put-res.json b/v2.0/api_samples/quotas-put-res.json deleted file mode 100644 index 38d6b35..0000000 --- a/v2.0/api_samples/quotas-put-res.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "quota": { - "subnet": 40, - "router": 50, - "port": 30, - "network": 10, - "floatingip": 30 - } -} \ No newline at end of file diff --git a/v2.0/api_samples/quotas-show-res.json b/v2.0/api_samples/quotas-show-res.json deleted file mode 100644 index 7579982..0000000 --- a/v2.0/api_samples/quotas-show-res.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "quota": { - "subnet": 10, - "router": 10, - "port": 50, - "network": 10, - "floatingip": 50 - } -} \ No newline at end of file diff --git a/v2.0/api_samples/subnet-get-detail-res.json b/v2.0/api_samples/subnet-get-detail-res.json deleted file mode 100644 index 63be6bd..0000000 --- a/v2.0/api_samples/subnet-get-detail-res.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "port": - { - "state": "DOWN", - "id": "98017ddc-efc8-4c25-a915-774b2a633855", - "attachment": - { - "id": "test_interface_identifier" - } - } -} - diff --git a/v2.0/api_samples/subnet-get-detail-res.xml b/v2.0/api_samples/subnet-get-detail-res.xml deleted file mode 100644 index d0dbce8..0000000 --- a/v2.0/api_samples/subnet-get-detail-res.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/v2.0/api_samples/subnet-get-res.json b/v2.0/api_samples/subnet-get-res.json deleted file mode 100644 index 8ded3d2..0000000 --- a/v2.0/api_samples/subnet-get-res.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "port": - { - "state": "DOWN", - "id": "98017ddc-efc8-4c25-a915-774b2a633855" - } -} - diff --git a/v2.0/api_samples/subnet-get-res.xml b/v2.0/api_samples/subnet-get-res.xml deleted file mode 100644 index 622f397..0000000 --- a/v2.0/api_samples/subnet-get-res.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/v2.0/api_samples/subnet-post-req.json b/v2.0/api_samples/subnet-post-req.json deleted file mode 100644 index fa33b66..0000000 --- a/v2.0/api_samples/subnet-post-req.json +++ /dev/null @@ -1,16 +0,0 @@ -status: 201, -content-length: 306, -content-type: application/json - -{ - "subnet": { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.0.3.20", "end": "10.0.3.150"}], - "gateway_ip": "10.0.3.1", - "ip_version": 4, - "cidr": "10.0.3.0/24", - "id": "9436e561-47bf-436a-b1f1-fe23a926e031", - "enable_dhcp": true} -} \ No newline at end of file diff --git a/v2.0/api_samples/subnet-post-req.xml b/v2.0/api_samples/subnet-post-req.xml deleted file mode 100644 index 4f8c1f6..0000000 --- a/v2.0/api_samples/subnet-post-req.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/v2.0/api_samples/subnet-post-res.json b/v2.0/api_samples/subnet-post-res.json deleted file mode 100644 index 9cec3c5..0000000 --- a/v2.0/api_samples/subnet-post-res.json +++ /dev/null @@ -1,24 +0,0 @@ -status: 200 -content-length: 381 -content-type: application/json - -{ - "subnet": { - "allocation_pools": [ - { - "end": "10.0.3.254", - "start": "10.0.3.2" - } - ], - "cidr": "10.0.3.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.3.1", - "host_routes": [], - "id": "91e47a57-7508-46fe-afc9-fc454e8580e1", - "ip_version": 4, - "name": "sample_subnet", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } -} diff --git a/v2.0/api_samples/subnet-post-res.xml b/v2.0/api_samples/subnet-post-res.xml deleted file mode 100644 index f1564b8..0000000 --- a/v2.0/api_samples/subnet-post-res.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/v2.0/api_samples/subnets-create-bulk-resp.json b/v2.0/api_samples/subnets-create-bulk-resp.json deleted file mode 100644 index 70086c8..0000000 --- a/v2.0/api_samples/subnets-create-bulk-resp.json +++ /dev/null @@ -1,28 +0,0 @@ -{ -"subnets": [ -{ -"name": "sample_subnet_1", -"enable_dhcp": true, -"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce", -"tenant_id": "60cd4f6dbc2f491982a284e7b83b5be3", -"dns_nameservers": [], -"allocation_pools":[{"start": "10.100.0.2", "end": "10.100.255.254"}], -"host_routes": [], -"ip_version": 4, -"gateway_ip": "10.100.0.1", -"cidr": "10.100.0.0/16", -"id": "70ffbaeb-4b43-4605-abe6-4c5bdbb8236b" -}, -{ -"name": "sample_subnet_2", -"enable_dhcp": true, -"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce", -"tenant_id": "60cd4f6dbc2f491982a284e7b83b5be3", -"dns_nameservers": [], -"allocation_pools": [{"start": "172.16.0.2", "end": "172.31.255.254"}], -"host_routes": [], -"ip_version": 4, -"gateway_ip": "172.16.0.1", -"cidr": "172.16.0.0/12", -"id": "d849e3fc-557d-4b27-8f1c-aceca1daa410"}] -} diff --git a/v2.0/api_samples/subnets-create-bulk-resp.xml b/v2.0/api_samples/subnets-create-bulk-resp.xml deleted file mode 100644 index fec5e87..0000000 --- a/v2.0/api_samples/subnets-create-bulk-resp.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - test_subnet_1 - True - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 60cd4f6dbc2f491982a284e7b83b5be3 - - - - 10.0.0.2 - 10.255.255.254 - - - - 4 - 10.0.0.1 - 10.0.0.0/8 - bd3fd365-fe19-431a-be63-07017a09316c - - - test_subnet_2 - True - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 60cd4f6dbc2f491982a284e7b83b5be3 - - - - 192.168.0.2 - 192.168.255.254 - - - - 4 - 192.168.0.1 - 192.168.0.0/16 - 86e7c838-fb75-402b-9dbf-d68166e3f5fe - - diff --git a/v2.0/api_samples/subnets-get-detail-res.json b/v2.0/api_samples/subnets-get-detail-res.json deleted file mode 100644 index d66231c..0000000 --- a/v2.0/api_samples/subnets-get-detail-res.json +++ /dev/null @@ -1,18 +0,0 @@ -status: 200 -content-length: 309 -content-type: application/json - -{ - "subnet": - { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.10.0.2", "end": "10.10.0.254"}], - "gateway_ip": "10.10.0.1", - "ip_version": 4, - "cidr": "10.10.0.0/24", - "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", - "enable_dhcp": false, - } -} \ No newline at end of file diff --git a/v2.0/api_samples/subnets-get-detail-res.xml b/v2.0/api_samples/subnets-get-detail-res.xml deleted file mode 100644 index 605b98d..0000000 --- a/v2.0/api_samples/subnets-get-detail-res.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/v2.0/api_samples/subnets-get-res.json b/v2.0/api_samples/subnets-get-res.json deleted file mode 100644 index 02afcea..0000000 --- a/v2.0/api_samples/subnets-get-res.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "subnets": [ - { - "allocation_pools": [ - { - "end": "10.0.3.254", - "start": "10.0.3.2" - } - ], - "cidr": "10.0.3.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.3.1", - "host_routes": [], - "id": "91e47a57-7508-46fe-afc9-fc454e8580e1", - "ip_version": 4, - "name": "", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - }, - { - "allocation_pools": [ - { - "end": "10.0.2.254", - "start": "10.0.2.2" - } - ], - "cidr": "10.0.2.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.2.1", - "host_routes": [], - "id": "e3c3620c-9d24-4470-b226-739da2f617c0", - "ip_version": 4, - "name": "", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } - ] -} diff --git a/v2.0/api_samples/subnets-get-res.xml b/v2.0/api_samples/subnets-get-res.xml deleted file mode 100644 index 73ac5a3..0000000 --- a/v2.0/api_samples/subnets-get-res.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/v2.0/api_samples/subnets-get-resp.json b/v2.0/api_samples/subnets-get-resp.json deleted file mode 100644 index 02afcea..0000000 --- a/v2.0/api_samples/subnets-get-resp.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "subnets": [ - { - "allocation_pools": [ - { - "end": "10.0.3.254", - "start": "10.0.3.2" - } - ], - "cidr": "10.0.3.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.3.1", - "host_routes": [], - "id": "91e47a57-7508-46fe-afc9-fc454e8580e1", - "ip_version": 4, - "name": "", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - }, - { - "allocation_pools": [ - { - "end": "10.0.2.254", - "start": "10.0.2.2" - } - ], - "cidr": "10.0.2.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.2.1", - "host_routes": [], - "id": "e3c3620c-9d24-4470-b226-739da2f617c0", - "ip_version": 4, - "name": "", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } - ] -} diff --git a/v2.0/api_samples/subnets-post-create-bulk-req.json b/v2.0/api_samples/subnets-post-create-bulk-req.json deleted file mode 100644 index 5b3165e..0000000 --- a/v2.0/api_samples/subnets-post-create-bulk-req.json +++ /dev/null @@ -1,14 +0,0 @@ -{ -"subnets": [ -{"name": "sample_subnet_1", -"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce", -"cidr": "10.100.0.0/16", -"ip_version": 4 -}, -{ -"name": "sample_subnet_2", -"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce", -"cidr": "172.16.0.0/12", -"ip_version": 4 -}] -} diff --git a/v2.0/api_samples/subnets-post-create-bulk-req.xml b/v2.0/api_samples/subnets-post-create-bulk-req.xml deleted file mode 100644 index fb754c0..0000000 --- a/v2.0/api_samples/subnets-post-create-bulk-req.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - test_subnet_1 - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 10.0.0.0/8 - 4 - - - test_subnet_2 - a3775a7d-9f8b-4148-be81-c84bbd0837ce - 192.168.0.0/16 - 4 - - diff --git a/v2.0/api_samples/subnets_get_resp.json b/v2.0/api_samples/subnets_get_resp.json deleted file mode 100644 index df67ff9..0000000 --- a/v2.0/api_samples/subnets_get_resp.json +++ /dev/null @@ -1,29 +0,0 @@ -status: 200 -content-length: 607 -content-type: application/json - -{ - "subnets": [ - { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.10.0.2", "end": "10.10.0.254"}], - "gateway_ip": "10.10.0.1", - "ip_version": 4, - "cidr": "10.10.0.0/24", - "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", - "enable_dhcp": true - }, - { - "name": "", - "network_id": "afc75773-640e-403c-9fff-62ba98db1f19", - "tenant_id": "ed680f49ff714162ab3612d7876ffce5", - "allocation_pools": [{"start": "10.0.0.2", "end": "10.0.0.254"}], - "gateway_ip": "10.0.0.1", - "ip_version": 4, - "cidr": "10.0.0.0/24", - "id": "e12f0c45-46e3-446a-b207-9474b27687a6", - "enable_dhcp": true - }] -} \ No newline at end of file diff --git a/v2.0/samples/agents-delete-res.json b/v2.0/samples/agents-delete-res-json-http.txt similarity index 100% rename from v2.0/samples/agents-delete-res.json rename to v2.0/samples/agents-delete-res-json-http.txt diff --git a/v2.0/samples/agents-list-res.json b/v2.0/samples/agents-list-res.json index 3673d06..62939d7 100644 --- a/v2.0/samples/agents-list-res.json +++ b/v2.0/samples/agents-list-res.json @@ -1,29 +1,25 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 523 -Date: Tue, 26 Mar 2013 09:47:10 GMT - { - "agents": [{ - "binary": "neutron-dhcp-agent", - "description": null, - "admin_state_up": false, - "heartbeat_timestamp": "2013-03-26T09:35:13.000000", - "alive": false, - "id": "af4567ad-c2e6-4311-944d-22efc12f89af", - "topic": "dhcp_agent", - "host": "HostC", - "agent_type": "DHCP agent", - "started_at": "2013-03-26T09:35:01.000000", - "created_at": "2013-03-26T09:35:01.000000", - "configurations": { - "subnets": 2, - "use_namespaces": true, - "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq", - "networks": 2, - "dhcp_lease_time": 120, - "ports": 3 - } - } - ] + "agents":[ + { + "binary":"neutron-dhcp-agent", + "description":null, + "admin_state_up":false, + "heartbeat_timestamp":"2013-03-26T09:35:13.000000", + "alive":false, + "id":"af4567ad-c2e6-4311-944d-22efc12f89af", + "topic":"dhcp_agent", + "host":"HostC", + "agent_type":"DHCP agent", + "started_at":"2013-03-26T09:35:01.000000", + "created_at":"2013-03-26T09:35:01.000000", + "configurations":{ + "subnets":2, + "use_namespaces":true, + "dhcp_driver":"neutron.agent.linux.dhcp.Dnsmasq", + "networks":2, + "dhcp_lease_time":120, + "ports":3 + } + } + ] } \ No newline at end of file diff --git a/v2.0/samples/agents-put-res.json b/v2.0/samples/agents-put-res.json index d5fb4a6..1af0035 100644 --- a/v2.0/samples/agents-put-res.json +++ b/v2.0/samples/agents-put-res.json @@ -1,28 +1,23 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 520 -Date: Tue, 26 Mar 2013 11:20:21 GMT - { - "agent": { - "binary": "neutron-dhcp-agent", - "description": null, - "admin_state_up": false, - "heartbeat_timestamp": "2013-03-26T09:35:13.000000", - "alive": false, - "id": "af4567ad-c2e6-4311-944d-22efc12f89af", - "topic": "dhcp_agent", - "host": "HostC", - "agent_type": "DHCP agent", - "started_at": "2013-03-26T09:35:01.000000", - "created_at": "2013-03-26T09:35:01.000000", - "configurations": { - "subnets": 2, - "use_namespaces": true, - "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq", - "networks": 2, - "dhcp_lease_time": 120, - "ports": 3 - } - } + "agent":{ + "binary":"neutron-dhcp-agent", + "description":null, + "admin_state_up":false, + "heartbeat_timestamp":"2013-03-26T09:35:13.000000", + "alive":false, + "id":"af4567ad-c2e6-4311-944d-22efc12f89af", + "topic":"dhcp_agent", + "host":"HostC", + "agent_type":"DHCP agent", + "started_at":"2013-03-26T09:35:01.000000", + "created_at":"2013-03-26T09:35:01.000000", + "configurations":{ + "subnets":2, + "use_namespaces":true, + "dhcp_driver":"neutron.agent.linux.dhcp.Dnsmasq", + "networks":2, + "dhcp_lease_time":120, + "ports":3 + } + } } \ No newline at end of file diff --git a/v2.0/samples/agents-show-res.json b/v2.0/samples/agents-show-res.json index 05aab91..1af0035 100644 --- a/v2.0/samples/agents-show-res.json +++ b/v2.0/samples/agents-show-res.json @@ -1,28 +1,23 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 520 -Date: Tue, 26 Mar 2013 09:57:51 GMT - { - "agent": { - "binary": "neutron-dhcp-agent", - "description": null, - "admin_state_up": false, - "heartbeat_timestamp": "2013-03-26T09:35:13.000000", - "alive": false, - "id": "af4567ad-c2e6-4311-944d-22efc12f89af", - "topic": "dhcp_agent", - "host": "HostC", - "agent_type": "DHCP agent", - "started_at": "2013-03-26T09:35:01.000000", - "created_at": "2013-03-26T09:35:01.000000", - "configurations": { - "subnets": 2, - "use_namespaces": true, - "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq", - "networks": 2, - "dhcp_lease_time": 120, - "ports": 3 - } - } + "agent":{ + "binary":"neutron-dhcp-agent", + "description":null, + "admin_state_up":false, + "heartbeat_timestamp":"2013-03-26T09:35:13.000000", + "alive":false, + "id":"af4567ad-c2e6-4311-944d-22efc12f89af", + "topic":"dhcp_agent", + "host":"HostC", + "agent_type":"DHCP agent", + "started_at":"2013-03-26T09:35:01.000000", + "created_at":"2013-03-26T09:35:01.000000", + "configurations":{ + "subnets":2, + "use_namespaces":true, + "dhcp_driver":"neutron.agent.linux.dhcp.Dnsmasq", + "networks":2, + "dhcp_lease_time":120, + "ports":3 + } + } } \ No newline at end of file diff --git a/v2.0/samples/extraroute-put-req.json b/v2.0/samples/extraroute-put-req.json index 9006eba..ad57a8a 100644 --- a/v2.0/samples/extraroute-put-req.json +++ b/v2.0/samples/extraroute-put-req.json @@ -1,9 +1,10 @@ -PUT /v2.0/routers/babc8173-46f6-4b6f-8b95-38c1683a4e22.json - -{"router": - { - "routes": [{"nexthop": "10.1.0.10", - "destination": "40.0.1.0/24"}] - } -} - +{ + "router":{ + "routes":[ + { + "nexthop":"10.1.0.10", + "destination":"40.0.1.0/24" + } + ] + } +} \ No newline at end of file diff --git a/v2.0/samples/floatingips-post-req.json b/v2.0/samples/floatingips-post-req-json-http.txt similarity index 100% rename from v2.0/samples/floatingips-post-req.json rename to v2.0/samples/floatingips-post-req-json-http.txt diff --git a/v2.0/samples/floatingips-put-ass-req.json b/v2.0/samples/floatingips-put-ass-req.json index 2f469b5..864a099 100644 --- a/v2.0/samples/floatingips-put-ass-req.json +++ b/v2.0/samples/floatingips-put-ass-req.json @@ -1,9 +1,5 @@ -PUT /v2.0/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7.json -Accept: application/json - { - "floatingip": - { - "port_id": "fc861431-0e6c-4842-a0ed-e2363f9bc3a8" - } + "floatingip":{ + "port_id":"fc861431-0e6c-4842-a0ed-e2363f9bc3a8" + } } \ No newline at end of file diff --git a/v2.0/samples/floatingips-put-disass-req.json b/v2.0/samples/floatingips-put-disass-req.json index 2665dae..da4557f 100644 --- a/v2.0/samples/floatingips-put-disass-req.json +++ b/v2.0/samples/floatingips-put-disass-req.json @@ -1,8 +1,5 @@ -PUT /v2.0/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7 -Accept: application/json { - "floatingip": - { - "port_id": null - } + "floatingip":{ + "port_id":null + } } \ No newline at end of file diff --git a/v2.0/samples/loadbalancer/health_monitors-list-res.json b/v2.0/samples/loadbalancer/health_monitors-list-res.json index e56d3a1..81afafb 100644 --- a/v2.0/samples/loadbalancer/health_monitors-list-res.json +++ b/v2.0/samples/loadbalancer/health_monitors-list-res.json @@ -1,27 +1,27 @@ { - "health_monitors": [ - { - "status": "ACTIVE", - "admin_state_up": true, - "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea", - "delay": 10, - "max_retries": 1, - "timeout": 1, - "type": "PING", - "id": "466c8345-28d8-4f84-a246-e04380b0461d" - }, - { - "status": "ACTIVE", - "admin_state_up": true, - "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea", - "delay": 5, - "expected_codes": "200", - "max_retries": 2, - "http_method": "GET", - "timeout": 2, - "url_path": "/", - "type": "HTTP", - "id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7" - } - ] + "health_monitors":[ + { + "status":"ACTIVE", + "admin_state_up":true, + "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea", + "delay":10, + "max_retries":1, + "timeout":1, + "type":"PING", + "id":"466c8345-28d8-4f84-a246-e04380b0461d" + }, + { + "status":"ACTIVE", + "admin_state_up":true, + "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea", + "delay":5, + "expected_codes":"200", + "max_retries":2, + "http_method":"GET", + "timeout":2, + "url_path":"/", + "type":"HTTP", + "id":"5d4b5228-33b0-4e60-b225-9b727c1a20e7" + } + ] } \ No newline at end of file diff --git a/v2.0/samples/metering-label-create-req.json b/v2.0/samples/metering-label-create-req.json deleted file mode 100644 index 6987d27..0000000 --- a/v2.0/samples/metering-label-create-req.json +++ /dev/null @@ -1,13 +0,0 @@ -POST /v2.0/metering/metering-labels HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 - -{ - "metering_label":{ - "name":"label1", - "description":"description of label1" - } -} diff --git a/v2.0/samples/metering-label-create-resp.json b/v2.0/samples/metering-label-create-resp.json deleted file mode 100644 index 8c361e2..0000000 --- a/v2.0/samples/metering-label-create-resp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "metering_label": { - "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", - "description": "description of label1", - "name": "label1", - "id": "bc91b832-8465-40a7-a5d8-ba87de442266" - } -} diff --git a/v2.0/samples/metering-label-delete-req.json b/v2.0/samples/metering-label-delete-req.json deleted file mode 100644 index 48f7647..0000000 --- a/v2.0/samples/metering-label-delete-req.json +++ /dev/null @@ -1,6 +0,0 @@ -DELETE /v2.0/metering/metering-labels/a6700594-5b7a-4105-8bfe-723b346ce866 HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-delete-resp.json b/v2.0/samples/metering-label-delete-resp.json deleted file mode 100644 index bfbfad6..0000000 --- a/v2.0/samples/metering-label-delete-resp.json +++ /dev/null @@ -1 +0,0 @@ -status: 204 diff --git a/v2.0/samples/metering-label-get-req.json b/v2.0/samples/metering-label-get-req.json deleted file mode 100644 index 7387aeb..0000000 --- a/v2.0/samples/metering-label-get-req.json +++ /dev/null @@ -1,6 +0,0 @@ -GET /v2.0/metering/metering-labels/a6700594-5b7a-4105-8bfe-723b346ce866 HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-get-resp.json b/v2.0/samples/metering-label-get-resp.json deleted file mode 100644 index 818e046..0000000 --- a/v2.0/samples/metering-label-get-resp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "metering_label": { - "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", - "description": "label1 description", - "name": "label1", - "id": "a6700594-5b7a-4105-8bfe-723b346ce866" - } -} diff --git a/v2.0/samples/metering-label-rule-create-req.json b/v2.0/samples/metering-label-rule-create-req.json deleted file mode 100644 index 66136de..0000000 --- a/v2.0/samples/metering-label-rule-create-req.json +++ /dev/null @@ -1,14 +0,0 @@ -POST /v2.0/metering/metering-label-rules HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 - -{ - "metering_label_rule":{ - "remote_ip_prefix":"10.0.1.0/24", - "direction":"ingress", - "metering_label_id":"e131d186-b02d-4c0b-83d5-0c0725c4f812" - } -} diff --git a/v2.0/samples/metering-label-rule-create-resp.json b/v2.0/samples/metering-label-rule-create-resp.json deleted file mode 100644 index 31e5410..0000000 --- a/v2.0/samples/metering-label-rule-create-resp.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "metering_label_rule":{ - "remote_ip_prefix":"10.0.1.0/24", - "direction":"ingress", - "metering_label_id":"e131d186-b02d-4c0b-83d5-0c0725c4f812", - "id":"00e13b58-b4f2-4579-9c9c-7ac94615f9ae", - "excluded":false - } -} diff --git a/v2.0/samples/metering-label-rule-delete-req.json b/v2.0/samples/metering-label-rule-delete-req.json deleted file mode 100644 index 3b74b68..0000000 --- a/v2.0/samples/metering-label-rule-delete-req.json +++ /dev/null @@ -1,6 +0,0 @@ -DELETE /v2.0/metering/metering-labels/37b31179-71ee-4f0a-b130-0eeb28e7ede7 HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rule-delete-resp.json b/v2.0/samples/metering-label-rule-delete-resp.json deleted file mode 100644 index bfbfad6..0000000 --- a/v2.0/samples/metering-label-rule-delete-resp.json +++ /dev/null @@ -1 +0,0 @@ -status: 204 diff --git a/v2.0/samples/metering-label-rule-get-req.json b/v2.0/samples/metering-label-rule-get-req.json deleted file mode 100644 index 0e3c164..0000000 --- a/v2.0/samples/metering-label-rule-get-req.json +++ /dev/null @@ -1,6 +0,0 @@ -GET /v2.0/metering/metering-label-rules/9536641a-7d14-4dc5-afaf-93a973ce0eb8 HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rule-get-resp.json b/v2.0/samples/metering-label-rule-get-resp.json deleted file mode 100644 index cc9850b..0000000 --- a/v2.0/samples/metering-label-rule-get-resp.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "metering_label_rule": { - "remote_ip_prefix": "20.0.0.0\/24", - "direction": "ingress", - "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", - "id": "9536641a-7d14-4dc5-afaf-93a973ce0eb8", - "excluded": false - } -} diff --git a/v2.0/samples/metering-label-rules-list-get-req.json b/v2.0/samples/metering-label-rules-list-get-req.json deleted file mode 100644 index 354d8a5..0000000 --- a/v2.0/samples/metering-label-rules-list-get-req.json +++ /dev/null @@ -1,6 +0,0 @@ -GET /v2.0/metering/metering-label-rules HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rules-list-get-resp.json b/v2.0/samples/metering-label-rules-list-get-resp.json deleted file mode 100644 index fcdc0af..0000000 --- a/v2.0/samples/metering-label-rules-list-get-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "metering_label_rules": [ - { - "remote_ip_prefix": "20.0.0.0\/24", - "direction": "ingress", - "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", - "id": "9536641a-7d14-4dc5-afaf-93a973ce0eb8", - "excluded": false - }, - { - "remote_ip_prefix": "10.0.0.0\/24", - "direction": "ingress", - "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", - "id": "ffc6fd15-40de-4e7d-b617-34d3f7a93aec", - "excluded": false - } - ] -} diff --git a/v2.0/samples/metering-labels-list-get-req.json b/v2.0/samples/metering-labels-list-get-req.json deleted file mode 100644 index e1df3f2..0000000 --- a/v2.0/samples/metering-labels-list-get-req.json +++ /dev/null @@ -1,6 +0,0 @@ -GET /v2.0/metering/metering-labels HTTP/1.1 -Host: controlnode:9696 -User-Agent: python-neutronclient -Content-Type: application/json -Accept: application/json -X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-labels-list-get-resp.json b/v2.0/samples/metering-labels-list-get-resp.json deleted file mode 100644 index 104b949..0000000 --- a/v2.0/samples/metering-labels-list-get-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "metering_labels": [ - { - "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", - "description": "label1 description", - "name": "label1", - "id": "a6700594-5b7a-4105-8bfe-723b346ce866" - }, - { - "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", - "description": "label2 description", - "name": "label2", - "id": "e131d186-b02d-4c0b-83d5-0c0725c4f812" - } - ] -} diff --git a/v2.0/samples/network-post-res.json b/v2.0/samples/network-post-res.json index 1729132..83d5ae2 100644 --- a/v2.0/samples/network-post-res.json +++ b/v2.0/samples/network-post-res.json @@ -1,15 +1,13 @@ -'status': '201' -'content-length': '194' -'content-type': 'application/json; - { - "network": { - "admin_state_up": true, - "id": "850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", - "name": "sample_network", - "shared": false, - "status": "ACTIVE", - "subnets": [], - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } + "network":{ + "admin_state_up":true, + "id":"850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", + "name":"sample_network", + "shared":false, + "status":"ACTIVE", + "subnets":[ + + ], + "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce" + } } diff --git a/v2.0/samples/network-post-resp.json b/v2.0/samples/network-post-resp.json index 1729132..721268a 100644 --- a/v2.0/samples/network-post-resp.json +++ b/v2.0/samples/network-post-resp.json @@ -1,15 +1,13 @@ -'status': '201' -'content-length': '194' -'content-type': 'application/json; - { - "network": { - "admin_state_up": true, - "id": "850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", - "name": "sample_network", - "shared": false, - "status": "ACTIVE", - "subnets": [], - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } -} + "network":{ + "admin_state_up":true, + "id":"850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", + "name":"sample_network", + "shared":false, + "status":"ACTIVE", + "subnets":[ + + ], + "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce" + } +} \ No newline at end of file diff --git a/v2.0/samples/networks-put-req-extnet.json b/v2.0/samples/networks-put-req-extnet.json index 9dece3c..2f5fbd5 100644 --- a/v2.0/samples/networks-put-req-extnet.json +++ b/v2.0/samples/networks-put-req-extnet.json @@ -1,10 +1,5 @@ -PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.json - -Content-Type: application/json -Accept: application/json - { - "network": { - "router:external": true - } + "network":{ + "router:external":true + } } diff --git a/v2.0/samples/ports-put-req-prov.json b/v2.0/samples/ports-put-req-prov.json index fea2df7..c515329 100644 --- a/v2.0/samples/ports-put-req-prov.json +++ b/v2.0/samples/ports-put-req-prov.json @@ -1,13 +1,7 @@ -PUT /v2.0/networks/3a06dfc7-d239-4aad-9a57-21cd171c72e5.json - -Content-Type: application/json -Accept: application/json - { - "network": - { - "provider:network_type": "flat", - "provider:physical_network": "physnet_1", - "provider:segmentation_id": null - } + "network":{ + "provider:network_type":"flat", + "provider:physical_network":"physnet_1", + "provider:segmentation_id":null + } } \ No newline at end of file diff --git a/v2.0/samples/router-create-enablesnat.sample b/v2.0/samples/router-create-enablesnat-json-http.txt similarity index 100% rename from v2.0/samples/router-create-enablesnat.sample rename to v2.0/samples/router-create-enablesnat-json-http.txt diff --git a/v2.0/samples/router-update-enablesnat-1.json b/v2.0/samples/router-update-enablesnat-1.json new file mode 100644 index 0000000..69749e4 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-1.json @@ -0,0 +1,10 @@ +{ + "router": + { + "name": "another_router", + "admin_state_up": true, + "external_gateway_info": { + "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8"} + } +} + diff --git a/v2.0/samples/router-update-enablesnat-1.sample b/v2.0/samples/router-update-enablesnat-1.sample deleted file mode 100644 index 560e557..0000000 --- a/v2.0/samples/router-update-enablesnat-1.sample +++ /dev/null @@ -1,55 +0,0 @@ -POST /v2.0/routers -Accept: application/json -{ - "router": - { - "name": "another_router", - "admin_state_up": true, - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8"} - } -} - -HTTP/1.1 201 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": true} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} - - -PUT /v2.0/routers -Accept: application/json -{ - "router": - { - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - } -} - -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-1b.json b/v2.0/samples/router-update-enablesnat-1b.json new file mode 100644 index 0000000..09488ca --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-1b.json @@ -0,0 +1,13 @@ +{ + "router":{ + "status":"ACTIVE", + "external_gateway_info":{ + "network_id":"3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat":true + }, + "name":"another_router", + "admin_state_up":true, + "tenant_id":"6b96ff0cb17a4b859e1e575d221683d3", + "id":"8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-1c.json b/v2.0/samples/router-update-enablesnat-1c.json new file mode 100644 index 0000000..48566cc --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-1c.json @@ -0,0 +1,13 @@ +{ + "router":{ + "status":"ACTIVE", + "external_gateway_info":{ + "network_id":"3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat":false + }, + "name":"another_router", + "admin_state_up":true, + "tenant_id":"6b96ff0cb17a4b859e1e575d221683d3", + "id":"8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-1d.json b/v2.0/samples/router-update-enablesnat-1d.json new file mode 100644 index 0000000..4763e17 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-1d.json @@ -0,0 +1,8 @@ +{ + "router":{ + "external_gateway_info":{ + "network_id":"3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat":false + } + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-2.json b/v2.0/samples/router-update-enablesnat-2.json new file mode 100644 index 0000000..16b079e --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-2.json @@ -0,0 +1,10 @@ +{ + "router": + { + "name": "another_router", + "admin_state_up": true, + "external_gateway_info": { + "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat": false} + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-2.sample b/v2.0/samples/router-update-enablesnat-2.sample deleted file mode 100644 index 322c85d..0000000 --- a/v2.0/samples/router-update-enablesnat-2.sample +++ /dev/null @@ -1,55 +0,0 @@ -POST /v2.0/routers -Accept: application/json -{ - "router": - { - "name": "another_router", - "admin_state_up": true, - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - } -} - -HTTP/1.1 201 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} - - -PUT /v2.0/routers -Accept: application/json -{ - "router": - { - "external_gateway_info": { - "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5"} - } -} - -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", - "enable_snat": true} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-2b.json b/v2.0/samples/router-update-enablesnat-2b.json new file mode 100644 index 0000000..f1c3251 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-2b.json @@ -0,0 +1,13 @@ +{ + "router": + { + "status": "ACTIVE", + "external_gateway_info": { + "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat": false}, + "name": "another_router", + "admin_state_up": true, + "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", + "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-2c.json b/v2.0/samples/router-update-enablesnat-2c.json new file mode 100644 index 0000000..9ec7af1 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-2c.json @@ -0,0 +1,7 @@ +{ + "router": + { + "external_gateway_info": { + "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5"} + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-2d.json b/v2.0/samples/router-update-enablesnat-2d.json new file mode 100644 index 0000000..3b85691 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-2d.json @@ -0,0 +1,13 @@ +{ + "router": + { + "status": "ACTIVE", + "external_gateway_info": { + "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", + "enable_snat": true}, + "name": "another_router", + "admin_state_up": true, + "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", + "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-3.json b/v2.0/samples/router-update-enablesnat-3.json new file mode 100644 index 0000000..c4f345f --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-3.json @@ -0,0 +1,14 @@ +{ + "router": + { + "name": "another_router", + "admin_state_up": true, + "external_gateway_info": { + "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat": false} + } +} + + + + diff --git a/v2.0/samples/router-update-enablesnat-3.sample b/v2.0/samples/router-update-enablesnat-3.sample deleted file mode 100644 index 6a62eef..0000000 --- a/v2.0/samples/router-update-enablesnat-3.sample +++ /dev/null @@ -1,56 +0,0 @@ -POST /v2.0/routers -Accept: application/json -{ - "router": - { - "name": "another_router", - "admin_state_up": true, - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - } -} - -HTTP/1.1 201 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", - "enable_snat": false} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} - - -PUT /v2.0/routers -Accept: application/json -{ - "router": - { - "external_gateway_info": { - "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", - "enable_snat": false} - } -} - -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -{ - "router": - { - "status": "ACTIVE", - "external_gateway_info": { - "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", - "enable_snat": false} - "name": "another_router", - "admin_state_up": true, - "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", - "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" - } -} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-3b.json b/v2.0/samples/router-update-enablesnat-3b.json new file mode 100644 index 0000000..f23e0d7 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-3b.json @@ -0,0 +1,13 @@ +{ + "router": + { + "status": "ACTIVE", + "external_gateway_info": { + "network_id": "3c5bcddd-6af9-4e6b-9c3e-c153e521cab8", + "enable_snat": false}, + "name": "another_router", + "admin_state_up": true, + "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", + "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} diff --git a/v2.0/samples/router-update-enablesnat-3c.json b/v2.0/samples/router-update-enablesnat-3c.json new file mode 100644 index 0000000..c5122cf --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-3c.json @@ -0,0 +1,8 @@ +{ + "router": + { + "external_gateway_info": { + "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", + "enable_snat": false} + } +} \ No newline at end of file diff --git a/v2.0/samples/router-update-enablesnat-3d.json b/v2.0/samples/router-update-enablesnat-3d.json new file mode 100644 index 0000000..6feacd8 --- /dev/null +++ b/v2.0/samples/router-update-enablesnat-3d.json @@ -0,0 +1,13 @@ +{ + "router": + { + "status": "ACTIVE", + "external_gateway_info": { + "network_id": "002ab3b9-9127-4158-be30-4b45f3814df5", + "enable_snat": false}, + "name": "another_router", + "admin_state_up": true, + "tenant_id": "6b96ff0cb17a4b859e1e575d221683d3", + "id": "8604a0de-7f6b-409a-a47c-a1cc7bc77b2e" + } +} \ No newline at end of file diff --git a/v2.0/samples/routers-post-req.json b/v2.0/samples/routers-post-req.json index 451619d..2a15827 100644 --- a/v2.0/samples/routers-post-req.json +++ b/v2.0/samples/routers-post-req.json @@ -1,10 +1,6 @@ -POST /v2.0/routers -Accept: application/json - { - "router": - { - "name": "another_router", - "admin_state_up": true - } + "router":{ + "name":"another_router", + "admin_state_up":true + } } \ No newline at end of file diff --git a/v2.0/samples/routers-put-req.json b/v2.0/samples/routers-put-req.json index 5c9750d..54796c6 100644 --- a/v2.0/samples/routers-put-req.json +++ b/v2.0/samples/routers-put-req.json @@ -1,12 +1,7 @@ -PUT /v2.0/routers -Accept: application/json/8604a0de-7f6b-409a-a47c-a1cc7bc77b2e - { - "router": - { - "external_gateway_info": - { - "network_id": "8ca37218-28ff-41cb-9b10-039601ea7e6b" - } - } + "router":{ + "external_gateway_info":{ + "network_id":"8ca37218-28ff-41cb-9b10-039601ea7e6b" + } + } } \ No newline at end of file diff --git a/v2.0/samples/rules-security-groups-create-req.json b/v2.0/samples/rules-security-groups-create-req-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-create-req.json rename to v2.0/samples/rules-security-groups-create-req-json-http.txt diff --git a/v2.0/samples/rules-security-groups-delete-req.json b/v2.0/samples/rules-security-groups-delete-req-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-delete-req.json rename to v2.0/samples/rules-security-groups-delete-req-json-http.txt diff --git a/v2.0/samples/rules-security-groups-delete-resp.json b/v2.0/samples/rules-security-groups-delete-resp-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-delete-resp.json rename to v2.0/samples/rules-security-groups-delete-resp-json-http.txt diff --git a/v2.0/samples/rules-security-groups-get-req.json b/v2.0/samples/rules-security-groups-get-req-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-get-req.json rename to v2.0/samples/rules-security-groups-get-req-json-http.txt diff --git a/v2.0/samples/rules-security-groups-list-get-req.json b/v2.0/samples/rules-security-groups-list-get-req-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-list-get-req.json rename to v2.0/samples/rules-security-groups-list-get-req-json-http.txt diff --git a/v2.0/samples/rules-security-groups-post-req.json b/v2.0/samples/rules-security-groups-post-req-json-http.txt similarity index 100% rename from v2.0/samples/rules-security-groups-post-req.json rename to v2.0/samples/rules-security-groups-post-req-json-http.txt diff --git a/v2.0/samples/sche-dhcp-list-res.json b/v2.0/samples/sche-dhcp-list-res.json index 2c4ff64..efa7320 100644 --- a/v2.0/samples/sche-dhcp-list-res.json +++ b/v2.0/samples/sche-dhcp-list-res.json @@ -1,29 +1,25 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 522 -Date: Wed, 27 Mar 2013 01:14:40 GMT - { - "agents": [{ - "binary": "neutron-dhcp-agent", - "description": null, - "admin_state_up": true, - "heartbeat_timestamp": "2013-03-27T00:24:01.000000", - "alive": false, - "topic": "dhcp_agent", - "host": "HostC", - "agent_type": "DHCP agent", - "created_at": "2013-03-26T23:54:20.000000", - "started_at": "2013-03-26T23:54:20.000000", - "id": "d5724d7e-389d-4ba0-8d00-fc673a147bfa", - "configurations": { - "subnets": 2, - "use_namespaces": true, - "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq", - "networks": 2, - "dhcp_lease_time": 120, - "ports": 5 - } - } - ] + "agents":[ + { + "binary":"neutron-dhcp-agent", + "description":null, + "admin_state_up":true, + "heartbeat_timestamp":"2013-03-27T00:24:01.000000", + "alive":false, + "topic":"dhcp_agent", + "host":"HostC", + "agent_type":"DHCP agent", + "created_at":"2013-03-26T23:54:20.000000", + "started_at":"2013-03-26T23:54:20.000000", + "id":"d5724d7e-389d-4ba0-8d00-fc673a147bfa", + "configurations":{ + "subnets":2, + "use_namespaces":true, + "dhcp_driver":"neutron.agent.linux.dhcp.Dnsmasq", + "networks":2, + "dhcp_lease_time":120, + "ports":5 + } + } + ] } \ No newline at end of file diff --git a/v2.0/samples/sche-l3-list-res.json b/v2.0/samples/sche-l3-list-res.json index 26961b8..23bba7d 100644 --- a/v2.0/samples/sche-l3-list-res.json +++ b/v2.0/samples/sche-l3-list-res.json @@ -1,32 +1,28 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 630 -Date: Wed, 27 Mar 2013 01:59:44 GMT - { - "agents": [{ - "binary": "neutron-l3-agent", - "description": null, - "admin_state_up": true, - "heartbeat_timestamp": "2013-03-27T00:24:03.000000", - "alive": false, - "topic": "l3_agent", - "host": "HostC", - "agent_type": "L3 agent", - "created_at": "2013-03-26T23:54:26.000000", - "started_at": "2013-03-26T23:54:26.000000", - "id": "fa24e88e-3d2f-4fc2-b038-5fb5be294c03", - "configurations": { - "router_id": "", - "gateway_external_network_id": "", - "handle_internal_only_routers": true, - "use_namespaces": true, - "routers": 0, - "interfaces": 0, - "floating_ips": 0, - "interface_driver": "neutron.agent.linux.interface.OVSInterfaceDriver", - "ex_gw_ports": 0 - } - } - ] + "agents":[ + { + "binary":"neutron-l3-agent", + "description":null, + "admin_state_up":true, + "heartbeat_timestamp":"2013-03-27T00:24:03.000000", + "alive":false, + "topic":"l3_agent", + "host":"HostC", + "agent_type":"L3 agent", + "created_at":"2013-03-26T23:54:26.000000", + "started_at":"2013-03-26T23:54:26.000000", + "id":"fa24e88e-3d2f-4fc2-b038-5fb5be294c03", + "configurations":{ + "router_id":"", + "gateway_external_network_id":"", + "handle_internal_only_routers":true, + "use_namespaces":true, + "routers":0, + "interfaces":0, + "floating_ips":0, + "interface_driver":"neutron.agent.linux.interface.OVSInterfaceDriver", + "ex_gw_ports":0 + } + } + ] } \ No newline at end of file diff --git a/v2.0/samples/sche-network-dhcp-res.json b/v2.0/samples/sche-network-dhcp-res-json-http.txt similarity index 100% rename from v2.0/samples/sche-network-dhcp-res.json rename to v2.0/samples/sche-network-dhcp-res-json-http.txt diff --git a/v2.0/samples/sche-network-list-res.json b/v2.0/samples/sche-network-list-res.json index 184ca2d..cf0ea3a 100644 --- a/v2.0/samples/sche-network-list-res.json +++ b/v2.0/samples/sche-network-list-res.json @@ -1,45 +1,49 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 1056 -Date: Wed, 27 Mar 2013 00:55:39 GMT - { - "networks": [{ - "status": "ACTIVE", - "subnets": ["15a09f6c-87a5-4d14-b2cf-03d97cd4b456"], - "name": "net1", - "provider:physical_network": "physnet1", - "admin_state_up": true, - "tenant_id": "3671f46ec35e4bbca6ef92ab7975e463", - "provider:network_type": "vlan", - "router:external": false, - "shared": false, - "id": "2d627131-c841-4e3a-ace6-f2dd75773b6d", - "provider:segmentation_id": 1001 - }, { - "status": "ACTIVE", - "subnets": [], - "name": "net2", - "provider:physical_network": null, - "admin_state_up": true, - "tenant_id": "3671f46ec35e4bbca6ef92ab7975e463", - "provider:network_type": "local", - "router:external": false, - "shared": false, - "id": "524e26ea-fad4-4bb0-b504-1ad0dc770e7a", - "provider:segmentation_id": null - }, { - "status": "ACTIVE", - "subnets": ["43671fba-c76b-4c33-bd7e-8bef54145f2f"], - "name": "mynet1", - "provider:physical_network": "physnet1", - "admin_state_up": true, - "tenant_id": "3671f46ec35e4bbca6ef92ab7975e463", - "provider:network_type": "vlan", - "router:external": false, - "shared": false, - "id": "cfa65a54-06a8-4f9f-86b0-73c700c02c41", - "provider:segmentation_id": 1000 - } - ] + "networks":[ + { + "status":"ACTIVE", + "subnets":[ + "15a09f6c-87a5-4d14-b2cf-03d97cd4b456" + ], + "name":"net1", + "provider:physical_network":"physnet1", + "admin_state_up":true, + "tenant_id":"3671f46ec35e4bbca6ef92ab7975e463", + "provider:network_type":"vlan", + "router:external":false, + "shared":false, + "id":"2d627131-c841-4e3a-ace6-f2dd75773b6d", + "provider:segmentation_id":1001 + }, + { + "status":"ACTIVE", + "subnets":[ + + ], + "name":"net2", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"3671f46ec35e4bbca6ef92ab7975e463", + "provider:network_type":"local", + "router:external":false, + "shared":false, + "id":"524e26ea-fad4-4bb0-b504-1ad0dc770e7a", + "provider:segmentation_id":null + }, + { + "status":"ACTIVE", + "subnets":[ + "43671fba-c76b-4c33-bd7e-8bef54145f2f" + ], + "name":"mynet1", + "provider:physical_network":"physnet1", + "admin_state_up":true, + "tenant_id":"3671f46ec35e4bbca6ef92ab7975e463", + "provider:network_type":"vlan", + "router:external":false, + "shared":false, + "id":"cfa65a54-06a8-4f9f-86b0-73c700c02c41", + "provider:segmentation_id":1000 + } + ] } \ No newline at end of file diff --git a/v2.0/samples/sche-router-l3-res.json b/v2.0/samples/sche-router-l3-res-json-http.txt similarity index 100% rename from v2.0/samples/sche-router-l3-res.json rename to v2.0/samples/sche-router-l3-res-json-http.txt diff --git a/v2.0/samples/sche-router-list-res.json b/v2.0/samples/sche-router-list-res.json index 8fc0c14..02baaae 100644 --- a/v2.0/samples/sche-router-list-res.json +++ b/v2.0/samples/sche-router-list-res.json @@ -1,17 +1,15 @@ -HTTP/1.1 200 OK -Content-Type: application/json; charset=UTF-8 -Content-Length: 218 -Date: Wed, 27 Mar 2013 01:55:07 GMT - { - "routers": [{ - "status": "ACTIVE", - "external_gateway_info": null, - "name": "router1", - "admin_state_up": true, - "tenant_id": "3671f46ec35e4bbca6ef92ab7975e463", - "routes": [], - "id": "8eef2388-f27d-4a17-986e-9319a77ccd9d" - } - ] + "routers":[ + { + "status":"ACTIVE", + "external_gateway_info":null, + "name":"router1", + "admin_state_up":true, + "tenant_id":"3671f46ec35e4bbca6ef92ab7975e463", + "routes":[ + + ], + "id":"8eef2388-f27d-4a17-986e-9319a77ccd9d" + } + ] } \ No newline at end of file diff --git a/v2.0/samples/security-group-post-req.json b/v2.0/samples/security-group-post-req-json-http.txt similarity index 100% rename from v2.0/samples/security-group-post-req.json rename to v2.0/samples/security-group-post-req-json-http.txt diff --git a/v2.0/samples/security-groups-create-req.json b/v2.0/samples/security-groups-create-req.json index 1772e92..f91c13a 100644 --- a/v2.0/samples/security-groups-create-req.json +++ b/v2.0/samples/security-groups-create-req.json @@ -1,5 +1,3 @@ -POST /v2.0/security-groups.json -Accept: application/json { "security_group":{ "name":"new-webservers", diff --git a/v2.0/samples/security-groups-delete-req.json b/v2.0/samples/security-groups-delete-req-json-http.txt similarity index 100% rename from v2.0/samples/security-groups-delete-req.json rename to v2.0/samples/security-groups-delete-req-json-http.txt diff --git a/v2.0/samples/security-groups-delete-resp.json b/v2.0/samples/security-groups-delete-resp-json-http.txt similarity index 100% rename from v2.0/samples/security-groups-delete-resp.json rename to v2.0/samples/security-groups-delete-resp-json-http.txt diff --git a/v2.0/samples/security-groups-get-req.json b/v2.0/samples/security-groups-get-req-json-http.txt similarity index 100% rename from v2.0/samples/security-groups-get-req.json rename to v2.0/samples/security-groups-get-req-json-http.txt diff --git a/v2.0/samples/security-groups-list-get-req.json b/v2.0/samples/security-groups-list-get-req-json-http.txt similarity index 100% rename from v2.0/samples/security-groups-list-get-req.json rename to v2.0/samples/security-groups-list-get-req-json-http.txt diff --git a/v2.0/samples/subnet-get-detail-res.json b/v2.0/samples/subnet-get-detail-res.json index 63be6bd..7c26f13 100644 --- a/v2.0/samples/subnet-get-detail-res.json +++ b/v2.0/samples/subnet-get-detail-res.json @@ -1,12 +1,9 @@ { - "port": - { - "state": "DOWN", - "id": "98017ddc-efc8-4c25-a915-774b2a633855", - "attachment": - { - "id": "test_interface_identifier" - } - } + "port":{ + "state":"DOWN", + "id":"98017ddc-efc8-4c25-a915-774b2a633855", + "attachment":{ + "id":"test_interface_identifier" + } + } } - diff --git a/v2.0/samples/subnet-post-req.json b/v2.0/samples/subnet-post-req.json index fa33b66..29e88fa 100644 --- a/v2.0/samples/subnet-post-req.json +++ b/v2.0/samples/subnet-post-req.json @@ -1,16 +1,18 @@ -status: 201, -content-length: 306, -content-type: application/json - { - "subnet": { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.0.3.20", "end": "10.0.3.150"}], - "gateway_ip": "10.0.3.1", - "ip_version": 4, - "cidr": "10.0.3.0/24", - "id": "9436e561-47bf-436a-b1f1-fe23a926e031", - "enable_dhcp": true} + "subnet":{ + "name":"", + "network_id":"ed2e3c10-2e43-4297-9006-2863a2d1abbc", + "tenant_id":"c1210485b2424d48804aad5d39c61b8f", + "allocation_pools":[ + { + "start":"10.0.3.20", + "end":"10.0.3.150" + } + ], + "gateway_ip":"10.0.3.1", + "ip_version":4, + "cidr":"10.0.3.0/24", + "id":"9436e561-47bf-436a-b1f1-fe23a926e031", + "enable_dhcp":true + } } \ No newline at end of file diff --git a/v2.0/samples/subnet-post-res.json b/v2.0/samples/subnet-post-res.json index 9cec3c5..512b96c 100644 --- a/v2.0/samples/subnet-post-res.json +++ b/v2.0/samples/subnet-post-res.json @@ -1,24 +1,24 @@ -status: 200 -content-length: 381 -content-type: application/json - { - "subnet": { - "allocation_pools": [ - { - "end": "10.0.3.254", - "start": "10.0.3.2" - } - ], - "cidr": "10.0.3.0/24", - "dns_nameservers": [], - "enable_dhcp": true, - "gateway_ip": "10.0.3.1", - "host_routes": [], - "id": "91e47a57-7508-46fe-afc9-fc454e8580e1", - "ip_version": 4, - "name": "sample_subnet", - "network_id": "1a6f6006-9e0b-4f99-984c-96787ae66363", - "tenant_id": "f667b69e4d6749749ef3bcba7251d9ce" - } + "subnet":{ + "allocation_pools":[ + { + "end":"10.0.3.254", + "start":"10.0.3.2" + } + ], + "cidr":"10.0.3.0/24", + "dns_nameservers":[ + + ], + "enable_dhcp":true, + "gateway_ip":"10.0.3.1", + "host_routes":[ + + ], + "id":"91e47a57-7508-46fe-afc9-fc454e8580e1", + "ip_version":4, + "name":"sample_subnet", + "network_id":"1a6f6006-9e0b-4f99-984c-96787ae66363", + "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce" + } } diff --git a/v2.0/samples/subnets-get-detail-res.json b/v2.0/samples/subnets-get-detail-res.json index 1e26b2e..e867c95 100644 --- a/v2.0/samples/subnets-get-detail-res.json +++ b/v2.0/samples/subnets-get-detail-res.json @@ -1,18 +1,18 @@ -status: 200 -content-length: 309 -content-type: application/json - { - "subnet": - { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.10.0.2", "end": "10.10.0.254"}], - "gateway_ip": "10.10.0.1", - "ip_version": 4, - "cidr": "10.10.0.0/24", - "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", - "enable_dhcp": false - } + "subnet":{ + "name":"", + "network_id":"ed2e3c10-2e43-4297-9006-2863a2d1abbc", + "tenant_id":"c1210485b2424d48804aad5d39c61b8f", + "allocation_pools":[ + { + "start":"10.10.0.2", + "end":"10.10.0.254" + } + ], + "gateway_ip":"10.10.0.1", + "ip_version":4, + "cidr":"10.10.0.0/24", + "id":"4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", + "enable_dhcp":false + } } \ No newline at end of file diff --git a/v2.0/samples/subnets_get_resp.json b/v2.0/samples/subnets_get_resp.json index df67ff9..e5aebe8 100644 --- a/v2.0/samples/subnets_get_resp.json +++ b/v2.0/samples/subnets_get_resp.json @@ -1,29 +1,36 @@ -status: 200 -content-length: 607 -content-type: application/json - { - "subnets": [ - { - "name": "", - "network_id": "ed2e3c10-2e43-4297-9006-2863a2d1abbc", - "tenant_id": "c1210485b2424d48804aad5d39c61b8f", - "allocation_pools": [{"start": "10.10.0.2", "end": "10.10.0.254"}], - "gateway_ip": "10.10.0.1", - "ip_version": 4, - "cidr": "10.10.0.0/24", - "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", - "enable_dhcp": true - }, - { - "name": "", - "network_id": "afc75773-640e-403c-9fff-62ba98db1f19", - "tenant_id": "ed680f49ff714162ab3612d7876ffce5", - "allocation_pools": [{"start": "10.0.0.2", "end": "10.0.0.254"}], - "gateway_ip": "10.0.0.1", - "ip_version": 4, - "cidr": "10.0.0.0/24", - "id": "e12f0c45-46e3-446a-b207-9474b27687a6", - "enable_dhcp": true - }] + "subnets":[ + { + "name":"", + "network_id":"ed2e3c10-2e43-4297-9006-2863a2d1abbc", + "tenant_id":"c1210485b2424d48804aad5d39c61b8f", + "allocation_pools":[ + { + "start":"10.10.0.2", + "end":"10.10.0.254" + } + ], + "gateway_ip":"10.10.0.1", + "ip_version":4, + "cidr":"10.10.0.0/24", + "id":"4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", + "enable_dhcp":true + }, + { + "name":"", + "network_id":"afc75773-640e-403c-9fff-62ba98db1f19", + "tenant_id":"ed680f49ff714162ab3612d7876ffce5", + "allocation_pools":[ + { + "start":"10.0.0.2", + "end":"10.0.0.254" + } + ], + "gateway_ip":"10.0.0.1", + "ip_version":4, + "cidr":"10.0.0.0/24", + "id":"e12f0c45-46e3-446a-b207-9474b27687a6", + "enable_dhcp":true + } + ] } \ No newline at end of file diff --git a/v2.0/section_neutron-agent-ext.xml b/v2.0/section_neutron-agent-ext.xml index e9de601..d6e8406 100644 --- a/v2.0/section_neutron-agent-ext.xml +++ b/v2.0/section_neutron-agent-ext.xml @@ -270,7 +270,7 @@ X-Auth-Token: 4cbb09e780434b249ff596d6979fd8fc Delete Agent: JSON Response - + diff --git a/v2.0/section_neutron-extgwmodes-ext.xml b/v2.0/section_neutron-extgwmodes-ext.xml index 571a395..790c4b3 100644 --- a/v2.0/section_neutron-extgwmodes-ext.xml +++ b/v2.0/section_neutron-extgwmodes-ext.xml @@ -163,7 +163,7 @@ the default value is True. Create router with SNAT disabled - +
@@ -217,16 +217,25 @@ Disable SNAT for the current external network - + + + + Change external network and enable SNAT - + + + + Change external network and keep SNAT disabled - + + + +
diff --git a/v2.0/section_neutron-l3-ext.xml b/v2.0/section_neutron-l3-ext.xml index f94a9f0..87f9a37 100644 --- a/v2.0/section_neutron-l3-ext.xml +++ b/v2.0/section_neutron-l3-ext.xml @@ -873,7 +873,7 @@ Accept: application/json returned. Create Floating IP: JSON Request - + Create Floating IP: JSON Response diff --git a/v2.0/section_neutron-metering-ext.xml b/v2.0/section_neutron-metering-ext.xml index 7cbde1e..bc73914 100644 --- a/v2.0/section_neutron-metering-ext.xml +++ b/v2.0/section_neutron-metering-ext.xml @@ -39,5 +39,5 @@ Metering labels and rules Creates, modifies, and deletes OpenStack Layer3 Metering labels and rules. - + diff --git a/v2.0/section_neutron-scheduler-ext.xml b/v2.0/section_neutron-scheduler-ext.xml index e1c0aa2..8bbb1e7 100644 --- a/v2.0/section_neutron-scheduler-ext.xml +++ b/v2.0/section_neutron-scheduler-ext.xml @@ -236,7 +236,7 @@ Content-Length: 54 Schedule Network: JSON Response - +
@@ -470,7 +470,7 @@ Content-Length: 54 Schedule Router: JSON Response - +
diff --git a/v2.0/wadl/common.ent b/v2.0/wadl/common.ent deleted file mode 100644 index 54a9bf3..0000000 --- a/v2.0/wadl/common.ent +++ /dev/null @@ -1,618 +0,0 @@ - - - - - - '> - - - - - '> - - - - - - '> - - - - - '> - - - - '> - - - - '> - - - - - - - '> - - - - '> - - - - - - '> - - - - - - '> - - - - - - '> - - - - - - '> - - - - - - '> - - - - - - '> - - - - - - - - '> - - - - - - The administrative state of the network. - - - - - The network ID. - - - - The network name. - - - - Indicates whether this network is shared across all tenants. - - - - The network status. - - - - The associated subnets. - - - - The tenant ID. - - '> - - - - The administrative state of the network. - - - - The network name. - - - - Admin-only. Indicates whether this network is shared across all tenants. - - - - The ID of the tenant that owns the network. Only administrative users can specify a tenant ID other than their own. You cannot change this value through authorization policies. - - '> - - - - - The physical network where this network object is implemented. The Networking API v2.0 does not provide a way to list available physical networks. For example, the Open vSwitch plug-in configuration file defines a symbolic name that maps to specific bridges on each Compute host. - - - - The type of physical network that maps to this network resource. Examples are flat, vlan, vxlan, and gre. - - - - An isolated segment on the physical network. The network_type attribute defines the segmentation model. For example, if network_type is vlan, this ID is a vlan identifier. If network_type is gre, this ID is a gre key. - - '> - - - - The port status. Value is UP or DOWN. - - - - The port name. - - - - The administrative state of the router. - - - - The ID of the attached network. - - - - The ID of the tenant who owns the network. Only administrative users can specify a tenant ID other than their own. - - - - The VIF type. - - - - The ID of the entity that uses this port. For example, a dhcp agent. - - - - The binding capabilities. - - - - The port filter. - - - - The MAC address of the port. - - - - IP addresses for the port. Includes the IP address and subnet ID. - - - - The ID of the port. - - - - The ID of the device that uses this port. For example, a virtual server. - - - - The IDs of any attached security groups. - - '> - - - - The status of the port. - - - - A symbolic name for the port. - - - - The administrative status of the router. Set to true for UP. Set to false for DOWN. - - - - The ID of the tenant who owns the network. Only administrative users can specify a tenant ID other than their own. - - - - The MAC address. If you specify an address that is not valid, a 400 Bad Request error is returned. If you do not specify a MAC address, OpenStack Networking tries to allocate one. If a failure occurs, a 503 Service Unavailable error is returned. - - - - If you specify only a subnet ID, OpenStack Networking allocates an available IP from that subnet to the port. If you specify both a subnet ID and an IP address, OpenStack Networking tries to allocate the specified address to the port. - - - - Security groups. Specify one or more security group IDs. - - - - The ID of the The network ID. - - '> - - - - - - Read-only. The The vif type for the specified port. - - - - The ID of the host where the port is allocated. In some cases, different implementations can run on different hosts. - - - - A dictionary the enables the application running on the specified host to pass and receive vif port-specific information to the plug-in. - - - - Read-only. A dictionary that enables the application to pass information about functions that the Networking API povides. Specify the following value: port_filter : Boolean to define whether port filtering features such as security group and anti-MAC/IP spoofing are provided. - - '> - - - - - - The subnet name. - - - - The ID of the attached network. - - - - The ID of the tenant who owns the network. Only administrative users can specify a tenant ID other than their own. - - - - The start and end addresses for the allocation pools. - - - - The gateway IP address. - - - - The IP version, which is 4 or 6. - - - - The CIDR. - - - - The ID of the subnet. - - - - Set to true if DHCP is enabled and false if DHCP is disabled. - - '> - - - - - The subnet name. - - - - The ID of the attached network. - - - - The ID of the tenant who owns the network. Only administrative users can specify a tenant ID other than their own. - - - - The start and end addresses for the allocation pools. - - - - The gateway IP address. - - - - The IP version, which is 4 or 6. - - - - The CIDR. - - - - The ID of the subnet. - - - - Set to true if DHCP is enabled and false if DHCP is disabled. - - '> - - - - - - A time/date stamp for when the server last changed status. - - - - Name of the image in URL format. - - - - Name of the flavor in URL format. - - - - Name of the server as a string. - - - - UUID of the server at which you want to set a marker. - - - - Integer value for the limit of values to return. - - - - Value of the status of the server so that you can filter on "ACTIVE" for example. - - - - Name of the host as a string. - - - '> - - - - - - A time/date stamp for when the flavor last changed. - - - - Integer value for the minimum disk space in GB so you can filter results. - - - - Integer value for the minimum RAM so you can filter results. - - - - UUID of the flavor at which you want to set a marker. - - - - Integer value for the limit of values to return. - - '> - - - - Security group rule object. - - - - Either ingress or egress. - - - - Either IPv4 or IPv6. - - - - The ID for the security group rule. - - - - The maximum port ranges. Set to - null. - - - - The minimum port ranges. Set to - null. - - - - The protocol. Set to null. - - - - The remote group ID. Set to - null. - - - - The remote IP prefix. Set to - null. - - - - The security group ID for the security group with - which the rule is - associated. - - - - The tenant ID. - '> - - - GET'> - PUT'> - POST'> - DELETE'> diff --git a/v2.0/wadl/metering-labels.wadl b/v2.0/wadl/metering-labels.wadl deleted file mode 100644 index da3a0fb..0000000 --- a/v2.0/wadl/metering-labels.wadl +++ /dev/null @@ -1,444 +0,0 @@ - - -%common;]> - - - - - - - - - - - - - - -

- The unique identifier of the metering - label.

- - - - - - - - - - -

- The unique identifier of metering label rule. -

- - - - - - - - - - Lists a summary of all - l3 metering labels belonging to the specified - tenant. - The list includes the unique ID for each metering - labels. - This operation does not require a request - body. - This operation returns a response body. - - - - - - - - - - - - - - - - - - - - - Creates a l3 metering label. - - This operation requires a request body. - The following table describes the required and - optional attributes in the request body: - - - - - - - - -
Create Metering Label - Rule Request Attributes
AttributeRequiredDescription
nameRequiredThe name of the metering label. -
descriptionOptional - Description for the metering label. -
- This operation returns a response body, which - contains the following informations about the metering label: - - name. - Name of the metering label. - description. Description of - the metering label. - tenant_id. The tenant ID for the - specified metering label. - - id. The metering label ID - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Shows informations for a specified - metering label. - This operation does not require a request - body. - This operation returns a response body that contains - the description, name, ID. - - - - - - - - - - - - - - - - - - - - - - - - - - - Deletes a l3 metering label. - - This operation deletes a l3 metering label. - - This operation does not require a request body. This - operation does not return a response body. - - - - - - - - - - - - - - - - - - - - - - - - - - - Lists a summary of all - l3 metering label rules belonging to the specified - tenant. - The list provides the unique ID for each metering - label rule. - This operation does not require a request body. This - operation returns a response body. - - - - - - - - - - - - - - - - - - - - - - - - Creates a l3 metering label rule. - - This operation requires a request body. - The following table describes the required and - optional attributes in the request body: - - - - - - - - - - - - -
Create Metering Label - Rule Request Attributes
AttributeRequiredDescription
directionOptionalIngress or egress: The direction in - which metering rule is - applied. Default: ingress -
metering_label_idRequiredThe meteting label ID to associate - with this metering rule. -
excludedOptional - Specify whether the remote_ip_prefix will be - excluded or not from traffic counters of the metering - label, ie: to not count the traffic of a - specific IP address of a range. Default: False -
remote_ip_prefixRequiredThe - remote IP prefix to be associated with - this metering rule. - packet.
- This operation returns a response body. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Shows detailed informations for a - specified metering label rule. - This operation does not require a request - body. - This operation returns a response body, which - contains the following informations about the metering label - rule: - direction. - Either ingress or egress. - excluded. Either True or - False. - The ID for the specified metering label - rule - The remote IP prefix - The metering label ID for the metering label - with which the rule is associated - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deletes a specified l3 metering label rule. - - This operation does not require a request - body. - This operation does not return a response body. - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/v2.0/wadl/os-networks.wadl b/v2.0/wadl/os-networks.wadl deleted file mode 100644 index 7d03567..0000000 --- a/v2.0/wadl/os-networks.wadl +++ /dev/null @@ -1,539 +0,0 @@ - - - - - - - - - - - - -%common;]> - - - - - - - - - - - The tenant ID in a multi-tenancy - cloud. - - - - - - - - - - - - The UUID for the network of - interest to you. - - - - - - - - - - - - - - - - - - Lists networks to which the - specified tenant has access. - You can control which attributes are returned by - using the fields query parameter. For information, see - Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. - - - - Indicates whether the - administrative state of the network is up or - down. - - - The network - ID. - - - The network - name. - - - Indicates whether this network - is shared across all tenants. By default, only - administrative users can change this - value. - - - The network - status. - - - The associated - subnets. - - - The tenant - ID. - - - - - - - - - - - - &fault401; - - - Creates a network. - - - -

The administrative state of - the network.

 - - - - - - - - - - - - - - - - - - Indicates whether the - administrative state of the network is up or - down. - - - The network - ID. - - - The network - name. - - - Indicates whether this network - is shared across all tenants. By default, only - administrative users can change this - value. - - - The network - status. - - - The associated - subnets. - - - The tenant - ID. - - - - - - - - - - - - &fault400; &fault401; - - - Creates multiple networks in a - single request. - In the request body, specify a list of - networks. - The bulk create operation is always atomic. Either - all or no networks in the request body are - created. - - &networkCreateParameters; - - - - - - - - - - - - - Indicates whether the - administrative state of the network is up or - down. - - - The network - ID. - - - The network - name. - - - Indicates whether this network - is shared across all tenants. By default, only - administrative users can change this - value. - - - The network - status. - - - The associated - subnets. - - - The tenant - ID. - - - - - - - - - - - - &fault400; &fault401; - - - Shows information for a specified - network. - You can control which attributes are returned by - using the fields query parameter. For information, see - Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. - - - - Indicates whether the - administrative state of the network is up or - down. - - - The network - ID. - - - The network - name. - - - Indicates whether this network - is shared across all tenants. By default, only - administrative users can change this - value. - - - The network - status. - - - The associated - subnets. - - - The tenant - ID. - - - - - - - - - - - - &fault401; &fault404; - - - Updates a specified network. - - &networkCreateParameters; - - - - - - - - - - - - - Indicates whether the - administrative state of the network is up or - down. - - - The network - ID. - - - The network - name. - - - Indicates whether this network - is shared across all tenants. By default, only - administrative users can change this - value. - - - The network - status. - - - The associated - subnets. - - - The tenant - ID. - - - - - - - - - - - - &fault400; &fault401; &fault403; &fault404; - - - Deletes a specified network and its - associated resources. - - &fault401; &fault404; - &fault409conflict; -