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

cloudian: some apis don't return response, fix add apis to return boolean result 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-09-21 16:24:01 +05:30
parent 738b89b56e
commit 8f220a5d62
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java
View File

@ -119,15 +119,14 @@ public class CloudianClient {
return httpClient.execute(request);
}
public UserInfo addUser(final UserInfo user) {
public boolean addUser(final UserInfo user) {
try {
final HttpResponse response = put("/user", user);
final ObjectMapper mapper = new ObjectMapper();
return mapper.readValue(response.getEntity().getContent(), UserInfo.class);
return response.getStatusLine().getStatusCode() == 200;
} catch (final IOException e) {
LOG.error("Failed to add Cloudian user due to:", e);
}
return null;
return false;
}
public UserInfo listUser(final String userId, final String groupId) {
@ -178,15 +177,14 @@ public class CloudianClient {
return false;
}
public GroupInfo addGroup(final GroupInfo group) {
public boolean addGroup(final GroupInfo group) {
try {
final HttpResponse response = put("/group", group);
final ObjectMapper mapper = new ObjectMapper();
return mapper.readValue(response.getEntity().getContent(), GroupInfo.class);
return response.getStatusLine().getStatusCode() == 200;
} catch (final IOException e) {
LOG.error("Failed to add Cloudian group due to:", e);
}
return null;
return false;
}
public GroupInfo listGroup(final String groupId) {

6
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
View File

@ -112,8 +112,7 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
group.setGroupId(domain.getUuid());
group.setGroupName(domain.getPath());
group.setActive(true);
GroupInfo createdGroup = client.addGroup(group);
return createdGroup != null && createdGroup.getGroupId().equals(domain.getUuid());
return client.addGroup(group);
}
@Override
@ -141,8 +140,7 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
user.setUserType(UserInfo.USER);
user.setFullName(account.getAccountName());
user.setActive(true);
UserInfo createdUser = client.addUser(user);
return createdUser != null && createdUser.getUserId().equals(account.getUuid());
return client.addUser(user);
}
@Override