Skip to content

Commit 9fa3cda

Browse files
benn-csbenn-cs
committed
2 parents 4f501b3 + 3b24452 commit 9fa3cda

17 files changed

Lines changed: 198 additions & 28 deletions

File tree

‎glance-client/src/main/java/org/openstack/glance/api/DownloadImage.java‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.InputStream;
44
import java.util.Calendar;
55

6+
import javax.swing.text.StyledEditorKit.BoldAction;
67
import javax.ws.rs.client.WebTarget;
78
import javax.ws.rs.core.MediaType;
89
import javax.ws.rs.core.Response;
@@ -21,13 +22,13 @@ public DownloadImage(String id) {
2122

2223
@Override
2324
public ImageDownload execute(WebTarget target) {
24-
Response response = target.path("images").path(id).request(MediaType.APPLICATION_OCTET_STREAM).head();
25+
Response response = target.path("images").path(id).request(MediaType.APPLICATION_OCTET_STREAM).get();
2526
Image image = new Image();
2627
image.setUri(response.getHeaderString("x-image-meta-uri"));
2728
image.setName(response.getHeaderString("x-image-meta-name"));
2829
image.setDiskFormat(response.getHeaderString("x-image-meta-disk_format"));
2930
image.setContainerFormat(response.getHeaderString("x-image-meta-container_format"));
30-
image.setSize(asInteger(response.getHeaderString("x-image-meta-size")));
31+
image.setSize(asLong(response.getHeaderString("x-image-meta-size")));
3132
image.setChecksum(response.getHeaderString("x-image-meta-checksum"));
3233
image.setCreatedAt(asCalendar(response.getHeaderString("x-image-meta-create_at")));
3334
image.setUpdatedAt(asCalendar(response.getHeaderString("x-image-meta-updated_at")));
@@ -50,15 +51,28 @@ public ImageDownload execute(WebTarget target) {
5051
}
5152

5253
private Calendar asCalendar(String calendarString) {
53-
return null;
54+
return Calendar.getInstance();
5455
}
5556

5657
private Integer asInteger(String integerString) {
57-
return null;
58+
if(integerString != null) {
59+
return Integer.parseInt(integerString);
60+
}
61+
return 0;
5862
}
5963

6064
private Boolean asBoolean(String booleanString) {
61-
return null;
65+
if(booleanString != null) {
66+
return Boolean.parseBoolean(booleanString);
67+
}
68+
return Boolean.FALSE;
69+
}
70+
71+
private Long asLong(String longString) {
72+
if(longString != null) {
73+
return Long.parseLong(longString);
74+
}
75+
return 0L;
6276
}
6377

6478
}

‎glance-client/src/main/java/org/openstack/glance/api/ShowImage.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public Image execute(WebTarget target) {
2727
image.setName(response.getHeaderString("X-Image-Meta-Name"));
2828
image.setDiskFormat(response.getHeaderString("X-Image-Meta-Disk_format"));
2929
image.setContainerFormat(response.getHeaderString("X-Image-Meta-Container_format"));
30-
image.setSize(asInteger(response.getHeaderString("X-Image-Meta-Size")));
30+
image.setSize(asLong(response.getHeaderString("X-Image-Meta-Size")));
3131
image.setChecksum(response.getHeaderString("X-Image-Meta-Checksum"));
3232
image.setCreatedAt(asCalendar(response.getHeaderString("X-Image-Meta-Created_at")));
3333
image.setUpdatedAt(asCalendar(response.getHeaderString("X-Image-Meta-Updated_at")));
@@ -48,7 +48,7 @@ public Image execute(WebTarget target) {
4848
}
4949

5050
private Calendar asCalendar(String calendarString) {
51-
return null;
51+
return Calendar.getInstance();
5252
}
5353

5454
private Integer asInteger(String integerString) {
@@ -65,4 +65,11 @@ private Boolean asBoolean(String booleanString) {
6565
return Boolean.FALSE;
6666
}
6767

68+
private Long asLong(String longString) {
69+
if(longString != null) {
70+
return Long.parseLong(longString);
71+
}
72+
return 0L;
73+
}
74+
6875
}

‎glance-model/src/main/java/org/openstack/glance/model/Image.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Image implements Serializable {
2323
@JsonProperty("container_format")
2424
private String containerFormat;
2525

26-
private Integer size;
26+
private Long size;
2727

2828
private String checksum;
2929

@@ -130,14 +130,14 @@ public void setContainerFormat(String containerFormat) {
130130
/**
131131
* @return the size
132132
*/
133-
public Integer getSize() {
133+
public Long getSize() {
134134
return size;
135135
}
136136

137137
/**
138138
* @param size the size to set
139139
*/
140-
public void setSize(Integer size) {
140+
public void setSize(Long size) {
141141
this.size = size;
142142
}
143143

‎keystone-client/src/main/java/org/openstack/keystone/api/ShowUser.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.openstack.keystone.api;
2+
3+
import javax.ws.rs.client.WebTarget;
4+
import javax.ws.rs.core.MediaType;
5+
6+
import org.openstack.keystone.KeystoneCommand;
7+
import org.openstack.keystone.model.User;
8+
9+
public class ShowUser implements KeystoneCommand<User>{
10+
11+
private String id;
12+
13+
public ShowUser(String id) {
14+
this.id = id;
15+
}
16+
17+
@Override
18+
public User execute(WebTarget target) {
19+
return target.path("users").path(id).request(MediaType.APPLICATION_JSON).get(User.class);
20+
}
21+
22+
}

‎keystone-model/src/main/java/org/openstack/keystone/model/Role.java‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ public class Role implements Serializable {
1010
private String id;
1111

1212
private String name;
13+
14+
private String description;
15+
16+
private String enabled;
1317

1418
/**
1519
* @return the id
@@ -32,6 +36,32 @@ public void setName(String name) {
3236
this.name = name;
3337
}
3438

35-
36-
39+
/**
40+
* @return the description
41+
*/
42+
public String getDescription() {
43+
return description;
44+
}
45+
46+
/**
47+
* @param description the description to set
48+
*/
49+
public void setDescription(String description) {
50+
this.description = description;
51+
}
52+
53+
/**
54+
* @return the enabled
55+
*/
56+
public String getEnabled() {
57+
return enabled;
58+
}
59+
60+
/**
61+
* @param enabled the enabled to set
62+
*/
63+
public void setEnabled(String enabled) {
64+
this.enabled = enabled;
65+
}
66+
3767
}

‎keystone-model/src/main/java/org/openstack/keystone/model/User.java‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.Serializable;
44

5+
import org.codehaus.jackson.annotate.JsonProperty;
56
import org.codehaus.jackson.map.annotate.JsonRootName;
67

78
@JsonRootName("user")
@@ -11,6 +12,9 @@ public class User implements Serializable {
1112

1213
private String username;
1314

15+
@JsonProperty("OS_KSADM_password")
16+
private String password;
17+
1418
private String tenantId;
1519

1620
private String name;
@@ -26,6 +30,13 @@ public String getId() {
2630
return id;
2731
}
2832

33+
/**
34+
* @param id the id to set
35+
*/
36+
public void setId(String id) {
37+
this.id = id;
38+
}
39+
2940
/**
3041
* @return the username
3142
*/
@@ -40,6 +51,20 @@ public void setUsername(String username) {
4051
this.username = username;
4152
}
4253

54+
/**
55+
* @return the password
56+
*/
57+
public String getPassword() {
58+
return password;
59+
}
60+
61+
/**
62+
* @param password the password to set
63+
*/
64+
public void setPassword(String password) {
65+
this.password = password;
66+
}
67+
4368
/**
4469
* @return the tenantId
4570
*/
@@ -101,9 +126,9 @@ public void setEnabled(Boolean enabled) {
101126
*/
102127
@Override
103128
public String toString() {
104-
return "User [id=" + id + ", username=" + username + ", tenantId="
105-
+ tenantId + ", name=" + name + ", email=" + email
106-
+ ", enabled=" + enabled + "]";
129+
return "User [id=" + id + ", username=" + username + ", password="
130+
+ password + ", tenantId=" + tenantId + ", name=" + name
131+
+ ", email=" + email + ", enabled=" + enabled + "]";
107132
}
108133

109134
}

‎nova-client/src/main/java/org/openstack/nova/api/extensions/SecurityGroupsExtension.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public DeleteSecurityGroupRule(Integer id) {
9292

9393
@Override
9494
public Void execute(WebTarget target) {
95-
target.path("os-security-groups").path(String.valueOf(id)).request(MediaType.APPLICATION_JSON).delete();
95+
target.path("os-security-group-rules").path(String.valueOf(id)).request(MediaType.APPLICATION_JSON).delete();
9696
return null;
9797
}
9898

‎nova-model/src/main/java/org/openstack/nova/model/Image.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Image implements Serializable {
2828
private Calendar updated;
2929

3030
@JsonProperty("OS-EXT-IMG-SIZE:size")
31-
private Integer size;
31+
private Long size;
3232

3333
private Map<String, String> metadata;
3434

@@ -156,7 +156,7 @@ public Map<String, String> getMetadata() {
156156
/**
157157
* @return the size
158158
*/
159-
public Integer getSize() {
159+
public Long getSize() {
160160
return size;
161161
}
162162

‎nova-model/src/main/java/org/openstack/nova/model/ServerForCreate.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public void setName(String name) {
6666

6767
@JsonProperty("security_groups")
6868
private List<SecurityGroup> securityGroups;
69+
70+
@JsonProperty("user_data")
71+
private String userData;
72+
73+
@JsonProperty("availability_zone")
74+
private String availabilityZone;
6975

7076
/**
7177
* @return the name
@@ -245,4 +251,32 @@ public List<SecurityGroup> getSecurityGroups() {
245251
return securityGroups;
246252
}
247253

254+
/**
255+
* @return the userData
256+
*/
257+
public String getUserData() {
258+
return userData;
259+
}
260+
261+
/**
262+
* @param userData the userData to set
263+
*/
264+
public void setUserData(String userData) {
265+
this.userData = userData;
266+
}
267+
268+
/**
269+
* @return the availabilityZone
270+
*/
271+
public String getAvailabilityZone() {
272+
return availabilityZone;
273+
}
274+
275+
/**
276+
* @param availabilityZone the availabilityZone to set
277+
*/
278+
public void setAvailabilityZone(String availabilityZone) {
279+
this.availabilityZone = availabilityZone;
280+
}
281+
248282
}

‎openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class AbstractOpenStackClient {
1717

18-
protected String endpointURL;
18+
protected final String endpointURL;
1919

2020
protected String token;
2121

0 commit comments

Comments
 (0)