Skip to content

Commit e79e62f

Browse files
wooreawoorea
committed
bf
1 parent 2fa3118 commit e79e62f

36 files changed

+302
-81
lines changed

‎src/main/java/org/openstack/api/identity/admin/resources/UsersResource.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.openstack.api.common.Resource;
88
import org.openstack.model.identity.User;
9+
import org.openstack.model.identity.UserForCreate;
910
import org.openstack.model.identity.UserList;
1011
import org.openstack.model.identity.keystone.KeystoneUser;
1112
import org.openstack.model.identity.keystone.KeystoneUserList;
@@ -20,7 +21,7 @@ public UserList get() {
2021
return target.request(MediaType.APPLICATION_JSON).get(KeystoneUserList.class);
2122
}
2223

23-
public User post(User user) {
24+
public User post(UserForCreate user) {
2425
return target.request(MediaType.APPLICATION_JSON).post(Entity.json(user), KeystoneUser.class);
2526
}
2627

‎src/main/java/org/openstack/client/ComputeClient.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openstack.client;
22

3+
import java.io.Serializable;
34
import java.util.ArrayList;
45
import java.util.List;
56
import java.util.Map;
@@ -16,6 +17,7 @@
1617
import org.openstack.model.compute.SecurityGroupRule;
1718
import org.openstack.model.compute.SecurityGroupRuleForCreate;
1819
import org.openstack.model.compute.Server;
20+
import org.openstack.model.compute.ServerAction;
1921
import org.openstack.model.compute.ServerForCreate;
2022
import org.openstack.model.compute.ServerList;
2123
import org.openstack.model.compute.Snapshot;
@@ -176,4 +178,9 @@ public Image showImage(String id) {
176178
return resource.images().image(id).get();
177179
}
178180

181+
public Serializable executeServerAction(String id, ServerAction action) {
182+
return resource.servers().server(id).action().post(action, action.getReturnType());
183+
184+
}
185+
179186
}

‎src/main/java/org/openstack/client/IdentityClient.java‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,84 @@
11
package org.openstack.client;
22

3+
import java.util.List;
4+
35
import org.openstack.api.identity.IdentityAdministrationEndpoint;
6+
import org.openstack.model.identity.Endpoint;
7+
import org.openstack.model.identity.Role;
8+
import org.openstack.model.identity.Service;
9+
import org.openstack.model.identity.Tenant;
10+
import org.openstack.model.identity.TenantList;
11+
import org.openstack.model.identity.User;
12+
import org.openstack.model.identity.UserForCreate;
413

514
public class IdentityClient {
615

716
IdentityAdministrationEndpoint endpoint;
817

9-
public IdentityClient(IdentityAdministrationEndpoint identityAdministationEndpoint) {
18+
public IdentityClient(IdentityAdministrationEndpoint endpoint) {
1019
this.endpoint = endpoint;
1120
}
1221

22+
public TenantList listTenants(int start, int max) {
23+
return endpoint.tenants().get();
24+
}
25+
26+
public Tenant createTenant(Tenant tenant) {
27+
return endpoint.tenants().post(tenant);
28+
}
29+
30+
public void deleteTenant(String id) {
31+
endpoint.tenants().tenant(id).delete();
32+
}
33+
34+
public List<User> listUsers() {
35+
return endpoint.users().get().getList();
36+
}
37+
38+
public User createUser(UserForCreate userForCreate) {
39+
return endpoint.users().post(userForCreate);
40+
}
41+
42+
public void deleteUser(String id) {
43+
endpoint.users().user(id).delete();
44+
}
45+
46+
public List<Role> listRoles() {
47+
return endpoint.roles().get().getList();
48+
}
49+
50+
public Role createRole(Role role) {
51+
return endpoint.roles().post(role);
52+
}
53+
54+
public void deleteRole(String id) {
55+
endpoint.roles().role(id).delete();
56+
57+
}
58+
59+
public List<Service> listServices() {
60+
return endpoint.services().get().getList();
61+
}
62+
63+
public Service createService(Service service) {
64+
return endpoint.services().post(service);
65+
}
66+
67+
public void deleteService(String id) {
68+
endpoint.services().service(id).delete();
69+
}
70+
71+
public List<Endpoint> listEndpoints() {
72+
return endpoint.endpoints().get().getList();
73+
}
74+
75+
public Endpoint createEndpoint(Endpoint endpointForCreate) {
76+
return endpoint.endpoints().post(endpointForCreate);
77+
}
78+
79+
public void deleteEndpoint(String id) {
80+
endpoint.endpoints().endpoint(id).delete();
81+
82+
}
83+
1384
}

‎src/main/java/org/openstack/model/compute/Server.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import javax.xml.namespace.QName;
88

99
import org.openstack.model.atom.Link;
10+
import org.openstack.model.compute.nova.NovaAddressList.Network;
1011

1112
public interface Server {
1213

@@ -26,9 +27,9 @@ public interface Server {
2627

2728
String getTenantId();
2829

29-
String getAccessIpV4();
30+
String getAccessIPv4();
3031

31-
String getAccessIpV6();
32+
String getAccessIPv6();
3233

3334
String getAdminPass();
3435

@@ -46,9 +47,9 @@ public interface Server {
4647

4748
Fault getFault();
4849

49-
Metadata getMetadata();
50+
Map<String, String> getMetadata();
5051

51-
AddressList getAddresses();
52+
Map<String, List<Network.Ip>> getAddresses();
5253

5354
Map<QName, String> getExtensionAttributes();
5455

@@ -70,7 +71,6 @@ public void setExtensionAttributes(Map<QName, String> extensionAttributes) {
7071
this.extensionAttributes = transform;
7172
}
7273
*/
73-
String getUuid();
7474

7575
List<Link> getLinks();
7676

‎src/main/java/org/openstack/model/compute/ServerAction.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44

55
public interface ServerAction extends Serializable {
66

7+
Class<? extends Serializable> getReturnType();
8+
79
}

‎src/main/java/org/openstack/model/compute/ServerForCreate.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.openstack.model.compute;
22

33
import java.util.List;
4+
import java.util.Map;
45

5-
import org.openstack.model.compute.nova.NovaMetadata;
66
import org.openstack.model.compute.nova.NovaServerForCreate.File;
77
import org.openstack.model.compute.nova.NovaServerForCreate.SecurityGroup;
88

@@ -36,17 +36,17 @@ public interface ServerForCreate {
3636

3737
void setKeyName(String keyName);
3838

39-
String getAccessIpV4();
39+
String getAccessIPv4();
4040

41-
void setAccessIpV4(String accessIpV4);
41+
void setAccessIPv4(String accessIPv4);
4242

43-
String getAccessIpV6();
43+
String getAccessIPv6();
4444

45-
void setAccessIpV6(String accessIpV6);
45+
void setAccessIPv6(String accessIPv6);
4646

47-
List<NovaMetadata.Item> getMetadata();
47+
Map<String, String> getMetadata();
4848

49-
void setMetadata(List<NovaMetadata.Item> metadata);
49+
void setMetadata(Map<String, String> metadata);
5050

5151
List<File> getPersonality();
5252

‎src/main/java/org/openstack/model/compute/nova/NovaServer.java‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515

1616
import org.openstack.model.atom.Link;
1717
import org.openstack.model.common.JsonRootElement;
18-
import org.openstack.model.compute.AddressList;
1918
import org.openstack.model.compute.Fault;
2019
import org.openstack.model.compute.Flavor;
2120
import org.openstack.model.compute.Image;
22-
import org.openstack.model.compute.Metadata;
2321
import org.openstack.model.compute.Server;
22+
import org.openstack.model.compute.nova.NovaAddressList.Network;
2423

2524
import com.google.common.base.Predicate;
2625
import com.google.common.collect.Iterables;
@@ -57,25 +56,26 @@ public class NovaServer implements Serializable, Server {
5756
@SerializedName("tenant_id")
5857
private String tenantId;
5958

60-
@XmlAttribute(name = "accessIPv4")
61-
private String accessIpV4;
59+
@XmlAttribute
60+
private String accessIPv4;
6261

63-
@XmlAttribute(name = "accessIPv6")
64-
private String accessIpV6;
62+
@XmlAttribute
63+
private String accessIPv6;
6564

6665
@XmlAnyAttribute
6766
private Map<QName, String> extensionAttributes;
6867

6968
@XmlAttribute
7069
private String adminPass;
7170

72-
@XmlAttribute()
71+
@XmlAttribute
7372
private String progress;
7473

7574
@XmlAttribute(name = "config_drive")
7675
private String configDrive;
7776

7877
@XmlAttribute(name = "key_name")
78+
@SerializedName("key_name")
7979
private String keyName;
8080

8181
@XmlElement(name = "image")
@@ -88,16 +88,13 @@ public class NovaServer implements Serializable, Server {
8888
private NovaFault fault;
8989

9090
@XmlElement(name = "metadata")
91-
private NovaMetadata metadata;
91+
private Map<String, String> metadata;
9292

9393
@XmlElement(name = "addresses")
94-
private NovaAddressList addresses;
94+
private Map<String, List<Network.Ip>> addresses;
9595

9696
@XmlElement(name = "link", namespace = "http://www.w3.org/2005/Atom")
9797
private List<Link> links;
98-
99-
@XmlAttribute
100-
private String uuid;
10198

10299
public NovaServer() {
103100
// TODO Auto-generated constructor stub
@@ -208,24 +205,24 @@ public void setTenantId(String tenantId) {
208205
* @see org.openstack.model.compute.Server#getAccessIpV4()
209206
*/
210207
@Override
211-
public String getAccessIpV4() {
212-
return accessIpV4;
208+
public String getAccessIPv4() {
209+
return accessIPv4;
213210
}
214211

215-
public void setAccessIpV4(String accessIpV4) {
216-
this.accessIpV4 = accessIpV4;
212+
public void setAccessIPv4(String accessIPv4) {
213+
this.accessIPv4 = accessIPv4;
217214
}
218215

219216
/* (non-Javadoc)
220217
* @see org.openstack.model.compute.Server#getAccessIpV6()
221218
*/
222219
@Override
223-
public String getAccessIpV6() {
224-
return accessIpV6;
220+
public String getAccessIPv6() {
221+
return accessIPv6;
225222
}
226223

227-
public void setAccessIpV6(String accessIpV6) {
228-
this.accessIpV6 = accessIpV6;
224+
public void setAccessIPv6(String accessIPv6) {
225+
this.accessIPv6 = accessIPv6;
229226
}
230227

231228
/* (non-Javadoc)
@@ -327,23 +324,23 @@ public void setFault(NovaFault fault) {
327324
* @see org.openstack.model.compute.Server#getMetadata()
328325
*/
329326
@Override
330-
public Metadata getMetadata() {
327+
public Map<String, String> getMetadata() {
331328
return metadata;
332329
}
333330

334-
public void setMetadata(NovaMetadata metadata) {
331+
public void setMetadata(Map<String, String> metadata) {
335332
this.metadata = metadata;
336333
}
337334

338335
/* (non-Javadoc)
339336
* @see org.openstack.model.compute.Server#getAddresses()
340337
*/
341338
@Override
342-
public AddressList getAddresses() {
339+
public Map<String, List<Network.Ip>> getAddresses() {
343340
return addresses;
344341
}
345342

346-
public void setAddresses(NovaAddressList addresses) {
343+
public void setAddresses(Map<String, List<Network.Ip>> addresses) {
347344
this.addresses = addresses;
348345
}
349346

@@ -378,17 +375,6 @@ public void setExtensionAttributes(Map<QName, String> extensionAttributes) {
378375
this.extensionAttributes = transform;
379376
}
380377
*/
381-
/* (non-Javadoc)
382-
* @see org.openstack.model.compute.Server#getUuid()
383-
*/
384-
@Override
385-
public String getUuid() {
386-
return uuid;
387-
}
388-
389-
public void setUuid(String uuid) {
390-
this.uuid = uuid;
391-
}
392378

393379
/* (non-Javadoc)
394380
* @see org.openstack.model.compute.Server#getLinks()
@@ -406,7 +392,7 @@ public void setLinks(List<Link> links) {
406392
public String toString() {
407393
return "Server [id=" + id + ", name=" + name + ", status=" + status + ", updated=" + updated + ", created="
408394
+ created + ", hostId=" + hostId + ", userId=" + userId + ", tenantId=" + tenantId + ", accessIpV4="
409-
+ accessIpV4 + ", accessIpV6=" + accessIpV6 + ", adminPass=" + adminPass + ", progress=" + progress
395+
+ accessIPv4 + ", accessIpV6=" + accessIPv6 + ", adminPass=" + adminPass + ", progress=" + progress
410396
+ ", configDrive=" + configDrive + ", keyName=" + keyName + ", image=" + image + ", flavor=" + flavor
411397
+ ", fault=" + fault + ", metadata=" + metadata + ", addresses=" + addresses + ", links=" + links + "]";
412398
}

0 commit comments

Comments
 (0)