From 8f220a5d62d5973fb8f2c0a72d15107e6a2de316 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 21 Sep 2017 16:24:01 +0530
Subject: [PATCH] cloudian: some apis don't return response, fix add apis to
 return boolean result

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../com/cloudian/cloudstack/CloudianClient.java    | 14 ++++++--------
 .../cloudian/cloudstack/CloudianConnectorImpl.java |  6 ++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java
index 58713633ec3..4a969d59bc1 100644
--- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java
+++ b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianClient.java
@@ -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) {
diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
index 095f05f33f0..3d9b1846f93 100644
--- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
+++ b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
@@ -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