From fa3036c93298b8a940ab87287b0ea7ae803c5395 Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Thu, 20 Mar 2014 15:29:54 -0500 Subject: [PATCH] Update sample code for networks calls Closes-Bug: #1274695 Change-Id: Ifad88b86122555b70f89dd6ccab3e6b0ac58b7ea author: diane fleming --- .../src/api_samples/network-post-req.json | 9 ++- .../src/api_samples/network-post-req.xml | 2 +- .../src/api_samples/network-post-resp.json | 13 ++-- .../src/api_samples/network-post-resp.xml | 11 ++-- .../api_samples/network-put-update-resp.json | 25 +++++--- .../api_samples/network-put-update-resp.xml | 12 ++-- .../api_samples/network-put-update.req.json | 2 +- .../api_samples/network-put-update.req.xml | 2 +- .../networks-create-bulk-resp.json | 18 +++--- .../api_samples/networks-create-bulk-resp.xml | 15 ++--- .../api_samples/networks-get-detail-resp.json | 25 +++++--- .../api_samples/networks-get-detail-resp.xml | 22 ++++--- .../src/api_samples/networks-get-resp.json | 61 ++++++++++--------- .../src/api_samples/networks-get-resp.xml | 26 ++++---- .../networks-post-create-bulk-req.json | 8 +-- .../networks-post-create-bulk-req.xml | 4 +- .../wadls/netconn-api/src/os-networks.wadl | 4 +- 17 files changed, 137 insertions(+), 122 deletions(-) diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json index 52075f453..808da2118 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json @@ -1,7 +1,6 @@ { - "network": - { - "name": "sample_network", - "admin_state_up": false - } + "network":{ + "name":"sample_network", + "admin_state_up":true + } } \ No newline at end of file diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml index 7dc851124..9b4d2e932 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml @@ -1,4 +1,4 @@ - sample_network + sample_network2 diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json index 83d5ae207..d7380ae0b 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json @@ -1,13 +1,16 @@ { "network":{ - "admin_state_up":true, - "id":"850d3f2c-f0a5-4f8b-b1cf-5836fc0be940", - "name":"sample_network", - "shared":false, "status":"ACTIVE", "subnets":[ ], - "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce" + "name":"sample_network", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", + "provider:network_type":"local", + "shared":false, + "id":"baed79dd-9136-4260-b9a9-d9dfa2bf6547", + "provider:segmentation_id":null } } diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml index 9bf6bfc63..4f7ffca8f 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml @@ -1,13 +1,16 @@ ACTIVE - sample_network - 4be6b806faa0491eb358018bbe9f0d4e + sample_network2 + True + 4fd44f30292945e481c7b8a0c8908869 + local False - 0657ef52-d3f6-4320-9c26-015a3e9badea + c220b026-ece1-4ead-873f-83537f4c9f92 + diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json index f9b1f942c..6a2203e2d 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json @@ -1,12 +1,17 @@ { - "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 - } + "network":{ + "status":"ACTIVE", + "subnets":[ + + ], + "name":"sample_network_5_updated", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", + "provider:network_type":"local", + "router:external":false, + "shared":false, + "id":"1f370095-98f6-4079-be64-6d3d4a6adcc6", + "provider:segmentation_id":null + } } diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml index ff8071088..07ab2e390 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml @@ -2,19 +2,17 @@ ACTIVE - - e12f0c45-46e3-446a-b207-9474b27687a6 - - private + + sample-network-4-updated True - 625887121e364204873d362b553ab171 + 4fd44f30292945e481c7b8a0c8908869 local False False - 9d83c053-b0a4-4682-ae80-c00df269ce0a + af374017-c9ae-4a1d-b799-ab73111476e2 diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json index 37fe5694c..513b2e795 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json @@ -1,6 +1,6 @@ { "network": { - "name": "updated_name" + "name": "sample_network_5_updated" } } diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml index d82c7bacd..3d3b5b139 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml @@ -4,5 +4,5 @@ xmlns:quantum="http://openstack.org/quantum/api/v2.0" xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - nova2 + sample-network-4-updated diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json index d2136bf02..1478bab8f 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json @@ -5,14 +5,13 @@ "subnets":[ ], - "name":"sample_network_1", + "name":"sample_network3", "provider:physical_network":null, - "admin_state_up":false, - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", "provider:network_type":"local", - "router:external":false, "shared":false, - "id":"e9330b1f-a2ef-4160-a951-169ee6ab17f5", + "id":"bc1a76cb-8767-4c3a-bb95-018b822f2130", "provider:segmentation_id":null }, { @@ -20,14 +19,13 @@ "subnets":[ ], - "name":"sample_network_2", + "name":"sample_network4", "provider:physical_network":null, - "admin_state_up":false, - "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3", + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", "provider:network_type":"local", - "router:external":false, "shared":false, - "id":"cfb5f52c-dfe2-4357-a10d-a225693e2b84", + "id":"af374017-c9ae-4a1d-b799-ab73111476e2", "provider:segmentation_id":null } ] diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml index e2978616b..ea64cdc95 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml @@ -2,32 +2,29 @@ ACTIVE - sample_network_1 + sample_network_5 True - 60cd4f6dbc2f491982a284e7b83b5be3 + 4fd44f30292945e481c7b8a0c8908869 local - False False - 9eb3ce34-183b-4a75-b08f-d6a3d241e68b + 1f370095-98f6-4079-be64-6d3d4a6adcc6 ACTIVE - sample_network_2 + sample_network_6 True - 60cd4f6dbc2f491982a284e7b83b5be3 + 4fd44f30292945e481c7b8a0c8908869 local - False False - df679a25-915d-41ed-b5ec-721481ddfd56 + ee2d3158-3e80-4fb3-ba87-c99f515d85e7 diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json index f9b1f942c..ade51c793 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json @@ -1,12 +1,17 @@ { - "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 - } + "network":{ + "status":"ACTIVE", + "subnets":[ + "54d6f61d-db07-451c-9ab3-b9609b6b6f0b" + ], + "name":"private-network", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", + "provider:network_type":"local", + "router:external":true, + "shared":true, + "id":"d32019d3-bc6e-4319-9c1d-6722fc136a22", + "provider:segmentation_id":null + } } diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml index 3e90de689..f13d0502e 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml @@ -1,16 +1,20 @@ - + ACTIVE - e12f0c45-46e3-446a-b207-9474b27687a6 + 54d6f61d-db07-451c-9ab3-b9609b6b6f0b - private - + private-network + True - 625887121e364204873d362b553ab171 + 4fd44f30292945e481c7b8a0c8908869 local - False - False - 9d83c053-b0a4-4682-ae80-c00df269ce0a - + True + True + d32019d3-bc6e-4319-9c1d-6722fc136a22 + diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json index c204d4a2c..d6d62726e 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json @@ -1,31 +1,34 @@ { - "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 - } - ] + "networks":[ + { + "status":"ACTIVE", + "subnets":[ + "54d6f61d-db07-451c-9ab3-b9609b6b6f0b" + ], + "name":"private-network", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"4fd44f30292945e481c7b8a0c8908869", + "provider:network_type":"local", + "router:external":true, + "shared":true, + "id":"d32019d3-bc6e-4319-9c1d-6722fc136a22", + "provider:segmentation_id":null + }, + { + "status":"ACTIVE", + "subnets":[ + "08eae331-0402-425a-923c-34f7cfe39c1b" + ], + "name":"private", + "provider:physical_network":null, + "admin_state_up":true, + "tenant_id":"26a7980765d0414dbc1fc1f88cdb7e6e", + "provider:network_type":"local", + "router:external":true, + "shared":true, + "id":"db193ab3-96e3-4cb3-8fc5-05f4296d0324", + "provider:segmentation_id":null + } + ] } diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml index 6c4f7aeab..680bd4292 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml @@ -1,37 +1,37 @@ - + ACTIVE - a318fcb4-9ff0-4485-b78c-9e6738c21b26 + 54d6f61d-db07-451c-9ab3-b9609b6b6f0b - private + private-network True - 625887121e364204873d362b553ab171 + 4fd44f30292945e481c7b8a0c8908869 local - False - False - 9d83c053-b0a4-4682-ae80-c00df269ce0a + True + True + d32019d3-bc6e-4319-9c1d-6722fc136a22 ACTIVE - aca4d43c-c48c-4a2c-9bb6-ba374ef7e135 + 08eae331-0402-425a-923c-34f7cfe39c1b - nova + private True - 63878e4c5dd649d2a980e37aefddfa87 + 26a7980765d0414dbc1fc1f88cdb7e6e local True - False - ebda9658-093b-41ba-80ce-0cf8cb8365d4 + True + db193ab3-96e3-4cb3-8fc5-05f4296d0324 diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json index 858f5057c..305da76fb 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json @@ -1,12 +1,12 @@ { "networks":[ { - "name":"sample_network_1", - "admin_state_up":false + "name":"sample_network3", + "admin_state_up":true }, { - "name":"sample_network_2", - "admin_state_up":false + "name":"sample_network4", + "admin_state_up":true } ] } \ No newline at end of file diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml index 4821804e8..6e746e6b6 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml +++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml @@ -1,9 +1,9 @@ - sample_network_1 + sample_network_5 - sample_network_2 + sample_network_6 diff --git a/api-ref/src/wadls/netconn-api/src/os-networks.wadl b/api-ref/src/wadls/netconn-api/src/os-networks.wadl index 00cdd8174..9d5e13aad 100644 --- a/api-ref/src/wadls/netconn-api/src/os-networks.wadl +++ b/api-ref/src/wadls/netconn-api/src/os-networks.wadl @@ -19,7 +19,8 @@ - + @@ -185,7 +186,6 @@ -