diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-req.json
new file mode 100644
index 000000000..ea22109c3
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-req.json
@@ -0,0 +1,10 @@
+{
+ "endpoint_group": {
+ "endpoints": [
+ "10.2.0.0/24",
+ "10.3.0.0/24"
+ ],
+ "type": "cidr",
+ "name": "peers"
+ }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-res.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-res.json
new file mode 100644
index 000000000..5a447c74b
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-res.json
@@ -0,0 +1,13 @@
+{
+ "endpoint_group": {
+ "description": "",
+ "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d",
+ "endpoints": [
+ "10.2.0.0/24",
+ "10.3.0.0/24"
+ ],
+ "type": "cidr",
+ "id": "6ecd9cf3-ca64-46c7-863f-f2eb1b9e838a",
+ "name": "peers"
+ }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-list-res.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-list-res.json
new file mode 100644
index 000000000..b4170a464
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-list-res.json
@@ -0,0 +1,25 @@
+{
+ "endpoint_groups": [
+ {
+ "description": "",
+ "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d",
+ "endpoints": [
+ "a3da778c-adfb-46db-88b3-d2ce53290a89"
+ ],
+ "type": "subnet",
+ "id": "6bf34c7c-864c-4948-a6d4-db791669f9d4",
+ "name": "locals"
+ },
+ {
+ "description": "",
+ "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d",
+ "endpoints": [
+ "10.2.0.0/24",
+ "10.3.0.0/24"
+ ],
+ "type": "cidr",
+ "id": "6ecd9cf3-ca64-46c7-863f-f2eb1b9e838a",
+ "name": "peers"
+ }
+ ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-show-res.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-show-res.json
new file mode 100644
index 000000000..5a447c74b
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-show-res.json
@@ -0,0 +1,13 @@
+{
+ "endpoint_group": {
+ "description": "",
+ "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d",
+ "endpoints": [
+ "10.2.0.0/24",
+ "10.3.0.0/24"
+ ],
+ "type": "cidr",
+ "id": "6ecd9cf3-ca64-46c7-863f-f2eb1b9e838a",
+ "name": "peers"
+ }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-req.json
new file mode 100644
index 000000000..2b60b9667
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-req.json
@@ -0,0 +1,5 @@
+{
+ "endpoint_group": {
+ "description": "New description"
+ }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-res.json b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-res.json
new file mode 100644
index 000000000..179114956
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-res.json
@@ -0,0 +1,13 @@
+{
+ "endpoint_group": {
+ "description": "New description",
+ "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d",
+ "endpoints": [
+ "10.2.0.0/24",
+ "10.3.0.0/24"
+ ],
+ "type": "cidr",
+ "id": "6ecd9cf3-ca64-46c7-863f-f2eb1b9e838a",
+ "name": "peers"
+ }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index 54d7734e7..1f8cff0c1 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -4505,7 +4505,8 @@ router.
The lifetime of the security association. The lifetime consists of a
unit and integer value. You can omit either the unit or value
- portion of the lifetime.
+ portion of the lifetime. Default unit is seconds and default value
+ is 3600.
@@ -4515,8 +4516,10 @@ router.
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
- Units for lifetime of the security association. Default is
- seconds.
+ The units for the lifetime of the security association. The lifetime
+ consists of a unit and integer value. You can omit either the unit
+ or value portion of the lifetime. Default unit is seconds and
+ default value is 3600.
@@ -4526,7 +4529,10 @@ router.
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
- Lifetime value, as a positive integer. Default is 3600 seconds.
+ The lifetime value, as a positive integer. The lifetime consists of
+ a unit and integer value. You can omit either the unit or value
+ portion of the lifetime. Default unit is seconds and default value
+ is 3600.
'>
@@ -4574,7 +4580,9 @@ router.
- Human-readable description for the IKE policy.
+
+ Human-readable description for the IKE policy.
+
'>
-
- Human-readable name for the IPSec policy. Does
- not have to be unique.
-
-
-
-
- Human-readable description for the IPSec policy.
-
-
+&ipsec_policy_nameRequestParameter;
+&ipsec_policy_descriptionRequestParameter;
- Human-readable name for the IPSec policy. Does
- not have to be unique.
+
+ Human-readable name for the IPSec policy. Does not have to be
+ unique.
+
- Human-readable description for the IPSec policy.
+
+ Human-readable description for the IPSec policy.
+
Lifetime value, as a positive integer. Default is 3600 seconds.
'>
+
+
+
+ Owner of the VPN endpoint group. Only administrative users can specify a
+ tenant ID other than their own.
+
+
+
+
+
+
+ The type of the endpoints in the group. A valid value is
+ subnet, cidr, network,
+ router, or vlan.
+
+
+
+
+
+
+ List of endpoints of the same type, for the endpoint group.
+ The values will depend on type specified.
+
+
+'>
+
+
+
+ Human-readable name for the VPN endpoint group. Does not have to be
+ unique.
+
+
+
+
+
+
+ Human-readable description for the VPN endpoint group.
+
+
+'>
+
+
+ VPN endpoint group objects.
+
+'>
+
+
+ The unique ID for the VPN endpoint group.
+
+
+
+
+
+ Owner of the VPN endpoint group. Only administrative users can specify a
+ tenant ID other than their own.
+
+
+
+
+
+
+ Human-readable name for the VPN endpoint group. Does not have to
+ be unique.
+
+
+
+
+
+
+ Human-readable description for the VPN endpoint group.
+
+
+
+
+
+
+ The type of the endpoints in the group. A valid value is
+ subnet, cidr, network,
+ router, or vlan.
+
+
+
+
+
+
+ A list of endpoints of the same type for the endpoint group.
+ Theses values depend on the specified type.
+
+
+'>
@@ -4993,8 +5120,10 @@ router.
- Human-readable name for the IPSec connection. Does
- not have to be unique.
+
+ Human-readable name for the IPSec connection. Does not have to
+ be unique.
+
- Human-readable description for the IPSec connection.
+
+ Human-readable description for the IPSec connection.
+
-
-
-
- Human-readable name for the IPSec connection. Does not have to be
- unique.
-
-
-
-
-
- Human-readable description for the IPSec connection.
-
-
+&ipsec_conn_nameRequestParameter;
+&ipsec_conn_descriptionRequestParameter;
'>
+
+
+
+ Human-readable name for the IPSec connection. Does not have to be
+ unique.
+
+
+'>
+
+
+
+ Human-readable description for the IPSec connection.
+
+
+'>
+
+
+
+ Human-readable name for the IPSec policy. Does not have to be
+ unique.
+
+
+'>
+
+
+
+ Human-readable description for the IPSec policy.
+
+
+'>
diff --git a/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl
index b939ba1d2..fcf1082e9 100644
--- a/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl
@@ -3,7 +3,7 @@
-
+
@@ -71,6 +71,22 @@
+
+
+
+
+
+ The
+ UUID for the VPN endpoint group.
+
+
+
+
+
+
@@ -293,6 +309,68 @@
Removes the IPSec policy specified in the request.
&fault401; &fault404; &fault409;
+
+
+
+ Creates a VPN endpoint group.
+
+ The endpoint group contains one or more endpoints of a specific
+ type that you can use to create a VPN connections.
+
+
+
+
+
+
+ &vpnEndpointGroupRequestParams; &vpnEndpointGroupCreateRequestParams;
+
+
+
+
+
+ &vpnEndpointGroupResponseParams;
+ &fault400; &fault401;
+
+
+ Lists VPN endpoint groups.
+
+
+
+
+
+ &vpnEndpointGroupListResponseParams; &vpnEndpointGroupResponseParams;
+ &fault401; &fault403;
+
+
+ Shows details for a specified VPN endpoint group.
+
+
+
+
+
+ &vpnEndpointGroupResponseParams;
+ &fault401; &fault403; &fault404;
+
+
+ Updates settings for a specified VPN endpoint group.
+
+
+
+
+
+ &vpnEndpointGroupRequestParams;
+
+
+
+
+ &vpnEndpointGroupResponseParams;
+ &fault400; &fault401; &fault404;
+
+
+ Removes a specified VPN endpoint group.
+
+ &fault401; &fault404; &fault409;