diff --git a/api-ref/src/docbkx/ch_netconn-ext-v2.xml b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
index d945cf1e0..7c423d3ff 100644
--- a/api-ref/src/docbkx/ch_netconn-ext-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
@@ -1,4 +1,17 @@
+
+
+
+
+
+
+
+GET'>
+PUT'>
+POST'>
+DELETE'>
+]>
Networking API v2.0 extensions
Quotas extension (quotas)
- Lists, shows information for, updates, and resets
- quotas.
+ List, show details for, update, and reset quotas.
- Networks provider extended attributes
- (networks)
+ Networks provider extension (networks)
+ Enables administrative users to specify how an OpenStack
+ Networking network object is mapped to the underlying
+ networking infrastructure. Also, enables administrative
+ users to view such attributes when they query networks. To
+ this aim, this extension defines a set of
+ provider-prefixed
+ attributes.
+
+ Networks multiple provider extension (networks)
+ Enables administrative users to define multiple physical
+ bindings for an OpenStack Networking network and list or
+ show details for networks with multiple physical
+ bindings.
+ You cannot update any provider
+ attributes. If you try to do so, an error occurs.
+ To delete a network with multiple physical bindings,
+ issue a normal delete network request, as follows:
+ DELETE v2.0/networks/{network_id}
+ To define multiple physical bindings for a network,
+ include a segments list in the request
+ body of a POST /v2.0/networks request. Each
+ element in the segments list has the
+ same structure as the provider network attributes. These
+ attributes are provider:network_type,
+ provider:physical_network, and
+ provider:segmentation_id. The
+ validation rules for these attributes are the same as for
+ the Networks provider extended attributes. You
+ cannot use both extensions at the same time.
+ The NSX and ML2 plug-ins support this extension. With
+ the ML2 plug-in, you can specify multiple VLANs for a
+ specified network, a VXLAN tunnel ID, and a VLAN.
+
+
Ports binding extended attributes (ports)
Layer-3 networking
- The Layer-3 networking extension enables you to route
- packets between subnets, forward packets from internal
- networks to external ones, and access instances from
- external networks through floating IPs.
+ Route packets between subnets, forward packets from
+ internal networks to external ones, and access instances
+ from external networks through floating IPs.
This extension introduces these resources:
@@ -97,9 +145,10 @@
Metering labels and rules
- Creates, modifies, and deletes OpenStack Layer3 Metering labels
- and rules.
-
+ Create, modify, and delete OpenStack Layer-3
+ metering labels and rules.
+
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json
new file mode 100644
index 000000000..c6b011ebc
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json
@@ -0,0 +1,17 @@
+{
+ "network":{
+ "segments":[
+ {
+ "provider:segmentation_id":"2",
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"vlan"
+ },
+ {
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"stt"
+ }
+ ],
+ "name":"net1",
+ "admin_state_up":true
+ }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-resp.json
new file mode 100644
index 000000000..f75d36977
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-resp.json
@@ -0,0 +1,26 @@
+{
+ "network":{
+ "status":"ACTIVE",
+ "subnets":[
+
+ ],
+ "name":"net1",
+ "admin_state_up":true,
+ "tenant_id":"9bacb3c5d39d41a79512987f338cf177",
+ "segments":[
+ {
+ "provider:segmentation_id":2,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"vlan"
+ },
+ {
+ "provider:segmentation_id":null,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"stt"
+ }
+ ],
+ "shared":false,
+ "port_security_enabled":true,
+ "id":"4e8e5957-649f-477b-9e5b-f1f75b21c03c"
+ }
+}
\ No newline at end of file
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 d7380ae0b..f75d36977 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
@@ -4,13 +4,23 @@
"subnets":[
],
- "name":"sample_network",
- "provider:physical_network":null,
+ "name":"net1",
"admin_state_up":true,
- "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
- "provider:network_type":"local",
+ "tenant_id":"9bacb3c5d39d41a79512987f338cf177",
+ "segments":[
+ {
+ "provider:segmentation_id":2,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"vlan"
+ },
+ {
+ "provider:segmentation_id":null,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"stt"
+ }
+ ],
"shared":false,
- "id":"baed79dd-9136-4260-b9a9-d9dfa2bf6547",
- "provider:segmentation_id":null
+ "port_security_enabled":true,
+ "id":"4e8e5957-649f-477b-9e5b-f1f75b21c03c"
}
-}
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-get-detail-resp.json
new file mode 100644
index 000000000..802c03fae
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-get-detail-resp.json
@@ -0,0 +1,27 @@
+{
+ "network":{
+ "status":"ACTIVE",
+ "subnets":[
+
+ ],
+ "name":"net1",
+ "admin_state_up":true,
+ "tenant_id":"9bacb3c5d39d41a79512987f338cf177",
+ "segments":[
+ {
+ "provider:segmentation_id":2,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"vlan"
+ },
+ {
+ "provider:segmentation_id":0,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"stt"
+ }
+ ],
+ "router:external":false,
+ "shared":false,
+ "port_security_enabled":true,
+ "id":"4e8e5957-649f-477b-9e5b-f1f75b21c03c"
+ }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-list-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-list-resp.json
new file mode 100644
index 000000000..8d707ad7b
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-list-resp.json
@@ -0,0 +1,44 @@
+{
+ "networks":[
+ {
+ "status":"ACTIVE",
+ "subnets":[
+
+ ],
+ "name":"net1",
+ "admin_state_up":true,
+ "tenant_id":"9bacb3c5d39d41a79512987f338cf177",
+ "segments":[
+ {
+ "provider:segmentation_id":2,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"vlan"
+ },
+ {
+ "provider:segmentation_id":0,
+ "provider:physical_network":"8bab8453-1bc9-45af-8c70-f83aa9b50453",
+ "provider:network_type":"stt"
+ }
+ ],
+ "router:external":false,
+ "shared":false,
+ "port_security_enabled":true,
+ "id":"4e8e5957-649f-477b-9e5b-f1f75b21c03c"
+ },
+ {
+ "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
+ }
+ ]
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index dad61021f..d46573392 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -175,6 +175,11 @@
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.
'>
+
+
+ A segments object that defines one or more provider segments.'>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
new file mode 100644
index 000000000..238687fe1
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+%common;]>
+
+
+
+
+
+
+
+
+
+
+
+ The UUID for the
+ network of interest to
+ you.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lists networks that are accessible
+ to the tenant who submits the request. Networks with
+ multiple segments include the segments
+ list in the response.
+
+ &networkListParameters;
+ &networkSegmentParameter; &networkProviderParameters;
+
+
+
+
+
+
+
+
+
+
+ Creates a network with multiple
+ segment mappings.
+
+ &networkCreateParameters; &networkSegmentParameter;
+ &networkProviderParameters;
+
+
+
+
+
+
+ &networkListParameters;
+ &networkProviderParameters;
+
+
+
+
+
+
+
+
+
+ Shows details for a specified
+ network with multiple segments.
+
+ &networkListParameters;
+ &networkSegmentParameter; &networkProviderParameters;
+
+
+
+
+
+
+
+
+
+
+
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 53575f4ab..5fcc3e358 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
@@ -19,7 +19,8 @@
-
+
@@ -74,7 +75,7 @@
title="Create network" xml:lang="EN">
Creates a network.
- &networkCreateParameters; &networkCreateParameters; &networkProviderParameters;
@@ -110,8 +111,8 @@
- Shows information for the specified
+ title="Show network details">
+ Shows details for a specified
network.
&networkListParameters;
@@ -137,8 +138,7 @@
- Updates the specified
- network.
+ Updates a specified network.
&networkCreateParameters;
&networkProviderParameters;
- Deletes the specified
- network.
+ Deletes a specified network.