From 738b89b56e95f986ce755f0a820d5ed117319480 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 21 Sep 2017 16:14:31 +0530
Subject: [PATCH] cloudian: add mandatory/missing user attribute

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../cloudian/src/com/cloudian/client/UserInfo.java  | 13 ++++++++++++-
 .../cloudian/cloudstack/CloudianConnectorImpl.java  |  5 +++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/integrations/cloudian/src/com/cloudian/client/UserInfo.java b/plugins/integrations/cloudian/src/com/cloudian/client/UserInfo.java
index 3948a374130..ce6761d2b0f 100644
--- a/plugins/integrations/cloudian/src/com/cloudian/client/UserInfo.java
+++ b/plugins/integrations/cloudian/src/com/cloudian/client/UserInfo.java
@@ -21,15 +21,18 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class UserInfo {
+    public static final String USER = "User";
+
     String userId;
     String groupId;
+    String userType;
     Boolean active;
     String fullName;
     String canonicalUserId;
 
     @Override
     public String toString() {
-        return String.format("User [id=%s, group id=%s, active=%s, name=%s]", userId, groupId, active, fullName);
+        return String.format("User [id=%s, group id=%s, type=%s, active=%s, name=%s]", userId, groupId, userType, active, fullName);
     }
 
     public String getUserId() {
@@ -48,6 +51,14 @@ public class UserInfo {
         this.groupId = groupId;
     }
 
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     public String getFullName() {
         return fullName;
     }
diff --git a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
index acd4bd2404d..095f05f33f0 100644
--- a/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
+++ b/plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java
@@ -109,9 +109,9 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
         }
         LOG.debug("Adding Cloudian group against domain uuid=" + domain.getUuid() + " name=" + domain.getName() + " path=" + domain.getPath());
         GroupInfo group = new GroupInfo();
-        group.setActive(true);
         group.setGroupId(domain.getUuid());
         group.setGroupName(domain.getPath());
+        group.setActive(true);
         GroupInfo createdGroup = client.addGroup(group);
         return createdGroup != null && createdGroup.getGroupId().equals(domain.getUuid());
     }
@@ -136,10 +136,11 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
         LOG.debug("Adding Cloudian user account with uuid=" + account.getUuid() + " name=" + account.getAccountName());
         final Domain domain = domainDao.findById(account.getDomainId());
         UserInfo user = new UserInfo();
-        user.setActive(true);
         user.setUserId(account.getUuid());
         user.setGroupId(domain.getUuid());
+        user.setUserType(UserInfo.USER);
         user.setFullName(account.getAccountName());
+        user.setActive(true);
         UserInfo createdUser = client.addUser(user);
         return createdUser != null && createdUser.getUserId().equals(account.getUuid());
     }