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

JCLOUDS-426. Update Elasticstack vnc password key

This commit is contained in:
Audrius Butkevicius 2014-01-16 23:28:23 +00:00 committed by Ignasi Barrera
parent 1ebfc7d43a
commit ffb4df41eb
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java
View File

@ -81,7 +81,7 @@ public class MapToServerInfo implements Function<Map<String, String>, ServerInfo
builder.bootDeviceIds(Splitter.on(' ').split(from.get("boot"))); builder.bootDeviceIds(Splitter.on(' ').split(from.get("boot")));
builder.vnc(new VNC(from.get("vnc:ip") == null ? "auto" : from.get("vnc:ip"), from.get("vnc:password"), from.containsKey("vnc:tls") builder.vnc(new VNC(from.get("vnc:ip") == null ? "auto" : from.get("vnc:ip"), from.get("password"), from.containsKey("vnc:tls")
&& Boolean.valueOf(from.get("vnc:tls")))); && Boolean.valueOf(from.get("vnc:tls"))));

2
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/ServerToMap.java
View File

@ -89,7 +89,7 @@ public class ServerToMap implements Function<Server, Map<String, String>> {
} }
if (from.getVnc().getPassword() != null) if (from.getVnc().getPassword() != null)
builder.put("vnc:password", from.getVnc().getPassword()); builder.put("password", from.getVnc().getPassword());
if (from.getVnc().isTls()) if (from.getVnc().isTls())
builder.put("vnc:tls", "on"); builder.put("vnc:tls", "on");
if (from.getTags().size() != 0) if (from.getTags().size() != 0)

6
apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/ServerToMapTest.java
View File

@ -58,7 +58,7 @@ public class ServerToMapTest {
"08c92dd5-70a0-4f51-83d2-835919d254df")) "08c92dd5-70a0-4f51-83d2-835919d254df"))
.putAll( .putAll(
ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc:ip", "auto", ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc:ip", "auto",
"vnc:password", "XXXXXXXX")).build()); "password", "XXXXXXXX")).build());
} }
public void testWeDontSetMac() { public void testWeDontSetMac() {
@ -82,7 +82,7 @@ public class ServerToMapTest {
"08c92dd5-70a0-4f51-83d2-835919d254df")) "08c92dd5-70a0-4f51-83d2-835919d254df"))
.putAll( .putAll(
ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc:ip", "auto", ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc:ip", "auto",
"vnc:password", "XXXXXXXX")).build()); "password", "XXXXXXXX")).build());
} }
public void testBasicsV2() { public void testBasicsV2() {
@ -105,7 +105,7 @@ public class ServerToMapTest {
"08c92dd5-70a0-4f51-83d2-835919d254df")) "08c92dd5-70a0-4f51-83d2-835919d254df"))
.putAll( .putAll(
ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc", "auto", ImmutableMap.of("ide:0:0:media", "disk", "nic:0:model", "e1000", "vnc", "auto",
"vnc:password", "XXXXXXXX")).build()); "password", "XXXXXXXX")).build());
} }
} }

2
apis/elasticstack/src/test/resources/create_server.txt
View File

@ -8,4 +8,4 @@ ide:0:0 08c92dd5-70a0-4f51-83d2-835919d254df
ide:0:0:media disk ide:0:0:media disk
nic:0:model e1000 nic:0:model e1000
vnc:ip auto vnc:ip auto
vnc:password XXXXXXXX password XXXXXXXX

2
apis/elasticstack/src/test/resources/new_server.txt
View File

@ -1,6 +1,6 @@
ide:0:0:write:requests 0 ide:0:0:write:requests 0
boot ide:0:0 boot ide:0:0
vnc:password XXXXXXXX password XXXXXXXX
ide:0:0 403c9a86-0aab-4e47-aa95-e9768021c4c1 ide:0:0 403c9a86-0aab-4e47-aa95-e9768021c4c1
ide:0:0:read:requests 0 ide:0:0:read:requests 0
ide:0:0:read:bytes 0 ide:0:0:read:bytes 0

2
apis/elasticstack/src/test/resources/new_server2.txt
View File

@ -1,6 +1,6 @@
ide:0:0:write:requests 0 ide:0:0:write:requests 0
boot ide:0:0 boot ide:0:0
vnc:password XXXXXXXX password XXXXXXXX
ide:0:0 403c9a86-0aab-4e47-aa95-e9768021c4c1 ide:0:0 403c9a86-0aab-4e47-aa95-e9768021c4c1
ide:0:0:read:requests 0 ide:0:0:read:requests 0
ide:0:0:read:bytes 0 ide:0:0:read:bytes 0

4
apis/elasticstack/src/test/resources/server2.txt
View File

@ -1,6 +1,6 @@
ide:0:0:write:requests 3698 ide:0:0:write:requests 3698
boot ide:0:0 boot ide:0:0
vnc:password HfHzVmLT password HfHzVmLT
ide:0:0 4af85ed3-0caa-4736-8a26-a33d7de0a122 ide:0:0 4af85ed3-0caa-4736-8a26-a33d7de0a122
ide:0:0:read:requests 11154 ide:0:0:read:requests 11154
ide:0:0:read:bytes 45686784 ide:0:0:read:bytes 45686784
@ -28,7 +28,7 @@ status stopped
name Demo name Demo
mem 1024 mem 1024
boot ide:0:0 boot ide:0:0
vnc:password HWbjvrg2 password HWbjvrg2
persistent true persistent true
server 0f962616-2071-4173-be79-7dd084271edf server 0f962616-2071-4173-be79-7dd084271edf
smp auto smp auto

4
apis/elasticstack/src/test/resources/servers.txt
View File

@ -1,6 +1,6 @@
ide:0:0:write:requests 3698 ide:0:0:write:requests 3698
boot ide:0:0 boot ide:0:0
vnc:password HfHzVmLT password HfHzVmLT
ide:0:0 4af85ed3-0caa-4736-8a26-a33d7de0a122 ide:0:0 4af85ed3-0caa-4736-8a26-a33d7de0a122
ide:0:0:read:requests 11154 ide:0:0:read:requests 11154
ide:0:0:read:bytes 45686784 ide:0:0:read:bytes 45686784
@ -27,7 +27,7 @@ status stopped
name Demo name Demo
mem 1024 mem 1024
boot ide:0:0 boot ide:0:0
vnc:password HWbjvrg2 password HWbjvrg2
persistent true persistent true
server 0f962616-2071-4173-be79-7dd084271edf server 0f962616-2071-4173-be79-7dd084271edf
smp auto smp auto