Skip to content

Commit

Permalink
Update neutron wadl files so I can generate neutron API ref from same…
Browse files Browse the repository at this point in the history 
… WADLs

Partial-Bug: #1157159

Change-Id: Ic47242ed1423c86965bf6abde6408350e7caad8c
author: diane fleming
  • Loading branch information
@dian4554
dian4554 committed Nov 1, 2013
1 parent e7896df commit b0b32f8
Show file tree
Hide file tree
Showing 23 changed files with 819 additions and 303 deletions.
50 changes: 27 additions & 23 deletions api-ref/src/docbkx/api-ref-networking.xml
View file
Expand Up @@ -32,53 +32,57 @@
<chapter xml:id="netconn-api">
<title>Networking API v2.0</title>
<para>Provides virtual networking services among devices that are
managed by the OpenStack compute service. The Networking API
managed by the OpenStack Compute service. The Networking API
v2.0 combines the API v1.1 functionality with some essential
Internet Protocol Address Management (IPAM). Enables users to
Internet Protocol Address Management (IPAM) functionality. Enables users to
associate IP address blocks and other network configuration
settings with a neutron network. You can choose a specific IP
address from the block or let neutron choose the first available
IP address.</para>
<section xml:id="networks">
<title>Networks</title>
<para>Lists, shows information for, creates, updates, and deletes
networks.</para>
<para>Lists, shows information for, creates, updates, and
deletes networks.</para>
<wadl:resources href="../wadls/netconn-api/src/os-networks.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="subnets">
<title>Subnets</title>
<para>Lists, shows information for, creates, updates, and deletes subnet
resources.</para>
<para>Lists, shows information for, creates, updates, and
deletes subnet resources.</para>
<wadl:resources href="../wadls/netconn-api/src/os-subnets.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="ports">
<title>Ports</title>
<para>Lists, shows information for, creates, updates, and deletes ports.</para>
<para>Lists, shows information for, creates, updates, and
deletes ports.</para>
<wadl:resources href="../wadls/netconn-api/src/os-ports.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
</chapter>
<chapter xml:id="netconn-api-ext">
<title>Networking API v2.0 Extensions</title>
<section xml:id="quotas">
<chapter xml:id="netconn-api-ext">
<title>Networking API v2.0 Extensions</title>
<section xml:id="quotas">
<title>Quotas Extension</title>
<para>Lists, shows information for, updates, and resets quotas.</para>
<para>Lists, shows information for, updates, and resets
quotas.</para>
<wadl:resources href="../wadls/netconn-api/src/os-quotas.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="network_provider">
<title>Networks provider Extended Attributes</title>

<wadl:resources href="../wadls/netconn-api/src/os-networks-provider-ext.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="port_binding">
<title>Ports binding Extended Attributes</title>

<wadl:resources href="../wadls/netconn-api/src/os-ports-binding-ext.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="network_provider">
<title>Networks provider Extended Attributes</title>

<wadl:resources
href="../wadls/netconn-api/src/os-networks-provider-ext.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
<section xml:id="port_binding">
<title>Ports binding Extended Attributes</title>

<wadl:resources
href="../wadls/netconn-api/src/os-ports-binding-ext.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>
</chapter>
</book>
24 changes: 11 additions & 13 deletions api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json
View file
@@ -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"
}
}
60 changes: 33 additions & 27 deletions api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json
View file
@@ -1,28 +1,34 @@
{
"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}]
}
"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
}
]
}
12 changes: 6 additions & 6 deletions api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml
View file
Expand Up @@ -6,28 +6,28 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<network>
<status>ACTIVE</status>
<subnets quantum:type="list" />
<subnets quantum:type="list"/>
<name>sample_network_1</name>
<provider:physical_network xsi:nil="true" />
<provider:physical_network xsi:nil="true"/>
<admin_state_up quantum:type="bool">True</admin_state_up>
<tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
<provider:network_type>local</provider:network_type>
<router:external quantum:type="bool">False</router:external>
<shared quantum:type="bool">False</shared>
<id>9eb3ce34-183b-4a75-b08f-d6a3d241e68b</id>
<provider:segmentation_id xsi:nil="true" />
<provider:segmentation_id xsi:nil="true"/>
</network>
<network>
<status>ACTIVE</status>
<subnets quantum:type="list" />
<subnets quantum:type="list"/>
<name>sample_network_2</name>
<provider:physical_network xsi:nil="true" />
<provider:physical_network xsi:nil="true"/>
<admin_state_up quantum:type="bool">True</admin_state_up>
<tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
<provider:network_type>local</provider:network_type>
<router:external quantum:type="bool">False</router:external>
<shared quantum:type="bool">False</shared>
<id>df679a25-915d-41ed-b5ec-721481ddfd56</id>
<provider:segmentation_id xsi:nil="true" />
<provider:segmentation_id xsi:nil="true"/>
</network>
</networks>
21 changes: 11 additions & 10 deletions api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json
View file
@@ -1,11 +1,12 @@
{
"networks": [
{
"name": "sample_network_1",
"admin_state_up": false
},
{
"name": "sample_network_2",
"admin_state_up": false
}]
}
"networks":[
{
"name":"sample_network_1",
"admin_state_up":false
},
{
"name":"sample_network_2",
"admin_state_up":false
}
]
}
12 changes: 12 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.json
View file
@@ -0,0 +1,12 @@
{
"port":
{
"state": "DOWN",
"id": "98017ddc-efc8-4c25-a915-774b2a633855",
"attachment":
{
"id": "test_interface_identifier"
}
}
}

6 changes: 6 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-detail-res.xml
View file
@@ -0,0 +1,6 @@
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"
state="DOWN">
<attachment
id="test_interface_identifier"/>
</port>
8 changes: 8 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-res.json
View file
@@ -0,0 +1,8 @@
{
"port":
{
"state": "DOWN",
"id": "98017ddc-efc8-4c25-a915-774b2a633855"
}
}

3 changes: 3 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-get-res.xml
View file
@@ -0,0 +1,3 @@
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"
state="DOWN"/>
16 changes: 16 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.json
View file
@@ -0,0 +1,16 @@
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}
}
2 changes: 2 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-req.xml
View file
@@ -0,0 +1,2 @@
<port
state="ACTIVE"/>
24 changes: 24 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.json
View file
@@ -0,0 +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"
}
}
2 changes: 2 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnet-post-res.xml
View file
@@ -0,0 +1,2 @@
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"/>
18 changes: 18 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.json
View file
@@ -0,0 +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,
}
}
8 changes: 8 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-detail-res.xml
View file
@@ -0,0 +1,8 @@
<ports>
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"
state="ACTIVE"/>
<port
id="b832be00-6553-4f69-af33-acd554e36d08"
state="ACTIVE"/>
</ports>
40 changes: 40 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.json
View file
@@ -0,0 +1,40 @@
{
"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"
}
]
}
6 changes: 6 additions & 0 deletions api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-res.xml
View file
@@ -0,0 +1,6 @@
<ports>
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"/>
<port
id="b832be00-6553-4f69-af33-acd554e36d08"/>
</ports>

0 comments on commit b0b32f8

Please sign in to comment.