openstack-attic
/
netconn-api
Code Issues Proposed changes

Merge "Correct issues with vip, member, pool, and health monitor operations"

This commit is contained in:
Jenkins 2014-04-02 19:34:11 +00:00 committed by Gerrit Code Review
parent 0bead20ce6 ec620b7c1e
commit 7de8072145
27 changed files with 1192 additions and 1271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
v2.0/samples/loadbalancer/health_monitors-create-req.json
View File

@ -1,9 +1,9 @@
{
"health_monitor": {
"delay": "4",
"max_retries": "3",
"type": "TCP",
"timeout": "1",
"admin_state_up": true
}
"health_monitor":{
"delay":"1",
"max_retries":"1",
"type":"HTTP",
"timeout":"1",
"admin_state_up":true
}
}

25
v2.0/samples/loadbalancer/health_monitors-create-res.json
View File

@ -1,12 +1,17 @@
{
"health_monitor": {
"status": "PENDING_CREATE",
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"delay": 4,
"max_retries": 3,
"timeout": 1,
"type": "TCP",
"id": "ada338f0-10d0-4326-b02e-cc123114f240"
}
"health_monitor":{
"admin_state_up":true,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"delay":1,
"expected_codes":"200",
"max_retries":1,
"http_method":"GET",
"timeout":1,
"pools":[
],
"url_path":"/",
"type":"HTTP",
"id":"b624decf-d5d3-4c66-9a3d-f047e7786181"
}
}

2
v2.0/samples/loadbalancer/health_monitors-list-res.json
View File

@ -1,7 +1,6 @@
{
"health_monitors":[
{
"status":"ACTIVE",
"admin_state_up":true,
"tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
"delay":10,
@ -11,7 +10,6 @@
"id":"466c8345-28d8-4f84-a246-e04380b0461d"
},
{
"status":"ACTIVE",
"admin_state_up":true,
"tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
"delay":5,

1
v2.0/samples/loadbalancer/health_monitors-show-res.json
View File

@ -1,6 +1,5 @@
{
"health_monitor": {
"status": "ACTIVE",
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"delay": 5,

6
v2.0/samples/loadbalancer/health_monitors-update-req.json
View File

@ -1,5 +1,5 @@
{
"health_monitor": {
"delay": "30"
}
"health_monitor":{
"delay":"3"
}
}

25
v2.0/samples/loadbalancer/health_monitors-update-res.json
View File

@ -1,12 +1,17 @@
{
"health_monitor": {
"status": "PENDING_UPDATE",
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"delay": 30,
"max_retries": 1,
"timeout": 1,
"type": "PING",
"id": "466c8345-28d8-4f84-a246-e04380b0461d"
}
"health_monitor":{
"admin_state_up":true,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"delay":3,
"expected_codes":"200",
"max_retries":1,
"http_method":"GET",
"timeout":1,
"pools":[
],
"url_path":"/",
"type":"HTTP",
"id":"b624decf-d5d3-4c66-9a3d-f047e7786181"
}
}

6
v2.0/samples/loadbalancer/healthmonitors-associate-req.json
View File

@ -1,5 +1,5 @@
{
"health_monitor": {
"id": "ada338f0-10d0-4326-b02e-cc123114f240"
}
"health_monitor":{
"id":"b624decf-d5d3-4c66-9a3d-f047e7786181"
}
}

4
v2.0/samples/loadbalancer/healthmonitors-associate-res.json
View File

@ -1,3 +1,5 @@
{
"health_monitor": {}
"health_monitor":{
}
}

13
v2.0/samples/loadbalancer/members-create-req.json
View File

@ -1,9 +1,8 @@
{
"member": {
"protocol_port": "8080",
"address": "10.0.0.5",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"weight": "2",
"admin_state_up": true
}
"member":{
"protocol_port":"8080",
"address":"10.0.0.5",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"admin_state_up":true
}
}

21
v2.0/samples/loadbalancer/members-create-res.json
View File

@ -1,12 +1,13 @@
{
"member": {
"status": "PENDING_CREATE",
"weight": 2,
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"address": "10.0.0.5",
"protocol_port": 8080,
"id": "b9a7012a-1097-45b2-a973-6572973619bc"
}
"member":{
"status":"PENDING_CREATE",
"protocol_port":8080,
"weight":1,
"admin_state_up":true,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"10.0.0.5",
"status_description":null,
"id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
}
}

35
v2.0/samples/loadbalancer/members-list-res.json
View File

@ -1,24 +1,15 @@
{
"members": [
{
"status": "ACTIVE",
"weight": 1,
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"address": "10.0.0.4",
"protocol_port": 80,
"id": "701b531b-111a-4f21-ad85-4795b7b12af6"
},
{
"status": "ACTIVE",
"weight": 1,
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"address": "10.0.0.3",
"protocol_port": 80,
"id": "beb53b4d-230b-4abd-8118-575b8fa006ef"
}
]
"members":[
{
"status":"PENDING_CREATE",
"protocol_port":8080,
"weight":1,
"admin_state_up":true,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"10.0.0.5",
"status_description":null,
"id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
}
]
}

21
v2.0/samples/loadbalancer/members-show-res.json
View File

@ -1,12 +1,13 @@
{
"member": {
"status": "ACTIVE",
"weight": 1,
"admin_state_up": true,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"address": "10.0.0.4",
"protocol_port": 80,
"id": "701b531b-111a-4f21-ad85-4795b7b12af6"
}
"member":{
"status":"PENDING_CREATE",
"protocol_port":8080,
"weight":1,
"admin_state_up":true,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"10.0.0.5",
"status_description":null,
"id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
}
}

6
v2.0/samples/loadbalancer/members-update-req.json
View File

@ -1,5 +1,5 @@
{
"member": {
"admin_state_up": false
}
"member":{
"admin_state_up":"False"
}
}

21
v2.0/samples/loadbalancer/members-update-res.json
View File

@ -1,12 +1,13 @@
{
"member": {
"status": "PENDING_UPDATE",
"weight": 5,
"admin_state_up": false,
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"address": "10.0.0.5",
"protocol_port": 8080,
"id": "b9a7012a-1097-45b2-a973-6572973619bc"
}
"member":{
"status":"PENDING_UPDATE",
"protocol_port":8080,
"weight":1,
"admin_state_up":false,
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"10.0.0.5",
"status_description":null,
"id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
}
}

14
v2.0/samples/loadbalancer/pools-create-req.json
View File

@ -1,9 +1,9 @@
{
"pool": {
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"lb_method": "ROUND_ROBIN",
"protocol": "TCP",
"name": "NewPool",
"admin_state_up": true
}
"pool":{
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"lb_method":"SOURCE_IP",
"protocol":"HTTP",
"name":"mypool",
"admin_state_up":true
}
}

37
v2.0/samples/loadbalancer/pools-create-res.json
View File

@ -1,16 +1,25 @@
{
"pool": {
"status": "PENDING_CREATE",
"lb_method": "STATIC_IP",
"protocol": "TCP",
"description": "",
"health_monitors": [],
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"admin_state_up": true,
"name": "NewPool",
"members": [],
"id": "a224402b-794b-4c0c-9d08-d95640a6f5a1",
"vip_id": null
}
"pool":{
"status":"PENDING_CREATE",
"lb_method":"SOURCE_IP",
"protocol":"HTTP",
"description":"",
"health_monitors":[
],
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"admin_state_up":true,
"name":"mypool",
"health_monitors_status":[
],
"members":[
],
"provider":"haproxy",
"status_description":null,
"id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"vip_id":null
}
}

47
v2.0/samples/loadbalancer/pools-list-res.json
View File

@ -1,24 +1,27 @@
{
"pools": [
{
"status": "ACTIVE",
"lb_method": "ROUND_ROBIN",
"protocol": "HTTP",
"description": "",
"health_monitors": [
"466c8345-28d8-4f84-a246-e04380b0461d",
"5d4b5228-33b0-4e60-b225-9b727c1a20e7"
],
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"admin_state_up": true,
"name": "app_pool",
"members": [
"701b531b-111a-4f21-ad85-4795b7b12af6",
"beb53b4d-230b-4abd-8118-575b8fa006ef"
],
"id": "72741b06-df4d-4715-b142-276b6bce75ab",
"vip_id": "4ec89087-d057-4e2c-911f-60a3b47ee304"
}
]
"pools":[
{
"status":"PENDING_CREATE",
"lb_method":"SOURCE_IP",
"protocol":"HTTP",
"description":"",
"health_monitors":[
],
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"admin_state_up":true,
"name":"mypool",
"health_monitors_status":[
],
"members":[
],
"provider":"haproxy",
"status_description":null,
"id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"vip_id":null
}
]
}

43
v2.0/samples/loadbalancer/pools-show-res.json
View File

@ -1,22 +1,25 @@
{
"pool": {
"status": "ACTIVE",
"lb_method": "ROUND_ROBIN",
"protocol": "HTTP",
"description": "",
"health_monitors": [
"466c8345-28d8-4f84-a246-e04380b0461d",
"5d4b5228-33b0-4e60-b225-9b727c1a20e7"
],
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"admin_state_up": true,
"name": "app_pool",
"members": [
"701b531b-111a-4f21-ad85-4795b7b12af6",
"beb53b4d-230b-4abd-8118-575b8fa006ef"
],
"id": "72741b06-df4d-4715-b142-276b6bce75ab",
"vip_id": "4ec89087-d057-4e2c-911f-60a3b47ee304"
}
"pool":{
"status":"PENDING_CREATE",
"lb_method":"SOURCE_IP",
"protocol":"HTTP",
"description":"",
"health_monitors":[
],
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"admin_state_up":true,
"name":"mypool",
"health_monitors_status":[
],
"members":[
],
"provider":"haproxy",
"status_description":null,
"id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"vip_id":null
}
}

6
v2.0/samples/loadbalancer/pools-update-req.json
View File

@ -1,5 +1,5 @@
{
"pool": {
"name": "SuperPool"
}
"pool":{
"name":"SuperPool"
}
}

37
v2.0/samples/loadbalancer/pools-update-res.json
View File

@ -1,16 +1,25 @@
{
"pool": {
"status": "PENDING_UPDATE",
"lb_method": "ROUND_ROBIN",
"protocol": "TCP",
"description": "",
"health_monitors": [],
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"admin_state_up": true,
"name": "SuperPool",
"members": [],
"id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
"vip_id": null
}
"pool":{
"status":"PENDING_UPDATE",
"lb_method":"SOURCE_IP",
"protocol":"HTTP",
"description":"",
"health_monitors":[
],
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"admin_state_up":true,
"name":"SuperPool",
"health_monitors_status":[
],
"members":[
],
"provider":"haproxy",
"status_description":null,
"id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"vip_id":null
}
}

16
v2.0/samples/loadbalancer/vips-create-req.json
View File

@ -1,10 +1,10 @@
{
"vip": {
"protocol": "HTTP",
"name": "NewVip",
"admin_state_up": true,
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
"protocol_port": "80"
}
"vip":{
"protocol":"HTTP",
"name":"myvip",
"admin_state_up":true,
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"protocol_port":"80"
}
}

31
v2.0/samples/loadbalancer/vips-create-res.json
View File

@ -1,17 +1,18 @@
{
"vip": {
"status": "PENDING_CREATE",
"protocol": "HTTP",
"description": "",
"admin_state_up": true,
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"connection_limit": -1,
"pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
"address": "10.0.0.11",
"protocol_port": 80,
"port_id": "f7e6fe6a-b8b5-43a8-8215-73456b32e0f5",
"id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
"name": "NewVip"
}
"vip":{
"status":"PENDING_CREATE",
"status_description":null,
"protocol":"HTTP",
"description":"",
"admin_state_up":true,
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"connection_limit":-1,
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"192.0.0.3",
"protocol_port":80,
"port_id":"36242e87-0bae-49d7-bc59-a0867476c69a",
"id":"a54bc6e7-2e28-4c55-a676-6146a4c0f8b9",
"name":"myvip"
}
}

39
v2.0/samples/loadbalancer/vips-list-res.json
View File

@ -1,23 +1,20 @@
{
"vips": [
{
"status": "ACTIVE",
"protocol": "HTTP",
"description": "",
"admin_state_up": true,
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"connection_limit": 1000,
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"session_persistence": {
"cookie_name": "MyAppCookie",
"type": "APP_COOKIE"
},
"address": "10.0.0.10",
"protocol_port": 80,
"port_id": "b5a743d6-056b-468b-862d-fb13a9aa694e",
"id": "4ec89087-d057-4e2c-911f-60a3b47ee304",
"name": "my-vip"
}
]
"vips":[
{
"status":"ACTIVE",
"status_description":null,
"protocol":"HTTP",
"description":"",
"admin_state_up":true,
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"connection_limit":-1,
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"192.0.0.3",
"protocol_port":80,
"port_id":"36242e87-0bae-49d7-bc59-a0867476c69a",
"id":"a54bc6e7-2e28-4c55-a676-6146a4c0f8b9",
"name":"myvip"
}
]
}

35
v2.0/samples/loadbalancer/vips-show-res.json
View File

@ -1,21 +1,18 @@
{
"vip": {
"status": "ACTIVE",
"protocol": "HTTP",
"description": "",
"admin_state_up": true,
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"connection_limit": 1000,
"pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
"session_persistence": {
"cookie_name": "MyAppCookie",
"type": "APP_COOKIE"
},
"address": "10.0.0.10",
"protocol_port": 80,
"port_id": "b5a743d6-056b-468b-862d-fb13a9aa694e",
"id": "4ec89087-d057-4e2c-911f-60a3b47ee304",
"name": "my-vip"
}
"vip":{
"status":"ACTIVE",
"status_description":null,
"protocol":"HTTP",
"description":"",
"admin_state_up":true,
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"connection_limit":-1,
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"192.0.0.3",
"protocol_port":80,
"port_id":"36242e87-0bae-49d7-bc59-a0867476c69a",
"id":"a54bc6e7-2e28-4c55-a676-6146a4c0f8b9",
"name":"myvip"
}
}

6
v2.0/samples/loadbalancer/vips-update-req.json
View File

@ -1,5 +1,5 @@
{
"vip": {
"connection_limit": "1000"
}
"vip":{
"connection_limit":"1000"
}
}

31
v2.0/samples/loadbalancer/vips-update-res.json
View File

@ -1,17 +1,18 @@
{
"vip": {
"status": "PENDING_UPDATE",
"protocol": "HTTP",
"description": "",
"admin_state_up": true,
"subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
"tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
"connection_limit": 1000,
"pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
"address": "10.0.0.11",
"protocol_port": 80,
"port_id": "f7e6fe6a-b8b5-43a8-8215-73456b32e0f5",
"id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
"name": "NewVip"
}
"vip":{
"status":"PENDING_UPDATE",
"status_description":null,
"protocol":"HTTP",
"description":"",
"admin_state_up":true,
"subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
"tenant_id":"4fd44f30292945e481c7b8a0c8908869",
"connection_limit":1000,
"pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
"address":"192.0.0.3",
"protocol_port":80,
"port_id":"36242e87-0bae-49d7-bc59-a0867476c69a",
"id":"a54bc6e7-2e28-4c55-a676-6146a4c0f8b9",
"name":"myvip"
}
}

1921
v2.0/section_neutron-loadbalancer-ext.xml
View File

File diff suppressed because it is too large Load Diff