Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gogid auth fix

This commit is contained in:
Adrian Cole 2011-12-22 04:16:41 -08:00
parent aef44b26b9
commit 8369ffae35
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
providers/gogrid/src/main/java/org/jclouds/gogrid/compute/functions/ServerImageToImage.java
View File

@ -32,7 +32,6 @@ import org.jclouds.compute.domain.ImageBuilder;
import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.compute.util.ComputeServiceUtils; import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.gogrid.domain.ServerImage; import org.jclouds.gogrid.domain.ServerImage;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
@ -55,8 +54,7 @@ public class ServerImageToImage implements Function<ServerImage, Image> {
private final Map<OsFamily, Map<String, String>> osVersionMap; private final Map<OsFamily, Map<String, String>> osVersionMap;
@Inject @Inject
ServerImageToImage(PopulateDefaultLoginCredentialsForImageStrategy authenticator, ServerImageToImage(Map<OsFamily, Map<String, String>> osVersionMap) {
Map<OsFamily, Map<String, String>> osVersionMap) {
this.osVersionMap = osVersionMap; this.osVersionMap = osVersionMap;
} }

2
providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
View File

@ -110,7 +110,7 @@ public class GoGridComputeServiceAdapter implements ComputeServiceAdapter<Server
} }
LoginCredentials credentials = LoginCredentials.fromCredentials(client.getServerServices() LoginCredentials credentials = LoginCredentials.fromCredentials(client.getServerServices()
.getServerCredentialsList().get(addedServer.getName())); .getServerCredentialsList().get(addedServer.getName()));
return new NodeAndInitialCredentials<Server>(addedServer, addedServer.getName() + "", credentials); return new NodeAndInitialCredentials<Server>(addedServer, addedServer.getId() + "", credentials);
} }
private Server addServer(String name, Template template, Ip availableIp) { private Server addServer(String name, Template template, Ip availableIp) {