You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Andrea Turli <no...@github.com> on 2014/07/02 22:29:06 UTC
[jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
It modernizes SoftLayer CCI support by re-using the same API calls used by SoftLayer Python client.
The implementation should be not more easily maintainable and robust.
You can merge this Pull Request by running:
git pull https://github.com/andreaturli/jclouds new/softlayer-cci
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/431
-- Commit Summary --
* [JCLOUDS-474] refactor SoftLayer support
-- File Changes --
M providers/softlayer/pom.xml (15)
M providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApi.java (29)
M providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java (27)
M providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java (46)
D providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java (131)
A providers/softlayer/src/main/java/org/jclouds/softlayer/binders/TagToJson.java (60)
A providers/softlayer/src/main/java/org/jclouds/softlayer/binders/VirtualGuestToJson.java (201)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java (87)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java (10)
A providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java (92)
D providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemToImage.java (184)
D providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java (90)
D providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java (122)
A providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardware.java (65)
A providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImage.java (68)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java (118)
A providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/internal/OperatingSystems.java (91)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java (87)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/strategy/SoftLayerComputeServiceAdapter.java (484)
M providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerHttpApiModule.java (4)
M providers/softlayer/src/main/java/org/jclouds/softlayer/config/SoftLayerParserModule.java (4)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java (190)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java (270)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java (109)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java (37)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java (116)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java (15)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java (2)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java (250)
D providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemCategory.java (153)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java (248)
D providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java (223)
D providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrderReceipt.java (135)
D providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java (207)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java (9)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java (301)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java (130)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java (140)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java (218)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java (104)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java (249)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java (126)
M providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java (225)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java (241)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java (202)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java (256)
A providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java (248)
M providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java (45)
M providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java (13)
R providers/softlayer/src/main/java/org/jclouds/softlayer/features/SoftwareDescriptionApi.java (28)
M providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java (135)
A providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApi.java (58)
M providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java (5)
D providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java (154)
M providers/softlayer/src/main/java/org/jclouds/softlayer/reference/SoftLayerConstants.java (37)
D providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerApiTest.java (53)
M providers/softlayer/src/test/java/org/jclouds/softlayer/SoftLayerProviderTest.java (3)
D providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java (92)
A providers/softlayer/src/test/java/org/jclouds/softlayer/binders/TagToJsonTest.java (51)
A providers/softlayer/src/test/java/org/jclouds/softlayer/binders/VirtualGuestToJsonTest.java (122)
M providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceAdapterLiveTest.java (50)
A providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java (107)
M providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java (15)
M providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java (98)
M providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/DatacenterToLocationTest.java (19)
A providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImageTest.java (57)
D providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java (262)
D providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java (141)
D providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java (155)
A providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToHardwareTest.java (61)
A providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToImageTest.java (119)
M providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java (229)
A providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/internal/OperatingSystemsTest.java (50)
M providers/softlayer/src/test/java/org/jclouds/softlayer/domain/AddressTest.java (3)
A providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiExpectTest.java (94)
M providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiLiveTest.java (50)
D providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiTest.java (53)
R providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerApiExpectTest.java (15)
M providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerApiLiveTest.java (1)
A providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiExpectTest.java (96)
M providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java (59)
D providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiTest.java (83)
D providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageApiLiveTest.java (216)
D providers/softlayer/src/test/java/org/jclouds/softlayer/features/ProductPackageApiTest.java (53)
A providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiExpectTest.java (58)
R providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiLiveTest.java (27)
M providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiExpectTest.java (262)
M providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java (220)
D providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiTest.java (173)
A providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApiExpectTest.java (62)
R providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestBlockDeviceTemplateGroupApiLiveTest.java (34)
R providers/softlayer/src/test/java/org/jclouds/softlayer/internal/BaseSoftLayerParseTest.java (18)
R providers/softlayer/src/test/java/org/jclouds/softlayer/parse/CreateVirtualGuestResponseTest.java (49)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetAllObjectsResponseTest.java (65)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetCreateObjectOptionsResponseTest.java (105)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetDatacenterResponseTest.java (65)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestBlockDeviceTemplateGroupsResponseTest.java (134)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/GetVirtualGuestResponseTest.java (68)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListDatacentersResponseTest.java (117)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListPublicImagesResponseTest.java (111)
A providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ListVirtualGuestsResponseTest.java (73)
D providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseProductOrderTest.java (101)
D providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestHaltedTest.java (69)
D providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java (69)
D providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestRunningTest.java (69)
D providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestWithNoPasswordTest.java (65)
D providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductItemPredicatesTest.java (101)
A providers/softlayer/src/test/resources/account_get_block_devices_template_groups.json (110)
A providers/softlayer/src/test/resources/account_list.json (24)
A providers/softlayer/src/test/resources/container_virtual_guest_configuration.json (93)
A providers/softlayer/src/test/resources/datacenter_get.json (30)
A providers/softlayer/src/test/resources/datacenter_list.json (72)
D providers/softlayer/src/test/resources/log4j.xml (151)
A providers/softlayer/src/test/resources/logback.xml (34)
D providers/softlayer/src/test/resources/product_order_template.json (1337)
A providers/softlayer/src/test/resources/software_description_list.json (21)
A providers/softlayer/src/test/resources/virtualGuestBlockDeviceTemplateGroup_public_images.json (98)
D providers/softlayer/src/test/resources/virtual_guest_bad_halted.json (4)
A providers/softlayer/src/test/resources/virtual_guest_create.json (1)
A providers/softlayer/src/test/resources/virtual_guest_create_response.json (19)
A providers/softlayer/src/test/resources/virtual_guest_get.json (22)
D providers/softlayer/src/test/resources/virtual_guest_good_halted.json (117)
D providers/softlayer/src/test/resources/virtual_guest_no_password.json (74)
D providers/softlayer/src/test/resources/virtual_guest_paused.json (117)
D providers/softlayer/src/test/resources/virtual_guest_running.json (117)
A providers/softlayer/src/test/resources/virtual_guest_set_tags.json (1)
A providers/softlayer/src/test/resources/virtual_guest_set_tags_response.json (1)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/431.patch
https://github.com/jclouds/jclouds/pull/431.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Phillips <no...@github.com>.
I can't get hold of the logs of the PR builds for this any more, but it looks like SoftLayer now has [quite a few Checkstyle violations](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/lastBuild/org.apache.jclouds.provider$softlayer/violations/). Could someone kindly have a look at those?
/cc @andreaturli @nacx
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49449498
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #958](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/958/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-47840675
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Ignasi Barrera <no...@github.com>.
Thanks @andreaturli!
I've reviewed and re-checked the comments in the previous pull request and changes lgtm.
Before merging, though, could you share the results of running the live tests?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49036407
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Ignasi Barrera <no...@github.com>.
Closed #431.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#event-142076728
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrea Turli <no...@github.com>.
Hi @andrewgaul I'm not able to do that just now as I don't have access to my laptop for next 2 weeks. Sorry about that.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49499874
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrea Turli <no...@github.com>.
Hi @andrewgaul I was looking now at the checkstyle violations but you already fix them: thanks!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-51002371
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Phillips <no...@github.com>.
> Any idea how we are allowing builds to succeed with so many Checkstyle violations?
The PR build is configured to "go stormy" as per 20 Checkstyle violations, but we're not currently setting it to go unstable, although we can obviously change that. How about 50?
I also try to look at the Checkstyle result before merging a PR - this is something we can do at present, although setting the build to go unstable would obviously make that clearer (especially if we manage to cut down on the spurious test failures ;-) )
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49507900
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Gaul <no...@github.com>.
@andreaturli Can you address the 70 or so Checkstyle violations that this pull request introduced?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49492141
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Phillips <no...@github.com>.
So you mean (looking at the above config) `1 1 1`?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49773443
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Gaul <no...@github.com>.
Honestly I would prefer to fail on any Checkstyle failures, and if some are too common or noisy, disable the unneeded checks. The intent of our use of Checkstyle is to reduce reviewer overhead while maintaining a coherent formatting; if a committer has to periodically fix up violations then we are just pushing the formatting responsibility around.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49676829
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by BuildHive <no...@github.com>.
[jclouds ยป jclouds #1318](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/1318/) 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/pull/431#issuecomment-47838844
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Ignasi Barrera <no...@github.com>.
Thanks!
Most of the 14 failures are for the same cause: the default templates, but that shouldn't make jclouds fail. IMHO that bsae test is too scrict and not flexible enough and we should consider deprecating it.
Regarding the other three, there is a NPE in there, so it's worth having a look. In any case, I think we'd better address that in a separate PR. If no one says the opposite I'll merge the PR later today.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49045028
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrea Turli <no...@github.com>.
@nacx please find the result of `mvn clean install -Plive` on that [gist](https://gist.github.com/andreaturli/ae37d84c446c5f0f182c)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49044336
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Ignasi Barrera <no...@github.com>.
Pushed to [master](https://git-wip-us.apache.org/repos/asf?p=jclouds.git;h=717a545). Thanks @andreaturli!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49140569
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #1429](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/1429/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-47841182
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Andrew Gaul <no...@github.com>.
@andreaturli Address Checkstyle violations in 0c005f80943b6ba785750c080a6e10934c1f563d.
@demobox Any idea how we are allowing builds to succeed with so many Checkstyle violations? Can we address this with additional Cloudbees configuration or git pre-push hooks?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49506042
Re: [jclouds] [JCLOUDS-474] refactor SoftLayer support (#431)
Posted by Ignasi Barrera <no...@github.com>.
Going unstable good be great. I merged this without having a detailed look to checkstyle. Thanks @andrewgaul!
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/431#issuecomment-49544686