diff --git a/api-ref/src/docbkx/ch_netconn-v2-ext.xml b/api-ref/src/docbkx/ch_netconn-v2-ext.xml index 316fbf069..e7e6a1b70 100644 --- a/api-ref/src/docbkx/ch_netconn-v2-ext.xml +++ b/api-ref/src/docbkx/ch_netconn-v2-ext.xml @@ -42,14 +42,14 @@ Networks provider extended attributes (networks) List, create, show information for, update, and delete networks. - - - + + + - - - + + + diff --git a/api-ref/src/docbkx/ch_netconn-v2.xml b/api-ref/src/docbkx/ch_netconn-v2.xml index 1b544b44c..9a5fda2da 100644 --- a/api-ref/src/docbkx/ch_netconn-v2.xml +++ b/api-ref/src/docbkx/ch_netconn-v2.xml @@ -37,8 +37,19 @@ List, show information for, create, update, and delete networks. + xmlns:wadl="http://wadl.dev.java.net/2009/02"> + + + + + + + + + +
Subnets diff --git a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl index 0914cd2c0..f04c5efb2 100644 --- a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl +++ b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl @@ -109,10 +109,9 @@ Accept: application/json control which fields are returned in the response body. Additionally, you can filter results by using query string parameters. For information, see Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. + xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/ + networking_general_api_information.html#filtering-and-column-selection" + >Filtering and Column Selection. &statusParameter; &external-gateway-infoParameter; &nameParameter; @@ -190,10 +189,9 @@ Accept: application/json Use the fields query parameter to control which fields are returned in the response body. For information, see Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. + xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/ + networking_general_api_information.html#filtering-and-column-selection" + >Filtering and Column Selection. &routersParameter; &statusParameter; &external-gateway-infoParameter; &nameParameter; @@ -406,25 +404,28 @@ Accept: application/json - Lists floating IPs that are - accessible to the tenant who submits the - request. - Default policy settings return only those floating - IPs that are owned by the tenant who submits the - request, unless an admin user submits the - request. + + Lists floating IPs that are accessible to the tenant who + submits the request. + + + Default policy settings return only those floating IPs that + are owned by the tenant who submits the request, unless an + admin user submits the request. + This example request lists floating IPs in JSON format: GET /v2.0/floatingips Accept: application/json - Use the fields query parameter to - control which fields are returned in the response - body. Additionally, you can filter results by using - query string parameters. For information, see Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. + + Use the fields query parameter to control which + fields are returned in the response body. Additionally, you + can filter results by using query string parameters. For + information, see Filtering and Column Selection. + &floating-ipsParameter; &router-idParameter; &tenant-idParameter; &floating-network-idParameter; @@ -445,48 +446,96 @@ Accept: application/json - Creates a floating IP, and, if you - specify port information, associates the floating IP - with an internal port. - If you do not specify port information in the - request, you can issue an &PUT; request. - You can create floating IPs on external networks - only. If you specify a network that is not external, - such as router:external=False, the - operation returns a 400 error. - If you do not specify a floating IP address in the - request, the operation automatically allocates an - address for the floating IP. If the requested floating - IP address does not fall in the subnet range for the - external network, the operation returns a - 400 error. If the requested floating - IP address is already in use, the operation returns a - 409 error code. - You can associate the floating IP with an internal - port by using the port ID attribute in the request - body. If you specify a port ID that is not valid, the - operation returns a 404 error - code. - You must configure an IP address with the internal - OpenStack Networking port associated with the floating - IP or the operation returns a 400 error - code. Because an OpenStack Networking port might be - associated with multiple IP addresses, you can use the - fixed_ip_address attribute in the - request body to associate a particular IP address with - the floating IP. - By default, this operation associates the floating - IP with a single IP address that is configured on a - port. Therefore, if a port has multiple IP addresses, - you must specify the fixed_ip_address - attribute. - If you specify an IP address that is not valid in - the fixed_ip_address attribute, the - operation returns a 400 error code. If - the internal OpenStack Networking port and specified - IP address are already associated with another - floating IP, the operation returns a 409 - error code. + + Creates a floating IP, and, if you specify port information, + associates the floating IP with an internal port. + + + To associate the floating IP with an internal port, specify + the port ID attribute in the request body. If you do not + specify a port ID in the request, you can issue a &PUT; + request instead of a &POST; request. + + + Default policy settings enable only administrative users to + set floating IP addresses and some non-administrative users + might require a floating IP address. If you do not specify a + floating IP address in the request, the API automatically + allocates one. + + + By default, this operation associates the floating IP address + with a single fixed IP address that is configured on an + OpenStack Networking port. If a port has multiple IP + addresses, you must specify the fixed_ip_address + attribute in the request body to associate a specific fixed IP + address with the floating IP address. + + + You can create floating IPs on external networks only. + + + You must configure an IP address with the internal OpenStack + Networking port that is associated with the floating IP + address. + + Error codes: + + + + 400 The operation returns this error code for + one of these reasons: + + + + The specified network is not external, such as + router:external=False. + + + + The specified internal OpenStack + Networking port is not associated with the floating IP + address. + + + + + The requested floating IP address does not fall in the + subnet range for the external network. + + + + + The specified fixed IP address is not valid. + + + + + + 404 The specified port ID is not valid. + + + + + 409 The operation returns this error code for + one of these reasons: + + + + + The requested floating IP address is already in use. + + + + + The internal OpenStack Networking port and + specified fixed IP address are already associated + with another floating IP. + + + + + &floating-ipParameter; &tenant-idParameter; &floating-network-idParameter; &fixed-ip-addressParameter; @@ -528,10 +577,9 @@ Accept: application/json Use the fields query parameter to control which fields are returned in the response body. For information, see Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. + xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/ + networking_general_api_information.html#filtering-and-column-selection" + >Filtering and Column Selection. This example request shows details for a floating IP in JSON format. This example also filters the result by the fixed_ip_address and diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl index e1e8e852e..aad5e76e2 100644 --- a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl +++ b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl @@ -26,9 +26,9 @@ - - - + + + @@ -38,9 +38,9 @@ network of interest to you. - - - + + + @@ -48,7 +48,7 @@ - + Lists networks that are accessible @@ -74,7 +74,7 @@ - + Creates a network. @@ -114,7 +114,7 @@ - + Shows details for a specified @@ -140,7 +140,7 @@ - + Updates a specified network. @@ -184,7 +184,7 @@ - + Deletes a specified network. 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 1fb6615c7..b5150c09d 100644 --- a/api-ref/src/wadls/netconn-api/src/os-networks.wadl +++ b/api-ref/src/wadls/netconn-api/src/os-networks.wadl @@ -37,24 +37,24 @@ - - - - - - The - UUID for the network of interest to - you. - - - - - + + + + + + The + UUID for the network of interest to + you. + + + + + @@ -210,13 +210,10 @@ 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. + using the fields query parameter. For information, see Filtering and Column Selection. 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. + >Filtering and Column Selection. Filtering and Column Selection in the - OpenStack Networking API v2.0 - Reference. + using query string parameters. For information, see Filtering and Column Selection. &portListQueryParameters; &portListParameters;