JCLOUDS-106 adds proper detection/generation of SSH keypairs and security 
groups to CloudStack. JCLOUDS-105 has a slightly different implementation here 
than it does on 1.5.x and 1.6.x - here, it has to get the creds from the 
template options, not from the credential store, since we're tossing pretty 
much everything credential-store-y away in re: CloudStack keypairs.

I've run live tests, and, well, lots fail. But then, the exact same lots 
fail in 1.6.0, so there aren't any regressions I can see. I'll open a 
separate JIRA for fixing the CloudStack live tests - some of them, mind you, 
are failing because I'm running in a rather specific environment that 
doesn't have everything the tests want, i.e., only basic networking, no 
shared storage, etc.
You can merge this Pull Request by running:

  git pull https://github.com/abayer/jclouds-1 jclouds-106

Or you can view, comment on it, or merge it online at:

  https://github.com/jclouds/jclouds/pull/27

-- Commit Summary --

  * JCLOUDS-106. Add proper support for generation/detection of 
keypair/security groups to CloudStack.
  * JCLOUDS-105. Real fix for keypairs being ignored if VM says it's 
password-enabled.

-- File Changes --

    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java 
(2)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
 (185)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
 (48)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java
 (77)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
 (69)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
 (83)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
 (50)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java
 (56)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
 (73)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackProperties.java
 (5)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java 
(97)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
 (163)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java
 (12)
    M 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java
 (9)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
 (124)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
 (161)
    A 
apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SshKeyPairPredicates.java
 (78)
    M 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterExpectTest.java
 (242)
    A 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPairTest.java
 (73)
    A 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java
 (261)
    M 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java
 (44)
    M 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java
 (18)
    M 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java
 (4)
    A 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java
 (237)
    M 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackComputeServiceContextExpectTest.java
 (79)
    A 
apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
 (90)
    A 
apis/cloudstack/src/test/resources/authorizesecuritygroupingressresponse.json 
(2)
    A apis/cloudstack/src/test/resources/createsecuritygroupresponse.json (3)
    A apis/cloudstack/src/test/resources/createsshkeypairresponse-2.json (4)
    A apis/cloudstack/src/test/resources/getsecuritygroupresponse.json (1)
    A apis/cloudstack/src/test/resources/getzoneresponse-2.json (1)
    A apis/cloudstack/src/test/resources/listnetworksresponse-2.json (1)
    A 
apis/cloudstack/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
 (34)
    A 
apis/cloudstack/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
 (73)

-- Patch Links --

https://github.com/jclouds/jclouds/pull/27.patch
https://github.com/jclouds/jclouds/pull/27.diff

Reply via email to