Skip to content

Commit 9fb5485

Browse files
twoseattwoseat
committed
Merge branch '3.x'
2 parents 272094c + 6a8affd commit 9fb5485

3 files changed

Lines changed: 53 additions & 28 deletions

File tree

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/serviceinstances/ReactorServiceInstancesTest.java‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.cloudfoundry.reactor.client.v2.serviceinstances;
1818

19+
import org.cloudfoundry.client.v2.MaintenanceInfo;
1920
import org.cloudfoundry.client.v2.Metadata;
2021
import org.cloudfoundry.client.v2.jobs.JobEntity;
2122
import org.cloudfoundry.client.v2.routes.RouteEntity;
@@ -624,28 +625,36 @@ public void update() {
624625
.as(StepVerifier::create)
625626
.expectNext(UpdateServiceInstanceResponse.builder()
626627
.metadata(Metadata.builder()
627-
.createdAt("2015-07-27T22:43:08Z")
628-
.id("2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41")
629-
.url("/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41")
628+
.createdAt("2016-06-08T16:41:30Z")
629+
.id("a34f1423-4b84-4727-ab49-3f1522c4cb16")
630+
.updatedAt("2016-06-08T16:41:26Z")
631+
.url("/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16")
630632
.build())
631633
.entity(ServiceInstanceEntity.builder()
632-
.name("name-139")
633-
.credential("creds-key-75", "creds-val-75")
634-
.servicePlanId("b07ff29a-78b8-486f-87a8-3f695368b83d")
635-
.spaceId("04219ffa-a817-459f-bbd7-c161bdca541b")
634+
.name("name-1529")
635+
.credential("creds-key-41", "creds-val-41")
636+
.servicePlanId("4ec73bf4-9f3a-44c7-bbac-61ee9cb5a511")
637+
.spaceId("da37b4b7-2439-4b30-9eb3-bded0dbf690f")
636638
.type("managed_service_instance")
637639
.tags(Collections.emptyList())
638640
.lastOperation(LastOperation.builder()
639-
.createdAt("2015-07-27T22:43:08Z")
640-
.updatedAt("2015-07-27T22:43:08Z")
641+
.createdAt("2016-06-08T16:41:30Z")
642+
.updatedAt("2016-06-08T16:41:30Z")
641643
.description("")
642644
.state("in progress")
643645
.type("update")
644646
.build())
645-
.spaceUrl("/v2/spaces/04219ffa-a817-459f-bbd7-c161bdca541b")
646-
.servicePlanUrl("/v2/service_plans/b07ff29a-78b8-486f-87a8-3f695368b83d")
647-
.serviceBindingsUrl("/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41/service_bindings")
648-
.serviceKeysUrl("/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41/service_keys")
647+
.maintenanceInfo(MaintenanceInfo.builder()
648+
.description("OS image update.\nExpect downtime.")
649+
.version("2.1.0")
650+
.build())
651+
.routesUrl("/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/routes")
652+
.spaceUrl("/v2/spaces/da37b4b7-2439-4b30-9eb3-bded0dbf690f")
653+
.servicePlanUrl("/v2/service_plans/4ec73bf4-9f3a-44c7-bbac-61ee9cb5a511")
654+
.serviceBindingsUrl("/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/service_bindings")
655+
.serviceKeysUrl("/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/service_keys")
656+
.sharedFromUrl("/v2/service_instances/0d632575-bb06-4ea5-bb19-a451a9644d92/shared_from")
657+
.sharedToUrl("/v2/service_instances/0d632575-bb06-4ea5-bb19-a451a9644d92/shared_to")
649658
.build())
650659
.build())
651660
.expectComplete()

‎cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/service_instances/PUT_{id}_response.json‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
11
{
22
"metadata": {
3-
"guid": "2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41",
4-
"url": "/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41",
5-
"created_at": "2015-07-27T22:43:08Z",
6-
"updated_at": null
3+
"guid": "a34f1423-4b84-4727-ab49-3f1522c4cb16",
4+
"url": "/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16",
5+
"created_at": "2016-06-08T16:41:30Z",
6+
"updated_at": "2016-06-08T16:41:26Z"
77
},
88
"entity": {
9-
"name": "name-139",
9+
"name": "name-1529",
1010
"credentials": {
11-
"creds-key-75": "creds-val-75"
11+
"creds-key-41": "creds-val-41"
1212
},
13-
"service_plan_guid": "b07ff29a-78b8-486f-87a8-3f695368b83d",
14-
"space_guid": "04219ffa-a817-459f-bbd7-c161bdca541b",
13+
"service_plan_guid": "4ec73bf4-9f3a-44c7-bbac-61ee9cb5a511",
14+
"space_guid": "da37b4b7-2439-4b30-9eb3-bded0dbf690f",
1515
"gateway_data": null,
1616
"dashboard_url": null,
1717
"type": "managed_service_instance",
1818
"last_operation": {
1919
"type": "update",
2020
"state": "in progress",
2121
"description": "",
22-
"updated_at": "2015-07-27T22:43:08Z",
23-
"created_at": "2015-07-27T22:43:08Z"
22+
"updated_at": "2016-06-08T16:41:30Z",
23+
"created_at": "2016-06-08T16:41:30Z"
2424
},
2525
"tags": [
26+
2627
],
27-
"space_url": "/v2/spaces/04219ffa-a817-459f-bbd7-c161bdca541b",
28-
"service_plan_url": "/v2/service_plans/b07ff29a-78b8-486f-87a8-3f695368b83d",
29-
"service_bindings_url": "/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41/service_bindings",
30-
"service_keys_url": "/v2/service_instances/2a80a0f7-cb9c-414a-8a6b-7cc3f811ad41/service_keys"
28+
"maintenance_info": {
29+
"version": "2.1.0",
30+
"description": "OS image update.\nExpect downtime."
31+
},
32+
"space_url": "/v2/spaces/da37b4b7-2439-4b30-9eb3-bded0dbf690f",
33+
"service_plan_url": "/v2/service_plans/4ec73bf4-9f3a-44c7-bbac-61ee9cb5a511",
34+
"service_bindings_url": "/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/service_bindings",
35+
"service_keys_url": "/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/service_keys",
36+
"routes_url": "/v2/service_instances/a34f1423-4b84-4727-ab49-3f1522c4cb16/routes",
37+
"shared_from_url": "/v2/service_instances/0d632575-bb06-4ea5-bb19-a451a9644d92/shared_from",
38+
"shared_to_url": "/v2/service_instances/0d632575-bb06-4ea5-bb19-a451a9644d92/shared_to"
3139
}
32-
}
40+
}

‎cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_UpdateServiceInstanceRequest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.cloudfoundry.AllowNulls;
2424
import org.cloudfoundry.Nullable;
2525
import org.cloudfoundry.QueryParameter;
26+
import org.cloudfoundry.client.v2.MaintenanceInfo;
2627
import org.immutables.value.Value;
2728

2829
import java.util.List;
@@ -42,6 +43,13 @@ abstract class _UpdateServiceInstanceRequest {
4243
@QueryParameter("accepts_incomplete")
4344
abstract Boolean getAcceptsIncomplete();
4445

46+
/**
47+
* The maintenance info
48+
*/
49+
@JsonProperty("maintenance_info")
50+
@Nullable
51+
abstract MaintenanceInfo getMaintenanceInfo();
52+
4553
/**
4654
* The name
4755
*/

0 commit comments

Comments
 (0)