You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Adrian Cole <no...@github.com> on 2014/11/05 07:27:44 UTC
[jclouds-labs-google] standardize listPage across all GCE resources.
(#81)
Also cleaned up a couple json things.
You can merge this Pull Request by running:
git pull https://github.com/adriancole/jclouds-labs-google adrian.list-page
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds-labs-google/pull/81
-- Commit Summary --
* standardize listPage across all GCE resources.
-- File Changes --
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java (49)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinder.java (65)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java (9)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java (9)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolMapofListofMapGenericBinder.java (63)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java (12)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java (19)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java (10)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroup.java (22)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/AddressApi.java (82)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java (131)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskTypeApi.java (111)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java (76)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApi.java (95)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/GlobalOperationApi.java (60)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApi.java (92)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java (87)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java (13)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java (45)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java (58)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java (22)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionApi.java (44)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RegionOperationApi.java (70)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/RouteApi.java (111)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/SnapshotApi.java (56)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/TargetPoolApi.java (107)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java (44)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneOperationApi.java (67)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseAddresses.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseDiskTypes.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseDisks.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseFirewalls.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseForwardingRules.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseGlobalOperations.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseHttpHealthChecks.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseImages.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseMachineTypes.java (5)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseNetworks.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseRegionOperations.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseRegions.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseRoutes.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseSnapshots.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseTargetPools.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseZoneOperations.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseZones.java (2)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/AttachDiskOptions.java (50)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/DiskCreationOptions.java (22)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java (7)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/RegionOperationDonePredicate.java (13)
M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/ZoneOperationDonePredicate.java (2)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java (16)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinderTest.java (19)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java (12)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinderTest.java (12)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/TargetPoolAddInstanceBinderTest.java (15)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/TargetPoolCreationBinderTest.java (12)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java (9)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/NetworkToSecurityGroupTest.java (4)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiExpectTest.java (30)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/AddressApiLiveTest.java (14)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java (46)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java (26)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskTypeApiExpectTest.java (29)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskTypeApiLiveTest.java (9)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java (5)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ForwardingRuleApiLiveTest.java (14)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiExpectTest.java (8)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/GlobalOperationApiLiveTest.java (6)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/HttpHealthCheckApiLiveTest.java (5)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java (4)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java (15)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java (39)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java (20)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java (9)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java (8)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionApiLiveTest.java (4)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiExpectTest.java (36)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/RegionOperationApiLiveTest.java (10)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/SnapshotApiLiveTest.java (18)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiExpectTest.java (3)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/TargetPoolApiLiveTest.java (18)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiLiveTest.java (5)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiExpectTest.java (39)
M google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneOperationApiLiveTest.java (10)
-- Patch Links --
https://github.com/jclouds/jclouds-labs-google/pull/81.patch
https://github.com/jclouds/jclouds-labs-google/pull/81.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
>
> @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
> DiskCreationOptions options = (DiskCreationOptions) postParams.get("options");
> - String name = postParams.get("name").toString();
> - int sizeGb = (Integer) postParams.get("sizeGb");
> - DiskCreationBinderHelper diskCreationOptionsExtended = new DiskCreationBinderHelper(name, sizeGb, options);
> - return super.bindToRequest(request, diskCreationOptionsExtended);
> + Writer out = new StringWriter();
@zack-shoylev @jdaggett @everett-toews just in case you need to do something like this some day..
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81/files#r19857083
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-google-pull-requests #228](https://jclouds.ci.cloudbees.com/job/jclouds-labs-google-pull-requests/228/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61765465
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
tests are back to normalish (still need investigation as some are simple resource names not conforming to GCE naming constraints)
```
Failed tests:
AddressApiLiveTest.testInsertAddress:42->BaseGoogleComputeEngineApiLiveTest.assertRegionOperationDoneSucessfully:99->BaseGoogleComputeEngineApiLiveTest.waitOperationDone:157 » HttpResponse
InstanceApiLiveTest.testDeleteInstance:214->BaseGoogleComputeEngineApiLiveTest.assertZoneOperationDoneSuccessfully:106 » NullPointer
GoogleComputeEngineServiceLiveTest>BaseComputeServiceLiveTest.testCreateAndRunAService:706->BaseComputeServiceLiveTest.createAndRunAServiceInGroup:723 » RunNodes
ForwardingRuleApiLiveTest.init:65->BaseGoogleComputeEngineApiLiveTest.assertRegionOperationDoneSucessfully:99->BaseGoogleComputeEngineApiLiveTest.waitOperationDone:157 » HttpResponse
GoogleComputeEngineServiceLiveTest>BaseComputeServiceLiveTest.testAScriptExecutionAfterBootWithBasicTemplate:223 » RunNodes
GoogleComputeEngineServiceLiveTest>BaseComputeServiceLiveTest.testConcurrentUseOfComputeServiceToCreateNodes:475 » Execution
Tests run: 140, Failures: 6, Errors: 0, Skipped: 91
```
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61865680
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-google-pull-requests #232](https://jclouds.ci.cloudbees.com/job/jclouds-labs-google-pull-requests/232/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61843009
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
@nacx @andreaturli @danbroudy
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61765308
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
merged
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61866266
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
Closed #81.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#event-188884845
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs-google #1640](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-google/1640/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61843658
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs-google #1635](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-google/1635/) FAILURE
Looks like there's a problem with this pull request
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61765504
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Adrian Cole <no...@github.com>.
couple live test quirks. after I fix that, will merge
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61834396
Re: [jclouds-labs-google] standardize listPage across all GCE
resources. (#81)
Posted by Ignasi Barrera <no...@github.com>.
Nice cleanup. lgtm!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-google/pull/81#issuecomment-61784029