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

cloudian: code cleanup and last refactoring/changes 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-09-28 17:38:51 +05:30
parent 23b2b34670
commit 370941b60b
9 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/integrations/cloudian/pom.xml
View File

@ -27,7 +27,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
<version>4.9.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
@ -57,15 +57,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024m</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>

4
plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
View File

@ -19,9 +19,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd"
>
http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="cloudianConnector" class="com.cloudian.cloudstack.CloudianConnectorImpl" >
</bean>
</beans>

36
plugins/integrations/cloudian/src/com/cloudian/client/CloudianClient.java
View File

@ -58,9 +58,9 @@ import org.apache.log4j.Logger;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.nio.TrustAllManager;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
public class CloudianClient {
private static final Logger LOG = Logger.getLogger(CloudianClient.class);
private final HttpClient httpClient;
@ -135,6 +135,10 @@ public class CloudianClient {
////////////////////////////////////////////////////////
public boolean addUser(final CloudianUser user) {
if (user == null) {
return false;
}
LOG.debug("Adding Cloudian user: " + user);
try {
final HttpResponse response = put("/user", user);
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -148,6 +152,9 @@ public class CloudianClient {
}
public CloudianUser listUser(final String userId, final String groupId) {
if (Strings.isNullOrEmpty(userId) || Strings.isNullOrEmpty(groupId)) {
return null;
}
try {
final HttpResponse response = get(String.format("/user?userId=%s&groupId=%s", userId, groupId));
final ObjectMapper mapper = new ObjectMapper();
@ -165,6 +172,9 @@ public class CloudianClient {
}
public List<CloudianUser> listUsers(final String groupId) {
if (Strings.isNullOrEmpty(groupId)) {
return new ArrayList<>();
}
try {
final HttpResponse response = get(String.format("/user/list?groupId=%s&userType=all&userStatus=active", groupId));
final ObjectMapper mapper = new ObjectMapper();
@ -182,6 +192,10 @@ public class CloudianClient {
}
public boolean updateUser(final CloudianUser user) {
if (user == null) {
return false;
}
LOG.debug("Updating Cloudian user: " + user);
try {
final HttpResponse response = post("/user", user);
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -195,6 +209,10 @@ public class CloudianClient {
}
public boolean removeUser(final String userId, final String groupId) {
if (Strings.isNullOrEmpty(userId) || Strings.isNullOrEmpty(groupId)) {
return false;
}
LOG.debug("Removing Cloudian user with user id=" + userId + " in group id=" + groupId);
try {
final HttpResponse response = delete(String.format("/user?userId=%s&groupId=%s", userId, groupId));
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -212,6 +230,10 @@ public class CloudianClient {
/////////////////////////////////////////////////////////
public boolean addGroup(final CloudianGroup group) {
if (group == null) {
return false;
}
LOG.debug("Adding Cloudian group: " + group);
try {
final HttpResponse response = put("/group", group);
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -225,6 +247,9 @@ public class CloudianClient {
}
public CloudianGroup listGroup(final String groupId) {
if (Strings.isNullOrEmpty(groupId)) {
return null;
}
try {
final HttpResponse response = get(String.format("/group?groupId=%s", groupId));
final ObjectMapper mapper = new ObjectMapper();
@ -259,6 +284,10 @@ public class CloudianClient {
}
public boolean updateGroup(final CloudianGroup group) {
if (group == null) {
return false;
}
LOG.debug("Updating Cloudian group: " + group);
try {
final HttpResponse response = post("/group", group);
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -272,6 +301,10 @@ public class CloudianClient {
}
public boolean removeGroup(final String groupId) {
if (Strings.isNullOrEmpty(groupId)) {
return false;
}
LOG.debug("Removing Cloudian group id=" + groupId);
try {
final HttpResponse response = delete(String.format("/group?groupId=%s", groupId));
return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK;
@ -283,5 +316,4 @@ public class CloudianClient {
}
return false;
}
}

1
plugins/integrations/cloudian/src/com/cloudian/client/CloudianGroup.java
View File

@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class CloudianGroup {
String groupId;
String groupName;
Boolean active;

1
plugins/integrations/cloudian/src/com/cloudian/client/CloudianUser.java
View File

@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class CloudianUser {
public static final String USER = "User";
String userId;

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

@ -77,9 +77,9 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
CloudianAdminUser.value(), CloudianAdminPassword.value(),
CloudianValidateSSLSecurity.value(), CloudianAdminApiRequestTimeout.value());
} catch (final KeyStoreException | NoSuchAlgorithmException | KeyManagementException e) {
LOG.error("Failed to create Cloudian client due to: ", e);
LOG.error("Failed to create Cloudian API client due to: ", e);
}
throw new CloudRuntimeException("Failed to create and return Cloudian client instance");
throw new CloudRuntimeException("Failed to create and return Cloudian API client instance");
}
private boolean addOrUpdateGroup(final Domain domain) {
@ -90,15 +90,12 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
final CloudianGroup existingGroup = client.listGroup(domain.getUuid());
if (existingGroup != null) {
if (!existingGroup.getActive() || !existingGroup.getGroupName().equals(domain.getPath())) {
LOG.debug("Updating Cloudian group for domain uuid=" + domain.getUuid() + " name=" + domain.getName() + " path=" + domain.getPath());
existingGroup.setActive(true);
existingGroup.setGroupName(domain.getPath());
return client.updateGroup(existingGroup);
}
return true;
}
LOG.debug("Adding Cloudian group for domain uuid=" + domain.getUuid() + " name=" + domain.getName() + " path=" + domain.getPath());
final CloudianGroup group = new CloudianGroup();
group.setGroupId(domain.getUuid());
group.setGroupName(domain.getPath());
@ -111,13 +108,20 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
return false;
}
final CloudianClient client = getClient();
LOG.debug("Removing Cloudian group for domain uuid=" + domain.getUuid() + " name=" + domain.getName() + " path=" + domain.getPath());
for (final CloudianUser user: client.listUsers(domain.getUuid())) {
if (client.removeUser(user.getUserId(), domain.getUuid())) {
LOG.error(String.format("Failed to remove Cloudian user id=%s, while removing Cloudian group id=%s", user.getUserId(), domain.getUuid()));
}
}
return client.removeGroup(domain.getUuid());
for (int retry = 0; retry < 3; retry++) {
if (client.removeGroup(domain.getUuid())) {
return true;
} else {
LOG.warn("Failed to remove Cloudian group id=" + domain.getUuid() + ", retrying count=" + retry+1);
}
}
LOG.warn("Failed to remove Cloudian group id=" + domain.getUuid() + ", please remove manually");
return false;
}
private boolean addOrUpdateUserAccount(final Account account, final Domain domain) {
@ -130,7 +134,6 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
final CloudianUser existingUser = client.listUser(account.getUuid(), domain.getUuid());
if (existingUser != null) {
if (!existingUser.getActive() || !existingUser.getFullName().equals(fullName)) {
LOG.debug("Updating Cloudian user for account with uuid=" + account.getUuid() + " name=" + account.getAccountName());
existingUser.setActive(true);
existingUser.setEmailAddr(accountUser.getEmail());
existingUser.setFullName(fullName);
@ -138,8 +141,6 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
}
return true;
}
LOG.debug("Adding Cloudian user for account with uuid=" + account.getUuid() + " name=" + account.getAccountName());
final CloudianUser user = new CloudianUser();
user.setUserId(account.getUuid());
user.setGroupId(domain.getUuid());
@ -156,8 +157,15 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
}
final CloudianClient client = getClient();
final Domain domain = domainDao.findById(account.getDomainId());
LOG.debug("Removing Cloudian user for account with uuid=" + account.getUuid() + " name=" + account.getAccountName());
return client.removeUser(account.getUuid(), domain.getUuid());
for (int retry = 0; retry < 3; retry++) {
if (client.removeUser(account.getUuid(), domain.getUuid())) {
return true;
} else {
LOG.warn("Failed to remove Cloudian user id=" + account.getUuid() + " in group id=" + domain.getUuid() + ", retrying count=" + retry+1);
}
}
LOG.warn("Failed to remove Cloudian user id=" + account.getUuid() + " in group id=" + domain.getUuid() + ", please remove manually");
return false;
}
//////////////////////////////////////////////////

4
plugins/integrations/cloudian/src/com/cloudian/cloudstack/CloudianUtils.java
View File

@ -45,8 +45,8 @@ public class CloudianUtils {
return null;
}
try {
SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), HMAC_SHA1_ALGORITHM);
Mac mac = Mac.getInstance(HMAC_SHA1_ALGORITHM);
final SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), HMAC_SHA1_ALGORITHM);
final Mac mac = Mac.getInstance(HMAC_SHA1_ALGORITHM);
mac.init(signingKey);
byte[] rawHmac = mac.doFinal(data.getBytes());
return Base64.encodeBase64String(rawHmac);

8
plugins/integrations/cloudian/src/com/cloudian/cloudstack/response/CloudianEnabledResponse.java
View File

@ -32,18 +32,10 @@ public class CloudianEnabledResponse extends BaseResponse {
@Param(description = "the Cloudian Management Console base URL")
private String cmcUrl;
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public String getCmcUrl() {
return cmcUrl;
}
public void setCmcUrl(String cmcUrl) {
this.cmcUrl = cmcUrl;
}

2
plugins/integrations/cloudian/test/com/cloudian/client/CloudianClientTest.java
View File

@ -44,7 +44,6 @@ import com.github.tomakehurst.wiremock.client.BasicCredentials;
import com.github.tomakehurst.wiremock.junit.WireMockRule;
public class CloudianClientTest {
private final int port = 14333;
private final int timeout = 2;
private final String adminUsername = "admin";
@ -365,5 +364,4 @@ public class CloudianClientTest {
boolean result = client.removeGroup(group.getGroupId());
Assert.assertFalse(result);
}
}