Skip to content

Commit 6b918de

Browse files
author
synapticloop
committed
added back in tests
1 parent c06dd13 commit 6b918de

File tree

1 file changed

+111
-104
lines changed

1 file changed

+111
-104
lines changed

‎src/test/java/synapticloop/scaleway/api/ServerTest.java

+111-104
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,56 @@
22

33
import static org.junit.Assert.*;
44

5+
import java.util.Iterator;
56
import java.util.List;
7+
import java.util.Map;
68

79
import org.junit.Test;
810
import org.slf4j.Logger;
911
import org.slf4j.LoggerFactory;
1012

1113
import synapticloop.scaleway.api.exception.ScalewayApiException;
1214
import synapticloop.scaleway.api.model.Server;
15+
import synapticloop.scaleway.api.model.ServerAction;
16+
import synapticloop.scaleway.api.model.ServerTask;
17+
import synapticloop.scaleway.api.model.ServerTaskStatus;
18+
import synapticloop.scaleway.api.model.ServerType;
19+
import synapticloop.scaleway.api.model.Volume;
1320
import synapticloop.scaleway.api.response.ServersResponse;
1421

1522
public class ServerTest extends BaseTestUtils {
1623
private static final Logger LOGGER = LoggerFactory.getLogger(ServerTest.class);
1724

18-
// @Test
19-
// public void testCreateAndDeleteServer() throws ScalewayApiException {
20-
// String organizationId = getOrganizationId();
21-
//
22-
// Server server = scalewayApiClient.createServer("scaleway-java-api-test-server", getUbuntuImage(), organizationId, ServerType.VC1S, new String[] {"scaleway", "java", "api", "server"});
23-
//
24-
// Server returnedServer = scalewayApiClient.getServer(server.getId());
25-
// assertEquals(server.getArch(), returnedServer.getArch());
26-
// assertEquals(server.getCreationDate(), returnedServer.getCreationDate());
27-
// assertEquals(server.getHostname(), returnedServer.getHostname());
28-
// assertEquals(server.getId(), returnedServer.getId());
29-
// assertEquals(server.getIPv6(), returnedServer.getIPv6());
30-
// assertEquals(server.getModificationDate(), returnedServer.getModificationDate());
31-
// assertEquals(server.getName(), returnedServer.getName());
32-
// assertEquals(server.getOrganizationId(), returnedServer.getOrganizationId());
33-
// assertEquals(server.getPrivateIp(), returnedServer.getPrivateIp());
34-
// assertEquals(server.getPublicIP(), returnedServer.getPublicIP());
35-
// assertEquals(server.getStateDetail(), returnedServer.getStateDetail());
36-
//
37-
// scalewayApiClient.deleteServer(server.getId());
38-
//
39-
// Map<String, Volume> volumes = server.getVolumes();
40-
// Iterator<String> iterator = volumes.keySet().iterator();
41-
// while (iterator.hasNext()) {
42-
// String key = (String) iterator.next();
43-
// Volume volume = volumes.get(key);
44-
// scalewayApiClient.deleteVolume(volume.getId());
45-
// }
46-
//
47-
// }
25+
@Test
26+
public void testCreateAndDeleteServer() throws ScalewayApiException {
27+
String organizationId = getOrganizationId();
28+
29+
Server server = scalewayApiClient.createServer("scaleway-java-api-test-server", getUbuntuImage(), organizationId, ServerType.VC1S, new String[] {"scaleway", "java", "api", "server"});
30+
31+
Server returnedServer = scalewayApiClient.getServer(server.getId());
32+
assertEquals(server.getArch(), returnedServer.getArch());
33+
assertEquals(server.getCreationDate(), returnedServer.getCreationDate());
34+
assertEquals(server.getHostname(), returnedServer.getHostname());
35+
assertEquals(server.getId(), returnedServer.getId());
36+
assertEquals(server.getIPv6(), returnedServer.getIPv6());
37+
assertEquals(server.getModificationDate(), returnedServer.getModificationDate());
38+
assertEquals(server.getName(), returnedServer.getName());
39+
assertEquals(server.getOrganizationId(), returnedServer.getOrganizationId());
40+
assertEquals(server.getPrivateIp(), returnedServer.getPrivateIp());
41+
assertEquals(server.getPublicIP(), returnedServer.getPublicIP());
42+
assertEquals(server.getStateDetail(), returnedServer.getStateDetail());
43+
44+
scalewayApiClient.deleteServer(server.getId());
45+
46+
Map<String, Volume> volumes = server.getVolumes();
47+
Iterator<String> iterator = volumes.keySet().iterator();
48+
while (iterator.hasNext()) {
49+
String key = (String) iterator.next();
50+
Volume volume = volumes.get(key);
51+
scalewayApiClient.deleteVolume(volume.getId());
52+
}
53+
54+
}
4855

4956
@Test
5057
public void testGetAllServers() throws ScalewayApiException {
@@ -64,78 +71,78 @@ public void testGetAllServers() throws ScalewayApiException {
6471
}
6572
}
6673

67-
// @Test
68-
// public void testGetServerActions() throws ScalewayApiException {
69-
// String organizationId = getOrganizationId();
70-
// Server server = scalewayApiClient.createServer("scaleway-java-api-test-server", getUbuntuImage(), organizationId, ServerType.VC1S, new String[] {"scaleway", "java", "api", "server"});
71-
//
72-
// List<ServerAction> serverActions = scalewayApiClient.getServerActions(server.getId());
73-
// assertNotNull(serverActions);
74-
// assertTrue(serverActions.size() >= 1);
75-
//
76-
// scalewayApiClient.deleteServer(server.getId());
77-
//
78-
// Map<String, Volume> volumes = server.getVolumes();
79-
// Iterator<String> iterator = volumes.keySet().iterator();
80-
// while (iterator.hasNext()) {
81-
// String key = (String) iterator.next();
82-
// Volume volume = volumes.get(key);
83-
// scalewayApiClient.deleteVolume(volume.getId());
84-
// }
85-
// }
86-
87-
// @Test
88-
// public void testPowerCycleServer() throws ScalewayApiException {
89-
// String organizationId = scalewayApiClient.getAllOrganizations().get(0).getId();
90-
// Server server = scalewayApiClient.createServer("scaleway-java-api-test-server",
91-
// getUbuntuImage(),
92-
// organizationId,
93-
// ServerType.VC1S,
94-
// new String[] {"scaleway", "java", "api", "server"});
95-
//
96-
// ServerTask powerOnServerTask = scalewayApiClient.executeServerAction(server.getId(), ServerAction.POWERON);
97-
//
98-
// boolean isStarted = false;
99-
// while(!isStarted) {
100-
// ServerTask taskStatus = scalewayApiClient.getTaskStatus(powerOnServerTask.getId());
101-
// LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')",
102-
// taskStatus.getId(),
103-
// taskStatus.getStatus(),
104-
// taskStatus.getProgress());
105-
// try {
106-
// Thread.sleep(10000);
107-
// } catch (InterruptedException ex) {
108-
// LOGGER.warn("The sleeping thread was interrupted, continuing...");
109-
// }
110-
// if(taskStatus.getStatus() == ServerTaskStatus.SUCCESS) {
111-
// isStarted = true;
112-
// }
113-
// }
114-
//
115-
// ServerTask powerOffServerTask = scalewayApiClient.executeServerAction(server.getId(), ServerAction.POWEROFF);
116-
// boolean isEnded = false;
117-
// while(!isEnded) {
118-
// ServerTask taskStatus = scalewayApiClient.getTaskStatus(powerOffServerTask.getId());
119-
// LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')", taskStatus.getId(), taskStatus.getStatus(), taskStatus.getProgress());
120-
// try {
121-
// Thread.sleep(10000);
122-
// } catch (InterruptedException ex) {
123-
// LOGGER.warn("The sleeping thread was interrupted, continuing...");
124-
// }
125-
//
126-
// if(taskStatus.getStatus() == ServerTaskStatus.SUCCESS) {
127-
// isEnded = true;
128-
// }
129-
// }
130-
//
131-
// scalewayApiClient.deleteServer(server.getId());
132-
//
133-
// Map<String, Volume> volumes = server.getVolumes();
134-
// Iterator<String> iterator = volumes.keySet().iterator();
135-
// while (iterator.hasNext()) {
136-
// String key = (String) iterator.next();
137-
// Volume volume = volumes.get(key);
138-
// scalewayApiClient.deleteVolume(volume.getId());
139-
// }
140-
// }
74+
@Test
75+
public void testGetServerActions() throws ScalewayApiException {
76+
String organizationId = getOrganizationId();
77+
Server server = scalewayApiClient.createServer("scaleway-java-api-test-server", getUbuntuImage(), organizationId, ServerType.VC1S, new String[] {"scaleway", "java", "api", "server"});
78+
79+
List<ServerAction> serverActions = scalewayApiClient.getServerActions(server.getId());
80+
assertNotNull(serverActions);
81+
assertTrue(serverActions.size() >= 1);
82+
83+
scalewayApiClient.deleteServer(server.getId());
84+
85+
Map<String, Volume> volumes = server.getVolumes();
86+
Iterator<String> iterator = volumes.keySet().iterator();
87+
while (iterator.hasNext()) {
88+
String key = (String) iterator.next();
89+
Volume volume = volumes.get(key);
90+
scalewayApiClient.deleteVolume(volume.getId());
91+
}
92+
}
93+
94+
@Test
95+
public void testPowerCycleServer() throws ScalewayApiException {
96+
String organizationId = scalewayApiClient.getAllOrganizations().get(0).getId();
97+
Server server = scalewayApiClient.createServer("scaleway-java-api-test-server",
98+
getUbuntuImage(),
99+
organizationId,
100+
ServerType.VC1S,
101+
new String[] {"scaleway", "java", "api", "server"});
102+
103+
ServerTask powerOnServerTask = scalewayApiClient.executeServerAction(server.getId(), ServerAction.POWERON);
104+
105+
boolean isStarted = false;
106+
while(!isStarted) {
107+
ServerTask taskStatus = scalewayApiClient.getTaskStatus(powerOnServerTask.getId());
108+
LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')",
109+
taskStatus.getId(),
110+
taskStatus.getStatus(),
111+
taskStatus.getProgress());
112+
try {
113+
Thread.sleep(10000);
114+
} catch (InterruptedException ex) {
115+
LOGGER.warn("The sleeping thread was interrupted, continuing...");
116+
}
117+
if(taskStatus.getStatus() == ServerTaskStatus.SUCCESS) {
118+
isStarted = true;
119+
}
120+
}
121+
122+
ServerTask powerOffServerTask = scalewayApiClient.executeServerAction(server.getId(), ServerAction.POWEROFF);
123+
boolean isEnded = false;
124+
while(!isEnded) {
125+
ServerTask taskStatus = scalewayApiClient.getTaskStatus(powerOffServerTask.getId());
126+
LOGGER.debug("Server task with id '{}' is in current state '{}' (progress '{}')", taskStatus.getId(), taskStatus.getStatus(), taskStatus.getProgress());
127+
try {
128+
Thread.sleep(10000);
129+
} catch (InterruptedException ex) {
130+
LOGGER.warn("The sleeping thread was interrupted, continuing...");
131+
}
132+
133+
if(taskStatus.getStatus() == ServerTaskStatus.SUCCESS) {
134+
isEnded = true;
135+
}
136+
}
137+
138+
scalewayApiClient.deleteServer(server.getId());
139+
140+
Map<String, Volume> volumes = server.getVolumes();
141+
Iterator<String> iterator = volumes.keySet().iterator();
142+
while (iterator.hasNext()) {
143+
String key = (String) iterator.next();
144+
Volume volume = volumes.get(key);
145+
scalewayApiClient.deleteVolume(volume.getId());
146+
}
147+
}
141148
}

0 commit comments

Comments
 (0)