From d002b76739ea56e951f34faa370ad223aa1f42e8 Mon Sep 17 00:00:00 2001 From: BaoLiang Cui Date: Tue, 6 Oct 2015 11:41:12 -0400 Subject: [PATCH] Remove the duplicate ENTITY definition for lbaas In api-ref/src/wadls/netconn-api/src/common.ent, the following duplicate ENTITY definitions are removed: poolResponseParams listenerRequestParams hmResponseParams hmCreateRequestParams hmUpdateRequestParams memberResponseParams update:delete mis with hmassociatepoolRequestParams fixed. Change-Id: I559108cec2c4382e16663be604fbd508d096a7ce Closes-Bug: #1499399 --- .../api_samples/Member-get-detail-resp.json | 2 +- api-ref/src/wadls/netconn-api/src/common.ent | 513 +----------------- 2 files changed, 6 insertions(+), 509 deletions(-) diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json index cebd9bab8..78d148084 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json @@ -4,7 +4,7 @@ "admin_state_up": true, "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313", "protocol_port": 80, - "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2", + "pool_id": "a5a8839d-1ac3-41f9-9aae-f375fa4da50a", "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c", "weight": 1 } diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent index ef3eb5c53..0f5d92cff 100644 --- a/api-ref/src/wadls/netconn-api/src/common.ent +++ b/api-ref/src/wadls/netconn-api/src/common.ent @@ -2127,18 +2127,6 @@ router. Pool name. Does not have to be unique. - - - - The session persistence algorithm, if any, to use. This algorithm is - a dictionary with the type and cookie_name - keys. - - - A list of references to TLS secrets. ' > - - - A listener object. - - - - - The ID of the default pool. - - - - - The listener name. - - - - - The listener description. - - - - - - The ID of the tenant who owns the listener. Only administrative users can - specify a tenant ID other than their own. - - - - - - The connection limit. - - - - - The protocol of the listener, which is TCP, HTTP, or HTTPS. - - - - - The port. - - - - - The ID of the load balancer. - - - - - A reference to a container of TLS secrets. - - - - - A list of references to TLS secrets. - -' > ' > - - - - The ID of the tenant who owns the health monitor. Only administrative users can - specify a tenant ID other than their own. - - - - - - - The type of probe that is sent by the load balancer to verify the - member state. A valid value is PING, TCP, HTTP, or HTTPS. - - - - - - The time, in seconds, between sending probes to members. - - - - - Time in seconds to timeout each probe. - - - - - Maximum consecutive health probe tries. - - - - - The HTTP method that the monitor uses for requests. - - - - - - The path portion of URI that is probed if the type is HTTP or HTTPS. - - - - - - - The expected HTTP codes for a passing HTTP(S) monitor. - - - - - - - The administrative state of the health monitor, which is up - (true) or down (false). - - -' > @@ -2959,76 +2774,6 @@ router. '> - - - The unique ID for the member. - - - - - - The ID of the tenant who owns the member. Only administrative users can - specify a tenant ID other than their own. - - - - - - Subnet in which to access this member. - - - - - The IP address of the member. - - - - - The port where the application is hosted. - - - - - Weight of member. - - - - - - The administrative state of the member, which is up - (true) or down (false). - - - - - - - The status of the member. Indicates whether the member is operational. - - -' > @@ -3357,101 +3102,6 @@ router. ' > - - - The unique ID for the pool. - - - - - - The ID of the tenant who owns the pool. Only administrative users can - specify a tenant ID other than their own. - - - - - - The ID of the VIP with which the pool is associated. - - - - - Human-readable name for the pool. Does not have to be unique. - - - - - Human-readable description for the pool. - - - - - The ID of the network to which pool members belong. - - - - - The protocol of the pool. A valid value is TCP, HTTP, or HTTPS. - - - - - - The load-balancer algorithm, which is round-robin, least-connections, - and so on, that is used to distribute traffic to the pool members. - This value, which must be supported, is dependent on the load-balancer - provider. The round-robin algorithm must be supported. - - - - - - List of members that belong to the pool. - - - - - The administrative state of the pool. A valid value is true (UP) or false (DOWN). - - - - - The status of the pool. Indicates whether the pool is operational. - -' > @@ -3490,110 +3140,14 @@ router. ' > - - - The unique ID for the VIP. - - - - - - The ID of the tenant who owns the VIP. Only administrative users can - specify a tenant ID other than their own. - - - - - - The type of probe sent by the load balancer to verify the member state. A valid value is PING, TCP, HTTP, or HTTPS. - - - - - The time, in seconds, between sending probes to members. - - - - - - The maximum number of seconds for a monitor to wait for a connection - to be established before it times out. This value must be less than - the delay value. - - - -&max_retriesRequestParameter; - - - The HTTP method that the monitor uses for requests. - - - - - - The HTTP path of the request sent by the monitor to test the health - of a member. Must be a string beginning with a forward slash (/). - - - - - - The list of HTTP status codes expected in response from - the member to declare it healthy. Valid values include: a single value, - such as 200, a list, such as 200, 202, or a range, such as 200-204. - - - - - The administrative state of the health monitor. A valid - value is true (UP) or false (DOWN). - - - - - - The status of the health monitor. Indicates whether the health - monitor is operational. - - -' > - The ID of the tenant who owns the VIP. Only administrative users can + The ID of the tenant who owns the health monitor. Only administrative users can specify a tenant ID other than their own. @@ -3669,63 +3223,14 @@ router. '> - - - The time, in seconds, between sending probes to members. - - - - - The maximum number of seconds for a monitor to wait for a connection to be established before it times out. This value must be less than the delay value. - - -&max_retriesRequestParameter; - - - The HTTP method that the monitor uses for requests. - - - - - The HTTP path of the request sent by the monitor to test the health of a member. Must be a string beginning with a forward slash (/). - - - - - The list of HTTP status codes expected in response from the member to declare it healthy. A valid value is a single value such as 200, a list such as 200, 202, or a range such as 200-204. - - - - - The administrative state of the health monitor. A valid value is true (UP) or false (DOWN). - -' > - The UUID for the health monitor. + xmlns:wadl="http://wadl.dev.java.net/2009/02" + xml:lang="EN"> + The UUID for the health monitor. '> @@ -3765,14 +3270,6 @@ router. The IP address of the member. - - - The protocol of the VIP address. A valid value is TCP, HTTP, or HTTPS. - -