You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/04/07 17:48:29 UTC
[01/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
[Forced Update!]
Repository: cloudstack
Updated Branches:
refs/heads/4.9-mvn-upgrade 4c10aff7c -> 03244421f (forced update)
CLOUDSTACK-9174: A deleted account results in NPE
When an account is deleted from cloudstack for which quota is still
being calculated and if the quota reaches minimum threshold then
quota service will try to alert the user. This results in NPE and is
fixed by excluding such accounts from alerting and other quota related
mechanisms.
Quota service: Fix check for admin account
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/983dee7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/983dee7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/983dee7f
Branch: refs/heads/4.9-mvn-upgrade
Commit: 983dee7f20bdcfb27cab20a46905ed58a558cb73
Parents: 94a1448
Author: Abhinandan Prateek <ab...@shapeblue.com>
Authored: Thu Dec 17 10:32:33 2015 +0530
Committer: Abhinandan Prateek <ab...@shapeblue.com>
Committed: Fri Dec 18 08:52:16 2015 +0530
----------------------------------------------------------------------
.../cloudstack/quota/QuotaAlertManagerImpl.java | 1 +
.../apache/cloudstack/quota/QuotaManagerImpl.java | 7 ++++---
.../cloudstack/quota/QuotaStatementImpl.java | 18 ++++++++++--------
.../cloudstack/api/command/QuotaSummaryCmd.java | 2 +-
.../api/response/QuotaResponseBuilderImpl.java | 6 +++++-
ui/plugins/quota/quota.js | 7 -------
6 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
index a57e0c2..a25ed04 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/QuotaAlertManagerImpl.java
@@ -153,6 +153,7 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
BigDecimal thresholdBalance = quotaAccount.getQuotaMinBalance();
if (accountBalance != null) {
AccountVO account = _accountDao.findById(quotaAccount.getId());
+ if (account == null) continue; // the account is removed
if (s_logger.isDebugEnabled()) {
s_logger.debug("checkAndSendQuotaAlertEmails: Check id=" + account.getId() + " bal=" + accountBalance + ", alertDate=" + alertDate + ", lockable=" + lockable);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
index b039e26..f4012b1 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -358,10 +358,11 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
BigDecimal rawusage;
// get service offering details
ServiceOfferingVO serviceoffering = _serviceOfferingDao.findServiceOffering(usageRecord.getVmInstanceId(), usageRecord.getOfferingId());
+ if (serviceoffering == null) return quotalist;
rawusage = new BigDecimal(usageRecord.getRawUsage());
QuotaTariffVO tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.CPU_NUMBER, usageRecord.getEndDate());
- if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0) {
+ if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0 && serviceoffering.getCpu() != null) {
BigDecimal cpu = new BigDecimal(serviceoffering.getCpu());
onehourcostpercpu = tariff.getCurrencyValue().multiply(aggregationRatio);
cpuquotausgage = rawusage.multiply(onehourcostpercpu).multiply(cpu);
@@ -371,7 +372,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
quotalist.add(quota_usage);
}
tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.CPU_CLOCK_RATE, usageRecord.getEndDate());
- if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0) {
+ if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0 && serviceoffering.getSpeed() != null) {
BigDecimal speed = new BigDecimal(serviceoffering.getSpeed() / 100.00);
onehourcostper100mhz = tariff.getCurrencyValue().multiply(aggregationRatio);
speedquotausage = rawusage.multiply(onehourcostper100mhz).multiply(speed);
@@ -381,7 +382,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
quotalist.add(quota_usage);
}
tariff = _quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.MEMORY, usageRecord.getEndDate());
- if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0) {
+ if (tariff != null && tariff.getCurrencyValue().compareTo(BigDecimal.ZERO) != 0 && serviceoffering.getRamSize() != null) {
BigDecimal memory = new BigDecimal(serviceoffering.getRamSize());
onehourcostper1mb = tariff.getCurrencyValue().multiply(aggregationRatio);
memoryquotausage = rawusage.multiply(onehourcostper1mb).multiply(memory);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
----------------------------------------------------------------------
diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
index 682b2ef..dde3069 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
@@ -122,15 +122,17 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
Date lastStatementDate = quotaAccount.getLastStatementDate();
if (interval != null) {
AccountVO account = _accountDao.findById(quotaAccount.getId());
- if (lastStatementDate == null || getDifferenceDays(lastStatementDate, new Date()) >= s_LAST_STATEMENT_SENT_DAYS + 1) {
- BigDecimal quotaUsage = _quotaUsage.findTotalQuotaUsage(account.getAccountId(), account.getDomainId(), null, interval[0].getTime(), interval[1].getTime());
- s_logger.info("For account=" + quotaAccount.getId() + ", quota used = " + quotaUsage);
- // send statement
- deferredQuotaEmailList.add(new DeferredQuotaEmail(account, quotaAccount, quotaUsage, QuotaConfig.QuotaEmailTemplateTypes.QUOTA_STATEMENT));
- } else {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("For " + quotaAccount.getId() + " the statement has been sent recently");
+ if (account != null) {
+ if (lastStatementDate == null || getDifferenceDays(lastStatementDate, new Date()) >= s_LAST_STATEMENT_SENT_DAYS + 1) {
+ BigDecimal quotaUsage = _quotaUsage.findTotalQuotaUsage(account.getAccountId(), account.getDomainId(), null, interval[0].getTime(), interval[1].getTime());
+ s_logger.info("For account=" + quotaAccount.getId() + ", quota used = " + quotaUsage);
+ // send statement
+ deferredQuotaEmailList.add(new DeferredQuotaEmail(account, quotaAccount, quotaUsage, QuotaConfig.QuotaEmailTemplateTypes.QUOTA_STATEMENT));
+ } else {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("For " + quotaAccount.getId() + " the statement has been sent recently");
+ }
}
}
} else if (lastStatementDate != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
----------------------------------------------------------------------
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
index b4f2001..88466e0 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaSummaryCmd.java
@@ -59,7 +59,7 @@ public class QuotaSummaryCmd extends BaseListCmd {
public void execute() {
Account caller = CallContext.current().getCallingAccount();
List<QuotaSummaryResponse> responses;
- if (caller.getAccountId() <= 2) { //non root admin or system
+ if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN) { //admin account
if (getAccountName() != null && getDomainId() != null)
responses = _responseBuilder.createQuotaSummaryResponse(caller.getAccountName(), caller.getDomainId());
else
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
----------------------------------------------------------------------
diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
index 1b6f400..59c53ec 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
@@ -138,6 +138,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
} else {
for (final QuotaAccountVO quotaAccount : _quotaAccountDao.listAllQuotaAccount()) {
AccountVO account = _accountDao.findById(quotaAccount.getId());
+ if (account == null) continue;
QuotaSummaryResponse qr = getQuotaSummaryResponse(account);
result.add(qr);
}
@@ -167,7 +168,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
qr.setObjectName("summary");
return qr;
} else {
- throw new InvalidParameterValueException("Quota summary response for an account requires a valid account.");
+ return new QuotaSummaryResponse();
}
}
@@ -396,6 +397,9 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
QuotaCreditsVO result = _quotaCreditsDao.saveCredits(credits);
final AccountVO account = _accountDao.findById(accountId);
+ if (account == null) {
+ throw new InvalidParameterValueException("Account does not exist with account id " + accountId);
+ }
final boolean lockAccountEnforcement = "true".equalsIgnoreCase(QuotaConfig.QuotaEnableEnforcement.value());
final BigDecimal currentAccountBalance = _quotaBalanceDao.lastQuotaBalance(accountId, domainId, startOfNextDay(new Date(despositedOn.getTime())));
if (s_logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/983dee7f/ui/plugins/quota/quota.js
----------------------------------------------------------------------
diff --git a/ui/plugins/quota/quota.js b/ui/plugins/quota/quota.js
index 94a8730..d9f61b2 100644
--- a/ui/plugins/quota/quota.js
+++ b/ui/plugins/quota/quota.js
@@ -329,13 +329,6 @@
});
},
detailView: {
- viewAll: [{
- path: 'quota.quotastatement',
- label: 'label.quota.statement.quota'
- },{
- path: 'quota.balancestatement',
- label: 'label.quota.statement.balance'
- }],
actions: {
add: {
label: 'label.quota.add.credits',
[09/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
bcprov versions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6cb4e3dc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cb4e3dc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cb4e3dc
Branch: refs/heads/4.9-mvn-upgrade
Commit: 6cb4e3dc6ae061fe2e69b5506a9c547533ff3ba3
Parents: f845bb4
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 3 11:27:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
pom.xml | 10 ++--------
services/console-proxy-rdp/rdpconsole/pom.xml | 1 +
utils/pom.xml | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb62258..3b78e99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.bcprov.version>1.46</cs.bcprov.version>
+ <cs.bcprov.version>1.54</cs.bcprov.version>
<cs.jsch.version>0.1.53</cs.jsch.version>
<cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
@@ -116,7 +116,6 @@
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
<cs.batik.version>1.8</cs.batik.version>
- <cs.bcprov-jdk15on.version>1.54</cs.bcprov-jdk15on.version>
<cs.servicemix.version>2.3.4_1</cs.servicemix.version>
<cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
<cs.cxf.version>3.1.4</cs.cxf.version>
@@ -239,7 +238,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>${cs.bcprov-jdk15on.version}</version>
+ <version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -319,11 +318,6 @@
<version>${cs.commons-validator.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <version>${cs.bcprov.version}</version>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${cs.jsch.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index a27f2eb..628d039 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -77,6 +77,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
+ <version>1.46</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 93d7d01..206eb18 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
[06/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
travis: Fix simulator tests and optimize default global configs
- Migrate to trusty based Travis VMs
- Increase tests across five build matrices
- Fix xunit-reader output, include time
- Fix pip/python usage, pkg installation
- Build CloudStack in parallel with -T4
- Deploy database with optimized global settings
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/87b431c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87b431c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87b431c0
Branch: refs/heads/4.9-mvn-upgrade
Commit: 87b431c0f338b8b1c365eabc335ebd69a55c7e07
Parents: f7c3957
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Mar 26 02:44:40 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 02:19:52 2016 +0530
----------------------------------------------------------------------
.travis.yml | 24 ++++++++++++++++--------
developer/developer-prefill.sql | 28 ++++++++++++++++++++++++++++
setup/db/templates.simulator.sql | 4 +++-
setup/dev/advanced.cfg | 4 ++--
tools/travis/before_install.sh | 25 ++++++++++++++++++-------
tools/travis/before_script.sh | 2 +-
tools/travis/install.sh | 19 +++++++------------
tools/travis/script.sh | 5 +++--
tools/travis/xunit-reader.py | 14 ++++++++++++--
9 files changed, 90 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 200f199..1441fa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,27 +15,35 @@
# specific language governing permissions and limitations
# under the License.
sudo: required
+dist: trusty
language: java
cache:
directories:
- $HOME/.cache
jdk:
- oraclejdk7
+python:
+ - "2.7"
+cache:
+ directories:
+ - $HOME/.m2
+ timeout: 1000
notifications:
email: false
env:
global:
- REGRESSION_CYCLE=4
- REGRESSION_INDEX=6
+ - PATH=$HOME/.local/bin:$PATH
matrix:
- - TESTS="smoke/test_affinity_groups smoke/test_primary_storage"
- - TESTS="smoke/test_deploy_vms_with_varied_deploymentplanners smoke/test_disk_offerings smoke/test_global_settings smoke/test_multipleips_per_nic"
- - TESTS="smoke/test_portable_publicip smoke/test_privategw_acl smoke/test_public_ip_range smoke/test_pvlan smoke/test_regions smoke/test_network"
- - TESTS="smoke/test_reset_vm_on_reboot smoke/test_resource_detail smoke/test_routers smoke/test_guest_vlan_range smoke/test_iso smoke/test_non_contigiousvlan"
- - TESTS="smoke/test_secondary_storage smoke/test_service_offerings smoke/test_ssvm smoke/test_templates smoke/test_over_provisioning"
+ - TESTS="smoke/test_affinity_groups smoke/test_affinity_groups_projects smoke/test_deploy_vgpu_enabled_vm smoke/test_deploy_vm_iso smoke/test_deploy_vm_root_resize smoke/test_deploy_vm_with_userdata smoke/test_deploy_vms_with_varied_deploymentplanners smoke/test_disk_offerings smoke/test_global_settings smoke/test_guest_vlan_range"
+ - TESTS="smoke/test_hosts smoke/test_internal_lb smoke/test_iso smoke/test_loadbalance smoke/test_multipleips_per_nic smoke/test_network smoke/test_network_acl smoke/test_nic smoke/test_nic_adapter_type smoke/test_non_contigiousvlan"
+ - TESTS="smoke/test_over_provisioning smoke/test_password_server smoke/test_portable_publicip smoke/test_primary_storage smoke/test_privategw_acl smoke/test_public_ip_range smoke/test_pvlan smoke/test_regions smoke/test_reset_vm_on_reboot smoke/test_resource_detail"
+ - TESTS="smoke/test_router_dhcphosts smoke/test_routers smoke/test_routers_iptables_default_policy smoke/test_routers_network_ops smoke/test_scale_vm smoke/test_secondary_storage smoke/test_service_offerings smoke/test_snapshots smoke/test_ssvm smoke/test_templates"
+ - TESTS="smoke/test_usage_events smoke/test_vm_life_cycle smoke/test_vm_snapshots smoke/test_volumes smoke/test_vpc_redundant smoke/test_vpc_router_nics smoke/test_vpc_vpn smoke/misc/test_deploy_vm smoke/misc/test_vm_ha smoke/misc/test_escalations_templates smoke/misc/test_vm_sync"
- - TESTS="smoke/test_volumes smoke/test_vpc_vpn smoke/misc/test_deploy_vm smoke/test_vm_life_cycle component/test_mm_max_limits"
- - TESTS="component/test_acl_isolatednetwork_delete component/test_mm_domain_limits component/test_acl_listsnapshot"
+ - TESTS="component/test_mm_max_limits component/test_acl_isolatednetwork_delete"
+ - TESTS="component/test_mm_domain_limits component/test_acl_listsnapshot"
- TESTS="component/test_acl_listvm component/test_acl_sharednetwork_deployVM-impersonation component/test_acl_sharednetwork"
- TESTS="component/test_snapshots component/test_acl_listvolume"
before_install: travis_wait 30 ./tools/travis/before_install.sh
@@ -43,7 +51,7 @@ install: ./tools/travis/install.sh
before_script: travis_wait 30 ./tools/travis/before_script.sh
script:
- travis_wait 30 sleep 30
- - ./tools/travis/script.sh $TESTS
+ - ./tools/travis/script.sh ${TESTS}
after_success: ./tools/travis/after_success.sh
after_failure: ./tools/travis/after_failure.sh
after_script: ./tools/travis/after_script.sh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/developer/developer-prefill.sql
----------------------------------------------------------------------
diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql
index 3097203..f874118 100644
--- a/developer/developer-prefill.sql
+++ b/developer/developer-prefill.sql
@@ -64,6 +64,10 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'expunge.workers', '3');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
'cluster.cpu.allocated.capacity.disablethreshold', '0.95');
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
@@ -78,6 +82,30 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
'pool.storage.capacity.disablethreshold', '0.95');
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'network.gc.wait', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'network.gc.interval', '60');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'storage.cleanup.interval', '150');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'vm.op.wait.interval', '5');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'workers', '10');
+
+INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
+ VALUES ('Advanced', 'DEFAULT', 'management-server',
+ 'direct.agent.load.size', '1000');
+
-- Add developer configuration entry; allows management server to be run as a user other than "cloud"
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
VALUES ('Advanced', 'DEFAULT', 'management-server',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/setup/db/templates.simulator.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.simulator.sql b/setup/db/templates.simulator.sql
index 25e91bd..ac09c05 100755
--- a/setup/db/templates.simulator.sql
+++ b/setup/db/templates.simulator.sql
@@ -19,4 +19,6 @@
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, state)
VALUES (100, UUID(), 'simulator-domR', 'SystemVM Template (simulator)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/routing/debian/latest/systemvm.vhd.bz2', '', 0, 'SystemVM Template (simulator)', 'VHD', 15, 0, 1, 'Simulator','Active');
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type,state)
- VALUES (111, UUID(), 'simulator-Centos', 'CentOS 5.3(64-bit) no GUI (Simulator)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', '', 0, 'CentOS 5.3(64-bit) no GUI (Simulator)', 'VHD', 11, 1, 1, 'Simulator','Active');
+ VALUES (111, UUID(), 'simulator-Centos', 'CentOS 5.6 (64-bit) no GUI (Simulator)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', '', 0, 'CentOS 5.6 (64-bit) no GUI (Simulator)', 'VHD', 142, 1, 1, 'Simulator','Active');
+
+INSERT INTO `cloud`.`template_store_ref` VALUES (1,1,111,NOW(),NOW(),NULL,100,0,'Image',0,'DOWNLOADED',NULL,NULL,'template/tmpl/1/111/','http://fake.cloud/111.vhd.bz2','Ready',0,0,0,0,NULL,NULL,NULL);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/setup/dev/advanced.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 8109bb1..afb9b6a 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -154,7 +154,7 @@
},
{
"name": "storage.cleanup.interval",
- "value": "300"
+ "value": "150"
},
{
"name": "vm.op.wait.interval",
@@ -178,7 +178,7 @@
},
{
"name": "account.cleanup.interval",
- "value": "600"
+ "value": "60"
},
{
"name": "guest.domain.suffix",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/tools/travis/before_install.sh
----------------------------------------------------------------------
diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index b90a099..700ac09 100755
--- a/tools/travis/before_install.sh
+++ b/tools/travis/before_install.sh
@@ -49,12 +49,21 @@ javac -version
echo -e "\nMaven Version: "
mvn -v
+echo -e "\nPython Version: "
+python --version
+
+echo -e "\nPip Version: "
+pip --version
+
echo -e "\nDisk Status: "
df
echo -e "\nMemory Status: "
free
+echo -e "\nTotal CPUs: "
+nproc
+
echo -e "\nCheck Git status"
git status
@@ -66,18 +75,18 @@ sudo apt-get -q -y update > /dev/null
echo -e "\nInstalling MySQL: "
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password your_password'
-sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password your_password'
+export DEBIAN_FRONTEND=noninteractive
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
+sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
sudo apt-get -q -y install mysql-server > /dev/null
-#Restart mysql if running to release deleted file locks on filesystem, if aready running
-sudo status mysql | grep start && sudo stop mysql
-sudo start mysql
+mysql -uroot -ppassword -e "SET PASSWORD = PASSWORD(''); FLUSH PRIVILEGES;"
+sudo service mysql restart
echo -e "\nInstalling Development tools: "
RETRY_COUNT=3
-sudo apt-get -q -y install uuid-runtime genisoimage python-setuptools python-pip netcat > /dev/null
+sudo apt-get -q -y install uuid-runtime genisoimage netcat > /dev/null
if [[ $? -ne 0 ]]; then
echo -e "\napt-get packages failed to install"
fi
@@ -94,9 +103,11 @@ echo "<settings>
echo -e "\nInstalling some python packages: "
+pip install --user --upgrade pip
+
for ((i=0;i<$RETRY_COUNT;i++))
do
- sudo pip install --upgrade lxml texttable paramiko > /tmp/piplog
+ pip install --user --upgrade lxml paramiko nose texttable > /tmp/piplog
if [[ $? -eq 0 ]]; then
echo -e "\npython packages installed successfully"
break;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/tools/travis/before_script.sh
----------------------------------------------------------------------
diff --git a/tools/travis/before_script.sh b/tools/travis/before_script.sh
index 40e6700..beb8acc 100755
--- a/tools/travis/before_script.sh
+++ b/tools/travis/before_script.sh
@@ -41,4 +41,4 @@ mvn -Dsimulator -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log &
while ! nc -vzw 5 localhost 8096 2>&1 > /dev/null; do grep Exception /tmp/jetty-log; sleep 10; done
echo -e "\nStarting DataCenter deployment"
-python -m marvin.deployDataCenter -i setup/dev/advanced.cfg 2>&1 || true
+python tools/marvin/marvin/deployDataCenter.py -i setup/dev/advanced.cfg 2>&1 || true
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/tools/travis/install.sh
----------------------------------------------------------------------
diff --git a/tools/travis/install.sh b/tools/travis/install.sh
index 28f4ed4..5b6bc5e 100755
--- a/tools/travis/install.sh
+++ b/tools/travis/install.sh
@@ -34,24 +34,19 @@ if [ $MOD -ne 0 ]; then
fi
fi
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=500m -Djava.security.egd=file:/dev/./urandom"
+export MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=500m -Djava.security.egd=file:/dev/./urandom"
if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
- mvn -q -Pimpatient -Dsimulator clean install
+ mvn -Pdeveloper,systemvm -Dsimulator clean install -T4 | egrep "Building|SUCCESS"
else
- mvn -q -Pimpatient -Dsimulator clean install -DskipTests=true
+ mvn -Pdeveloper -Dsimulator clean install -DskipTests=true -T4 | egrep "Building|SUCCESS"
fi
-# Compile API Docs
-cd tools/apidoc
-mvn -q clean install
-cd ../../
+# Install mysql-connector-python
+pip install --user --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df 2>&1 > /dev/null
-# Compile marvin
-cd tools/marvin
-mvn -q clean install
-sudo python setup.py install 2>&1 > /dev/null
-cd ../../
+# Install marvin
+pip install --user --upgrade tools/marvin/dist/Marvin-*.tar.gz
# Deploy the database
mvn -q -Pdeveloper -pl developer -Ddeploydb
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/tools/travis/script.sh
----------------------------------------------------------------------
diff --git a/tools/travis/script.sh b/tools/travis/script.sh
index 7e7c497..dc955b0 100755
--- a/tools/travis/script.sh
+++ b/tools/travis/script.sh
@@ -37,10 +37,11 @@ fi
mkdir -p integration-test-results/smoke/misc
mkdir -p integration-test-results/component
+TESTS=($@)
+echo "Running tests: " ${TESTS[@]}
-for suite in $1; do
+for suite in "${TESTS[@]}" ; do
nosetests --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
done
-
python ./tools/travis/xunit-reader.py integration-test-results/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b431c0/tools/travis/xunit-reader.py
----------------------------------------------------------------------
diff --git a/tools/travis/xunit-reader.py b/tools/travis/xunit-reader.py
index c492c01..80e228b 100755
--- a/tools/travis/xunit-reader.py
+++ b/tools/travis/xunit-reader.py
@@ -61,6 +61,8 @@ def _generate_args():
def _generate_file_list(args):
path = args.pop('path')
file_path_list = []
+ if path.endswith('.xml') and os.path.isfile(path):
+ file_path_list.append(path)
for (root, dirnames, filenames) in os.walk(path):
for filename in filenames:
if filename.endswith('.xml'):
@@ -71,7 +73,7 @@ def _generate_file_list(args):
def parse_reports(file_path_list):
table = texttable.Texttable()
- table.header(['Test', 'Result'])
+ table.header(['Test', 'Result', 'Time'])
exit_code = 0
@@ -80,16 +82,24 @@ def parse_reports(file_path_list):
for event, elem in data:
name = ''
status = 'Success'
+ time = ''
if 'name' in elem.attrib:
name = elem.attrib['name']
+ if 'time' in elem.attrib:
+ time = elem.attrib['time']
for children in elem.getchildren():
if 'skipped' == children.tag:
status = 'Skipped'
elif 'failure' == children.tag:
exit_code = 1
status = 'Failure'
+ elif 'error' == children.tag:
+ exit_code = 1
+ status = 'Error'
+ if 'type' in children.attrib:
+ status = children.attrib['type']
- table.add_row([name, status])
+ table.add_row([name, status, time])
print table.draw()
[08/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Merge pull request #1254 from shapeblue/master-9174
CLOUDSTACK-9174: A deleted account results in NPEWhen an account is deleted from cloudstack for which quota is still
being calculated and if the quota reaches minimum threshold then
quota service will try to alert the user. This results in NPE and is
fixed by excluding such accounts from alerting and other quota related
mechanisms.
* pr/1254:
CLOUDSTACK-9174: A deleted account results in NPE
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e72a69a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e72a69a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e72a69a8
Branch: refs/heads/4.9-mvn-upgrade
Commit: e72a69a8a2f0514ece93fc9b05698aa08afa5539
Parents: bb48d7f 983dee7
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 7 11:39:22 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 7 11:39:22 2016 -0400
----------------------------------------------------------------------
.../cloudstack/quota/QuotaAlertManagerImpl.java | 1 +
.../apache/cloudstack/quota/QuotaManagerImpl.java | 7 ++++---
.../cloudstack/quota/QuotaStatementImpl.java | 18 ++++++++++--------
.../cloudstack/api/command/QuotaSummaryCmd.java | 2 +-
.../api/response/QuotaResponseBuilderImpl.java | 6 +++++-
ui/plugins/quota/quota.js | 7 -------
6 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e72a69a8/framework/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e72a69a8/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e72a69a8/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e72a69a8/ui/plugins/quota/quota.js
----------------------------------------------------------------------
[02/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Add ability to download templates in Swift
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52fc2bab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52fc2bab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52fc2bab
Branch: refs/heads/4.9-mvn-upgrade
Commit: 52fc2bab690d7367cf0f45cc66ed70828a0ed7d0
Parents: 6be2cc7
Author: Syed <sy...@gmail.com>
Authored: Mon Dec 14 17:32:56 2015 -0500
Committer: Syed <sy...@gmail.com>
Committed: Tue Apr 5 16:40:00 2016 -0400
----------------------------------------------------------------------
.../driver/SwiftImageStoreDriverImpl.java | 32 ++++++-
.../com/cloud/template/TemplateManagerImpl.java | 6 --
.../main/java/com/cloud/utils/SwiftUtil.java | 76 ++++++++++++++--
.../java/com/cloud/utils/SwiftUtilTest.java | 92 ++++++++++++++++++++
4 files changed, 193 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52fc2bab/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
index 228bbd2..2816c60 100644
--- a/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
+++ b/plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
@@ -18,10 +18,15 @@
*/
package org.apache.cloudstack.storage.datastore.driver;
+import java.net.URL;
import java.util.Map;
+import java.util.UUID;
import javax.inject.Inject;
+import com.cloud.configuration.Config;
+import com.cloud.utils.SwiftUtil;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants;
@@ -43,7 +48,6 @@ import com.cloud.agent.api.storage.DownloadAnswer;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.SwiftTO;
-import com.cloud.exception.UnsupportedServiceException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.utils.exception.CloudRuntimeException;
@@ -57,6 +61,8 @@ public class SwiftImageStoreDriverImpl extends BaseImageStoreDriverImpl {
EndPointSelector _epSelector;
@Inject
StorageCacheManager cacheManager;
+ @Inject
+ ConfigurationDao _configDao;
@Override
public DataStoreTO getStoreTO(DataStore store) {
@@ -67,7 +73,29 @@ public class SwiftImageStoreDriverImpl extends BaseImageStoreDriverImpl {
@Override
public String createEntityExtractUrl(DataStore store, String installPath, ImageFormat format, DataObject dataObject) {
- throw new UnsupportedServiceException("Extract entity url is not yet supported for Swift image store provider");
+
+ SwiftTO swiftTO = (SwiftTO)store.getTO();
+ String tempKey = UUID.randomUUID().toString();
+ boolean result = SwiftUtil.setTempKey(swiftTO, tempKey);
+
+ if (!result) {
+ String errMsg = "Unable to set Temp-Key: " + tempKey;
+ s_logger.error(errMsg);
+ throw new CloudRuntimeException(errMsg);
+ }
+
+ String containerName = SwiftUtil.getContainerName(dataObject.getType().toString(), dataObject.getId());
+ String objectName = installPath.split("\\/")[1];
+ // Get extract url expiration interval set in global configuration (in seconds)
+ int urlExpirationInterval = Integer.parseInt(_configDao.getValue(Config.ExtractURLExpirationInterval.toString()));
+
+ URL swiftUrl = SwiftUtil.generateTempUrl(swiftTO, containerName, objectName, tempKey, urlExpirationInterval);
+ if (swiftUrl != null) {
+ s_logger.debug("Swift temp-url: " + swiftUrl.toString());
+ return swiftUrl.toString();
+ }
+
+ throw new CloudRuntimeException("Unable to create extraction URL");
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52fc2bab/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 6a8c3b6..e614142 100644
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1520,12 +1520,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
} finally {
- /*if (snapshot != null && snapshot.getSwiftId() != null
- && secondaryStorageURL != null && zoneId != null
- && accountId != null && volumeId != null) {
- _snapshotMgr.deleteSnapshotsForVolume(secondaryStorageURL,
- zoneId, accountId, volumeId);
- }*/
if (privateTemplate == null) {
final VolumeVO volumeFinal = volume;
final SnapshotVO snapshotFinal = snapshot;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52fc2bab/utils/src/main/java/com/cloud/utils/SwiftUtil.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/SwiftUtil.java b/utils/src/main/java/com/cloud/utils/SwiftUtil.java
index 1136818..ce1bee3 100644
--- a/utils/src/main/java/com/cloud/utils/SwiftUtil.java
+++ b/utils/src/main/java/com/cloud/utils/SwiftUtil.java
@@ -20,8 +20,14 @@
package com.cloud.utils;
import java.io.File;
-import java.util.Arrays;
+import java.net.URL;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
import java.util.Map;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Formatter;
import org.apache.log4j.Logger;
@@ -29,9 +35,15 @@ import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.OutputInterpreter;
import com.cloud.utils.script.Script;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
public class SwiftUtil {
private static Logger logger = Logger.getLogger(SwiftUtil.class);
private static final long SWIFT_MAX_SIZE = 5L * 1024L * 1024L * 1024L;
+ private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
+
+
public interface SwiftClientCfg {
String getAccount();
@@ -143,8 +155,7 @@ public class SwiftUtil {
OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
String result = command.execute(parser);
if (result == null && parser.getLines() != null && !parser.getLines().equalsIgnoreCase("")) {
- String[] lines = parser.getLines().split("\\n");
- return lines;
+ return parser.getLines().split("\\n");
} else {
if (result != null) {
String errMsg = "swiftList failed , err=" + result;
@@ -161,7 +172,7 @@ public class SwiftUtil {
int firstIndexOfSeparator = swiftPath.indexOf(File.separator);
String container = swiftPath.substring(0, firstIndexOfSeparator);
String srcPath = swiftPath.substring(firstIndexOfSeparator + 1);
- String destFilePath = null;
+ String destFilePath;
if (destDirectory.isDirectory()) {
destFilePath = destDirectory.getAbsolutePath() + File.separator + srcPath;
} else {
@@ -171,7 +182,7 @@ public class SwiftUtil {
Script command = new Script("/bin/bash", logger);
command.add("-c");
command.add("/usr/bin/python " + swiftCli + " -A " + cfg.getEndPoint() + " -U " + cfg.getAccount() + ":" + cfg.getUserName() + " -K " + cfg.getKey() +
- " download " + container + " " + srcPath + " -o " + destFilePath);
+ " download " + container + " " + srcPath + " -o " + destFilePath);
OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
String result = command.execute(parser);
if (result != null) {
@@ -236,4 +247,59 @@ public class SwiftUtil {
command.execute(parser);
return true;
}
+
+ public static boolean setTempKey(SwiftClientCfg cfg, String tempKey){
+
+ Map<String, String> tempKeyMap = new HashMap<>();
+ tempKeyMap.put("Temp-URL-Key", tempKey);
+ return postMeta(cfg, "", "", tempKeyMap);
+
+ }
+
+ public static URL generateTempUrl(SwiftClientCfg cfg, String container, String object, String tempKey, int urlExpirationInterval) {
+
+ int currentTime = (int) (System.currentTimeMillis() / 1000L);
+ int expirationSeconds = currentTime + urlExpirationInterval;
+
+ try {
+
+ URL endpoint = new URL(cfg.getEndPoint());
+ String method = "GET";
+ String path = String.format("/v1/AUTH_%s/%s/%s", cfg.getAccount(), container, object);
+
+ //sign the request
+ String hmacBody = String.format("%s\n%d\n%s", method, expirationSeconds, path);
+ String signature = calculateRFC2104HMAC(hmacBody, tempKey);
+ path += String.format("?temp_url_sig=%s&temp_url_expires=%d", signature, expirationSeconds);
+
+ //generate the temp url
+ URL tempUrl = new URL(endpoint.getProtocol(), endpoint.getHost(), endpoint.getPort(), path);
+
+ return tempUrl;
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ throw new CloudRuntimeException(e.getMessage());
+ }
+
+ }
+
+ public static String calculateRFC2104HMAC(String data, String key)
+ throws SignatureException, NoSuchAlgorithmException, InvalidKeyException {
+
+ SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), HMAC_SHA1_ALGORITHM);
+ Mac mac = Mac.getInstance(HMAC_SHA1_ALGORITHM);
+ mac.init(signingKey);
+ return toHexString(mac.doFinal(data.getBytes()));
+
+ }
+
+ public static String toHexString(byte[] bytes) {
+
+ Formatter formatter = new Formatter();
+ for (byte b : bytes) {
+ formatter.format("%02x", b);
+ }
+ return formatter.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52fc2bab/utils/src/test/java/com/cloud/utils/SwiftUtilTest.java
----------------------------------------------------------------------
diff --git a/utils/src/test/java/com/cloud/utils/SwiftUtilTest.java b/utils/src/test/java/com/cloud/utils/SwiftUtilTest.java
new file mode 100644
index 0000000..55f7a34
--- /dev/null
+++ b/utils/src/test/java/com/cloud/utils/SwiftUtilTest.java
@@ -0,0 +1,92 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.utils;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.net.URL;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+
+public class SwiftUtilTest {
+
+ @Test
+ public void testCalculateRFC2104HMAC() throws NoSuchAlgorithmException, SignatureException, InvalidKeyException {
+ String inputData = "testData";
+ String inputKey = "testKey";
+ String expected = "1d541ecb5cdb2d850716bfd55585e20a1cd8984b";
+ String output = SwiftUtil.calculateRFC2104HMAC(inputData, inputKey);
+
+ assertEquals(expected, output);
+ }
+
+ @Test
+ public void testToHexString(){
+ final byte[] input = "testing".getBytes();
+ final String expected = "74657374696e67";
+ final String result = SwiftUtil.toHexString(input);
+ assertEquals(expected, result);
+ }
+
+ @Test
+ public void testGenerateTempUrl() {
+
+ SwiftUtil.SwiftClientCfg cfg = Mockito.mock(SwiftUtil.SwiftClientCfg.class);
+ when(cfg.getEndPoint()).thenReturn("http://localhost:8080/v1/");
+ when(cfg.getAccount()).thenReturn("test");
+
+ String container = "testContainer";
+ String object = "testObject";
+ String tempKey = "testKey";
+ int urlExpirationInterval = 3600;
+ String expected = "http://localhost:8080/v1/AUTH_test/testContainer/testObject";
+ URL output = SwiftUtil.generateTempUrl(cfg, container, object, tempKey, urlExpirationInterval);
+
+ assertTrue(output.toString().contains(expected));
+ }
+
+ @Test
+ public void testSplitSwiftPath(){
+ String input = "container/object";
+ String[] output = SwiftUtil.splitSwiftPath(input);
+ String[] expected = {"container", "object"};
+
+ assertArrayEquals(expected, output);
+ }
+
+ @Test
+ public void testGetContainerName(){
+
+ String inputType = "Template";
+ long inputId = 45;
+ String output = SwiftUtil.getContainerName(inputType, inputId);
+ String expected = "T-45";
+
+ assertEquals(expected, output);
+ }
+}
[16/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index 137aa61..9cbc73a 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -27,9 +27,11 @@ import java.util.Map;
import javax.naming.ConfigurationException;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.log4j.Logger;
-import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemWriter;
import com.citrix.netscaler.nitro.exception.nitro_exception;
import com.citrix.netscaler.nitro.resource.base.base_response;
@@ -75,11 +77,6 @@ import com.citrix.netscaler.nitro.util.filtervalue;
import com.citrix.sdx.nitro.resource.config.mps.mps;
import com.citrix.sdx.nitro.resource.config.ns.ns;
import com.citrix.sdx.nitro.resource.config.xen.xen_nsvpx_image;
-import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-
-import org.apache.cloudstack.api.ApiConstants;
-
import com.cloud.agent.IAgentControl;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
@@ -127,6 +124,8 @@ import com.cloud.utils.exception.ExecutionException;
import com.cloud.utils.net.NetUtils;
import com.cloud.utils.security.CertificateHelper;
import com.cloud.utils.ssh.SshHelper;
+import com.google.common.collect.Lists;
+import com.google.gson.Gson;
class NitroError {
static final int NS_RESOURCE_EXISTS = 273;
@@ -235,7 +234,7 @@ public class NetscalerResource implements ServerResource {
_inline = Boolean.parseBoolean((String)params.get("inline"));
- if (((String)params.get("cloudmanaged")) != null) {
+ if ((String)params.get("cloudmanaged") != null) {
_cloudManaged = Boolean.parseBoolean((String)params.get("cloudmanaged"));
}
@@ -264,7 +263,7 @@ public class NetscalerResource implements ServerResource {
}
return true;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ConfigurationException(e.getMessage());
}
}
@@ -280,7 +279,7 @@ public class NetscalerResource implements ServerResource {
_netscalerSdxService.logout();
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
// Ignore logout exceptions
}
}
@@ -302,15 +301,15 @@ public class NetscalerResource implements ServerResource {
} else {
_netscalerSdxService = new com.citrix.sdx.nitro.service.nitro_service(_ip, "https");
_netscalerSdxService.set_credential(_username, _password);
- com.citrix.sdx.nitro.resource.base.login login = _netscalerSdxService.login();
+ final com.citrix.sdx.nitro.resource.base.login login = _netscalerSdxService.login();
if (login == null) {
throw new ExecutionException("Failed to log in to Netscaler SDX device at " + _ip + " due to error " + apiCallResult.errorcode + " and message " +
apiCallResult.message);
}
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to log in to Netscaler device at " + _ip + " due to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to log in to Netscaler device at " + _ip + " due to " + e.getMessage());
}
}
@@ -320,9 +319,9 @@ public class NetscalerResource implements ServerResource {
return;
}
try {
- String[] features = _netscalerService.get_enabled_features();
+ final String[] features = _netscalerService.get_enabled_features();
if (features != null) {
- for (String feature : features) {
+ for (final String feature : features) {
if (feature.equalsIgnoreCase("LB")) {
return;
}
@@ -330,15 +329,15 @@ public class NetscalerResource implements ServerResource {
}
// enable load balancing on the device
- String[] feature = new String[1];
+ final String[] feature = new String[1];
feature[0] = "LB";
apiCallResult = _netscalerService.enable_features(feature);
if (apiCallResult.errorcode != 0) {
throw new ExecutionException("Enabling load balancing feature on the device failed.");
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Enabling load balancing feature on the device failed due to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Enabling load balancing feature on the device failed due to " + e.getMessage());
}
}
@@ -346,21 +345,21 @@ public class NetscalerResource implements ServerResource {
private void validateInterfaces(String publicInterface, String privateInterface) throws ExecutionException {
try {
if (!_isSdx && !_cloudManaged) {
- Interface publicIf = Interface.get(_netscalerService, publicInterface);
- Interface privateIf = Interface.get(_netscalerService, privateInterface);
+ final Interface publicIf = Interface.get(_netscalerService, publicInterface);
+ final Interface privateIf = Interface.get(_netscalerService, privateInterface);
if (publicIf != null || privateIf != null) {
return;
} else {
throw new ExecutionException("Invalid interface name specified for public/private interfaces.");
}
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
if (e.getErrorCode() == NitroError.NS_RESOURCE_NOT_EXISTS) {
throw new ExecutionException("Invalid interface name specified for public and private interfaces.");
} else {
throw new ExecutionException("Failed to verify public interface and private intefaces are valid due to " + e.getMessage());
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to verify public interface and private intefaces are valid due to " + e.getMessage());
}
}
@@ -368,18 +367,18 @@ public class NetscalerResource implements ServerResource {
private void validateDeviceType(String deviceType) throws ExecutionException {
try {
if (!_isSdx && !_cloudManaged) {
- nshardware nsHw = com.citrix.netscaler.nitro.resource.config.ns.nshardware.get(_netscalerService);
+ final nshardware nsHw = com.citrix.netscaler.nitro.resource.config.ns.nshardware.get(_netscalerService);
if (nsHw == null) {
throw new ExecutionException("Failed to get the hardware description of the Netscaler device at " + _ip);
} else {
- if ((_deviceName.equalsIgnoreCase("NetscalerMPXLoadBalancer") && nsHw.get_hwdescription().contains("MPX")) ||
- (_deviceName.equalsIgnoreCase("NetscalerVPXLoadBalancer") && nsHw.get_hwdescription().contains("NetScaler Virtual Appliance"))) {
+ if (_deviceName.equalsIgnoreCase("NetscalerMPXLoadBalancer") && nsHw.get_hwdescription().contains("MPX") ||
+ _deviceName.equalsIgnoreCase("NetscalerVPXLoadBalancer") && nsHw.get_hwdescription().contains("NetScaler Virtual Appliance")) {
return;
}
throw new ExecutionException("Netscalar device type specified does not match with the actuall device type.");
}
} else if (_isSdx) {
- mps serviceVM = mps.get(_netscalerSdxService);
+ final mps serviceVM = mps.get(_netscalerSdxService);
if (serviceVM != null) {
if (serviceVM.get_platform().contains("SDX") || serviceVM.get_product().contains("SDX")) {
return;
@@ -390,14 +389,14 @@ public class NetscalerResource implements ServerResource {
throw new ExecutionException("Failed to get the hardware details of the Netscaler device at " + _ip);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to verify device type specified when matching with actuall device type due to " + e.getMessage());
}
}
@Override
public StartupCommand[] initialize() {
- StartupExternalLoadBalancerCommand cmd = new StartupExternalLoadBalancerCommand();
+ final StartupExternalLoadBalancerCommand cmd = new StartupExternalLoadBalancerCommand();
cmd.setName(_name);
cmd.setDataCenter(_zoneId);
cmd.setPod("");
@@ -452,14 +451,14 @@ public class NetscalerResource implements ServerResource {
return Answer.createUnsupportedCommandAnswer(cmd);
}
- String[] results = new String[cmd.getIpAddresses().length];
+ final String[] results = new String[cmd.getIpAddresses().length];
int i = 0;
try {
- IpAddressTO[] ips = cmd.getIpAddresses();
- for (IpAddressTO ip : ips) {
- long guestVlanTag = Long.parseLong(ip.getBroadcastUri());
- String vlanSelfIp = ip.getVlanGateway();
- String vlanNetmask = ip.getVlanNetmask();
+ final IpAddressTO[] ips = cmd.getIpAddresses();
+ for (final IpAddressTO ip : ips) {
+ final long guestVlanTag = Long.parseLong(ip.getBroadcastUri());
+ final String vlanSelfIp = ip.getVlanGateway();
+ final String vlanNetmask = ip.getVlanNetmask();
if (ip.isAdd()) {
// Add a new guest VLAN and its subnet and bind it to private interface
@@ -471,12 +470,12 @@ public class NetscalerResource implements ServerResource {
saveConfiguration();
results[i++] = ip.getPublicIp() + " - success";
- String action = ip.isAdd() ? "associate" : "remove";
+ final String action = ip.isAdd() ? "associate" : "remove";
if (s_logger.isDebugEnabled()) {
s_logger.debug("Netscaler load balancer " + _ip + " successfully executed IPAssocCommand to " + action + " IP " + ip);
}
}
- } catch (ExecutionException e) {
+ } catch (final ExecutionException e) {
s_logger.error("Netscaler loadbalancer " + _ip + " failed to execute IPAssocCommand due to " + e.getMessage());
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
@@ -490,31 +489,31 @@ public class NetscalerResource implements ServerResource {
private Answer execute(HealthCheckLBConfigCommand cmd, int numRetries) {
- List<LoadBalancerTO> hcLB = new ArrayList<LoadBalancerTO>();
+ final List<LoadBalancerTO> hcLB = new ArrayList<LoadBalancerTO>();
try {
if (_isSdx) {
return Answer.createUnsupportedCommandAnswer(cmd);
}
- LoadBalancerTO[] loadBalancers = cmd.getLoadBalancers();
+ final LoadBalancerTO[] loadBalancers = cmd.getLoadBalancers();
if (loadBalancers == null) {
return new HealthCheckLBConfigAnswer(hcLB);
}
- for (LoadBalancerTO loadBalancer : loadBalancers) {
- HealthCheckPolicyTO[] healthCheckPolicies = loadBalancer.getHealthCheckPolicies();
- if ((healthCheckPolicies != null) && (healthCheckPolicies.length > 0) && (healthCheckPolicies[0] != null)) {
- String nsVirtualServerName = generateNSVirtualServerName(loadBalancer.getSrcIp(), loadBalancer.getSrcPort());
+ for (final LoadBalancerTO loadBalancer : loadBalancers) {
+ final HealthCheckPolicyTO[] healthCheckPolicies = loadBalancer.getHealthCheckPolicies();
+ if (healthCheckPolicies != null && healthCheckPolicies.length > 0 && healthCheckPolicies[0] != null) {
+ final String nsVirtualServerName = generateNSVirtualServerName(loadBalancer.getSrcIp(), loadBalancer.getSrcPort());
- com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
+ final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName);
if (serviceBindings != null) {
- for (DestinationTO destination : loadBalancer.getDestinations()) {
- String nsServiceName = generateNSServiceName(destination.getDestIp(), destination.getDestPort());
- for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
+ for (final DestinationTO destination : loadBalancer.getDestinations()) {
+ final String nsServiceName = generateNSServiceName(destination.getDestIp(), destination.getDestPort());
+ for (final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
if (nsServiceName.equalsIgnoreCase(binding.get_servicename())) {
destination.setMonitorState(binding.get_curstate());
break;
@@ -526,14 +525,14 @@ public class NetscalerResource implements ServerResource {
}
}
- } catch (ExecutionException e) {
+ } catch (final ExecutionException e) {
s_logger.error("Failed to execute HealthCheckLBConfigCommand due to ", e);
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
} else {
return new HealthCheckLBConfigAnswer(hcLB);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
s_logger.error("Failed to execute HealthCheckLBConfigCommand due to ", e);
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
@@ -550,19 +549,19 @@ public class NetscalerResource implements ServerResource {
return Answer.createUnsupportedCommandAnswer(cmd);
}
- LoadBalancerTO[] loadBalancers = cmd.getLoadBalancers();
+ final LoadBalancerTO[] loadBalancers = cmd.getLoadBalancers();
if (loadBalancers == null) {
return new Answer(cmd);
}
- for (LoadBalancerTO loadBalancer : loadBalancers) {
- String srcIp = loadBalancer.getSrcIp();
- int srcPort = loadBalancer.getSrcPort();
- String lbProtocol = getNetScalerProtocol(loadBalancer);
- String lbAlgorithm = loadBalancer.getAlgorithm();
- String nsVirtualServerName = generateNSVirtualServerName(srcIp, srcPort);
- String nsMonitorName = generateNSMonitorName(srcIp, srcPort);
- LbSslCert sslCert = loadBalancer.getSslCert();
+ for (final LoadBalancerTO loadBalancer : loadBalancers) {
+ final String srcIp = loadBalancer.getSrcIp();
+ final int srcPort = loadBalancer.getSrcPort();
+ final String lbProtocol = getNetScalerProtocol(loadBalancer);
+ final String lbAlgorithm = loadBalancer.getAlgorithm();
+ final String nsVirtualServerName = generateNSVirtualServerName(srcIp, srcPort);
+ final String nsMonitorName = generateNSMonitorName(srcIp, srcPort);
+ final LbSslCert sslCert = loadBalancer.getSslCert();
if (loadBalancer.isAutoScaleVmGroupTO()) {
applyAutoScaleConfig(loadBalancer);
@@ -573,7 +572,7 @@ public class NetscalerResource implements ServerResource {
boolean deleteMonitor = false;
boolean destinationsToAdd = false;
boolean deleteCert = false;
- for (DestinationTO destination : loadBalancer.getDestinations()) {
+ for (final DestinationTO destination : loadBalancer.getDestinations()) {
if (!destination.isRevoked()) {
destinationsToAdd = true;
break;
@@ -589,10 +588,10 @@ public class NetscalerResource implements ServerResource {
}
// create a new monitor
- HealthCheckPolicyTO[] healthCheckPolicies = loadBalancer.getHealthCheckPolicies();
- if ((healthCheckPolicies != null) && (healthCheckPolicies.length > 0) && (healthCheckPolicies[0] != null)) {
+ final HealthCheckPolicyTO[] healthCheckPolicies = loadBalancer.getHealthCheckPolicies();
+ if (healthCheckPolicies != null && healthCheckPolicies.length > 0 && healthCheckPolicies[0] != null) {
- for (HealthCheckPolicyTO healthCheckPolicyTO : healthCheckPolicies) {
+ for (final HealthCheckPolicyTO healthCheckPolicyTO : healthCheckPolicies) {
if (!healthCheckPolicyTO.isRevoked()) {
addLBMonitor(nsMonitorName, lbProtocol, healthCheckPolicyTO);
hasMonitor = true;
@@ -604,27 +603,27 @@ public class NetscalerResource implements ServerResource {
}
- for (DestinationTO destination : loadBalancer.getDestinations()) {
+ for (final DestinationTO destination : loadBalancer.getDestinations()) {
- String nsServerName = generateNSServerName(destination.getDestIp());
- String nsServiceName = generateNSServiceName(destination.getDestIp(), destination.getDestPort());
+ final String nsServerName = generateNSServerName(destination.getDestIp());
+ final String nsServiceName = generateNSServiceName(destination.getDestIp(), destination.getDestPort());
if (!destination.isRevoked()) {
// add a new destination to deployed load balancing rule
// add a new server
if (!nsServerExists(nsServerName)) {
- com.citrix.netscaler.nitro.resource.config.basic.server nsServer = new com.citrix.netscaler.nitro.resource.config.basic.server();
+ final com.citrix.netscaler.nitro.resource.config.basic.server nsServer = new com.citrix.netscaler.nitro.resource.config.basic.server();
nsServer.set_name(nsServerName);
nsServer.set_ipaddress(destination.getDestIp());
apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.server.add(_netscalerService, nsServer);
- if ((apiCallResult.errorcode != 0) && (apiCallResult.errorcode != NitroError.NS_RESOURCE_EXISTS)) {
+ if (apiCallResult.errorcode != 0 && apiCallResult.errorcode != NitroError.NS_RESOURCE_EXISTS) {
throw new ExecutionException("Failed to add server " + destination.getDestIp() + " due to" + apiCallResult.message);
}
}
// create a new service using the server added
if (!nsServiceExists(nsServiceName)) {
- com.citrix.netscaler.nitro.resource.config.basic.service newService = new com.citrix.netscaler.nitro.resource.config.basic.service();
+ final com.citrix.netscaler.nitro.resource.config.basic.service newService = new com.citrix.netscaler.nitro.resource.config.basic.service();
newService.set_name(nsServiceName);
newService.set_port(destination.getDestPort());
newService.set_servername(nsServerName);
@@ -644,7 +643,7 @@ public class NetscalerResource implements ServerResource {
//bind service to load balancing virtual server
if (!nsServiceBindingExists(nsVirtualServerName, nsServiceName)) {
- com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding svcBinding =
+ final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding svcBinding =
new com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding();
svcBinding.set_name(nsVirtualServerName);
svcBinding.set_servicename(nsServiceName);
@@ -686,19 +685,19 @@ public class NetscalerResource implements ServerResource {
String previousCertKeyName = null;
if (sslCert.getChain() != null) {
- List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
+ final List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
// go from ROOT to intermediate CAs
- for (Certificate intermediateCert : Lists.reverse(chainList)) {
+ for (final Certificate intermediateCert : Lists.reverse(chainList)) {
- String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
- String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
- String intermediateCertFileName = intermediateCertKeyName + ".pem";
+ final String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
+ final String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
+ final String intermediateCertFileName = intermediateCertKeyName + ".pem";
if (!SSL.isSslCertKeyPresent(_netscalerService, intermediateCertKeyName)) {
- intermediateCert.getEncoded();
- StringWriter textWriter = new StringWriter();
- PEMWriter pemWriter = new PEMWriter(textWriter);
- pemWriter.writeObject(intermediateCert);
+ final PemObject pemObject = new PemObject(intermediateCert.getType(), intermediateCert.getEncoded());
+ final StringWriter textWriter = new StringWriter();
+ final PemWriter pemWriter = new PemWriter(textWriter);
+ pemWriter.writeObject(pemObject);
pemWriter.flush();
SSL.uploadCert(_ip, _username, _password, intermediateCertFileName, textWriter.toString().getBytes());
@@ -713,11 +712,11 @@ public class NetscalerResource implements ServerResource {
}
}
- String certFilename = generateSslCertName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
- String keyFilename = generateSslKeyName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
- String certKeyName = generateSslCertKeyName(sslCert.getFingerprint());
+ final String certFilename = generateSslCertName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
+ final String keyFilename = generateSslKeyName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
+ final String certKeyName = generateSslCertKeyName(sslCert.getFingerprint());
- ByteArrayOutputStream certDataStream = new ByteArrayOutputStream();
+ final ByteArrayOutputStream certDataStream = new ByteArrayOutputStream();
certDataStream.write(sslCert.getCert().getBytes());
if (!SSL.isSslCertKeyPresent(_netscalerService, certKeyName)) {
@@ -743,10 +742,10 @@ public class NetscalerResource implements ServerResource {
} else {
// remove a destination from the deployed load balancing rule
- com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
+ final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName);
if (serviceBindings != null) {
- for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
+ for (final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
if (nsServiceName.equalsIgnoreCase(binding.get_servicename())) {
// delete the binding
apiCallResult = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.delete(_netscalerService, binding);
@@ -765,8 +764,8 @@ public class NetscalerResource implements ServerResource {
}
// delete the server if there is no associated services
- server_service_binding[] services = server_service_binding.get(_netscalerService, nsServerName);
- if ((services == null) || (services.length == 0)) {
+ final server_service_binding[] services = server_service_binding.get(_netscalerService, nsServerName);
+ if (services == null || services.length == 0) {
apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.server.delete(_netscalerService, nsServerName);
if (apiCallResult.errorcode != 0) {
throw new ExecutionException("Failed to remove server:" + nsServerName + " due to " + apiCallResult.message);
@@ -779,24 +778,24 @@ public class NetscalerResource implements ServerResource {
}
} else {
// delete the implemented load balancing rule and its destinations
- lbvserver lbserver = getVirtualServerIfExisits(nsVirtualServerName);
+ final lbvserver lbserver = getVirtualServerIfExisits(nsVirtualServerName);
if (lbserver != null) {
//unbind the all services associated with this virtual server
- com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
+ final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding[] serviceBindings =
com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.get(_netscalerService, nsVirtualServerName);
if (serviceBindings != null) {
- for (com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
- String serviceName = binding.get_servicename();
+ for (final com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding binding : serviceBindings) {
+ final String serviceName = binding.get_servicename();
apiCallResult = com.citrix.netscaler.nitro.resource.config.lb.lbvserver_service_binding.delete(_netscalerService, binding);
if (apiCallResult.errorcode != 0) {
throw new ExecutionException("Failed to unbind service from the lb virtual server: " + nsVirtualServerName + " due to " +
apiCallResult.message);
}
- com.citrix.netscaler.nitro.resource.config.basic.service svc =
+ final com.citrix.netscaler.nitro.resource.config.basic.service svc =
com.citrix.netscaler.nitro.resource.config.basic.service.get(_netscalerService, serviceName);
- String nsServerName = svc.get_servername();
+ final String nsServerName = svc.get_servername();
// check if service is bound to any other virtual server
if (!isServiceBoundToVirtualServer(serviceName)) {
@@ -808,8 +807,8 @@ public class NetscalerResource implements ServerResource {
}
//delete the server if no more services attached
- server_service_binding[] services = server_service_binding.get(_netscalerService, nsServerName);
- if ((services == null) || (services.length == 0)) {
+ final server_service_binding[] services = server_service_binding.get(_netscalerService, nsServerName);
+ if (services == null || services.length == 0) {
apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.server.delete(_netscalerService, nsServerName);
if (apiCallResult.errorcode != 0) {
throw new ExecutionException("Failed to remove server:" + nsServerName + " due to " + apiCallResult.message);
@@ -827,9 +826,9 @@ public class NetscalerResource implements ServerResource {
}
if (sslCert != null && deleteCert) {
- String certFilename = generateSslCertName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
- String keyFilename = generateSslKeyName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
- String certKeyName = generateSslCertKeyName(sslCert.getFingerprint());
+ final String certFilename = generateSslCertName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
+ final String keyFilename = generateSslKeyName(sslCert.getFingerprint()) + ".pem"; //netscaler uses ".pem" format for "bundle" files
+ final String certKeyName = generateSslCertKeyName(sslCert.getFingerprint());
// unbind before deleting
if (nsVirtualServerExists(nsVirtualServerName) &&
@@ -852,13 +851,13 @@ public class NetscalerResource implements ServerResource {
*/
if (sslCert.getChain() != null) {
- List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
+ final List<Certificate> chainList = CertificateHelper.parseChain(sslCert.getChain());
//go from intermediate CAs to ROOT
- for (Certificate intermediateCert : chainList) {
+ for (final Certificate intermediateCert : chainList) {
- String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
- String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
- String intermediateCertFileName = intermediateCertKeyName + ".pem";
+ final String fingerPrint = CertificateHelper.generateFingerPrint(intermediateCert);
+ final String intermediateCertKeyName = generateSslCertKeyName(fingerPrint);
+ final String intermediateCertFileName = intermediateCertKeyName + ".pem";
if (SSL.isSslCertKeyPresent(_netscalerService, intermediateCertKeyName) &&
!SSL.isCaforCerts(_netscalerService, intermediateCertKeyName)) {
@@ -880,14 +879,14 @@ public class NetscalerResource implements ServerResource {
saveConfiguration();
return new Answer(cmd);
- } catch (ExecutionException e) {
+ } catch (final ExecutionException e) {
s_logger.error("Failed to execute LoadBalancerConfigCommand due to ", e);
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
} else {
return new Answer(cmd, e);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
s_logger.error("Failed to execute LoadBalancerConfigCommand due to ", e);
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
@@ -904,11 +903,11 @@ public class NetscalerResource implements ServerResource {
}
try {
- String vpxName = "Cloud-VPX-" + cmd.getLoadBalancerIP();
- String username = "admin";
- String password = "admin";
+ final String vpxName = "Cloud-VPX-" + cmd.getLoadBalancerIP();
+ final String username = "admin";
+ final String password = "admin";
- ns ns_obj = new ns();
+ final ns ns_obj = new ns();
ns_obj.set_name(vpxName);
ns_obj.set_ip_address(cmd.getLoadBalancerIP());
ns_obj.set_netmask(cmd.getNetmask());
@@ -926,12 +925,12 @@ public class NetscalerResource implements ServerResource {
// use the first VPX image of the available VPX images on the SDX to create an instance of VPX
// TODO: should enable the option to choose the template while adding the SDX device in to CloudStack
- xen_nsvpx_image[] vpxImages = xen_nsvpx_image.get(_netscalerSdxService);
+ final xen_nsvpx_image[] vpxImages = xen_nsvpx_image.get(_netscalerSdxService);
if (!(vpxImages != null && vpxImages.length >= 1)) {
new Answer(cmd, new ExecutionException("Failed to create VPX instance on the netscaler SDX device " + _ip +
" as there are no VPX images on SDX to use for creating VPX."));
}
- String imageName = vpxImages[0].get_file_name();
+ final String imageName = vpxImages[0].get_file_name();
ns_obj.set_image_name(imageName);
String publicIf = _publicInterface;
@@ -949,14 +948,14 @@ public class NetscalerResource implements ServerResource {
// wait for VPX instance to start-up
long startTick = System.currentTimeMillis();
- long startWaitMilliSeconds = 600000;
+ final long startWaitMilliSeconds = 600000;
while (!newVpx.get_instance_state().equalsIgnoreCase("up") && System.currentTimeMillis() - startTick < startWaitMilliSeconds) {
try {
Thread.sleep(10000);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
s_logger.debug("[ignored] interupted while waiting for netscaler to be 'up'.");
}
- ns refreshNsObj = new ns();
+ final ns refreshNsObj = new ns();
refreshNsObj.set_id(newVpx.get_id());
newVpx = ns.get(_netscalerSdxService, refreshNsObj);
}
@@ -969,19 +968,19 @@ public class NetscalerResource implements ServerResource {
// wait till NS service in side VPX is actually ready
startTick = System.currentTimeMillis();
boolean nsServiceUp = false;
- long nsServiceWaitMilliSeconds = 60000;
+ final long nsServiceWaitMilliSeconds = 60000;
while (System.currentTimeMillis() - startTick < nsServiceWaitMilliSeconds) {
try {
- nitro_service _netscalerService = new nitro_service(cmd.getLoadBalancerIP(), "https");
- _netscalerService.set_certvalidation(false);
- _netscalerService.set_hostnameverification(false);
- _netscalerService.set_credential(username, password);
- apiCallResult = _netscalerService.login();
+ final nitro_service netscalerService = new nitro_service(cmd.getLoadBalancerIP(), "https");
+ netscalerService.set_certvalidation(false);
+ netscalerService.set_hostnameverification(false);
+ netscalerService.set_credential(username, password);
+ apiCallResult = netscalerService.login();
if (apiCallResult.errorcode == 0) {
nsServiceUp = true;
break;
}
- } catch (Exception e) {
+ } catch (final Exception e) {
Thread.sleep(10000);
continue;
}
@@ -999,8 +998,8 @@ public class NetscalerResource implements ServerResource {
// However the VPX instances created will have interface range start from 10/1 but will only have as many interfaces enabled while creating the VPX instance
// So due to this, we need to map public & private interface on SDX to correct public & private interface of VPX
- int publicIfnum = Integer.parseInt(_publicInterface.substring(_publicInterface.lastIndexOf("/") + 1));
- int privateIfnum = Integer.parseInt(_privateInterface.substring(_privateInterface.lastIndexOf("/") + 1));
+ final int publicIfnum = Integer.parseInt(_publicInterface.substring(_publicInterface.lastIndexOf("/") + 1));
+ final int privateIfnum = Integer.parseInt(_privateInterface.substring(_privateInterface.lastIndexOf("/") + 1));
if (_publicInterface.startsWith("10/") && _privateInterface.startsWith("10/")) {
if (publicIfnum == privateIfnum) {
@@ -1034,7 +1033,7 @@ public class NetscalerResource implements ServerResource {
return new CreateLoadBalancerApplianceAnswer(cmd, true, "provisioned VPX instance", "NetscalerVPXLoadBalancer", "Netscaler", new NetscalerResource(),
publicIf, privateIf, _username, _password);
- } catch (Exception e) {
+ } catch (final Exception e) {
if (shouldRetry(numRetries)) {
return retry(cmd, numRetries);
}
@@ -1045,15 +1044,15 @@ public class NetscalerResource implements ServerResource {
private Answer execute(GlobalLoadBalancerConfigCommand gslbCmd, int numRetries) {
- String lbMethod = gslbCmd.getLoadBalancerMethod();
- String persistenceType = gslbCmd.getPersistenceType();
- String serviceType = gslbCmd.getServiceType();
- boolean forRevoke = gslbCmd.isForRevoke();
- long gslbId = gslbCmd.getGslbId();
- List<SiteLoadBalancerConfig> sites = gslbCmd.getSiteDetails();
+ final String lbMethod = gslbCmd.getLoadBalancerMethod();
+ final String persistenceType = gslbCmd.getPersistenceType();
+ final String serviceType = gslbCmd.getServiceType();
+ final boolean forRevoke = gslbCmd.isForRevoke();
+ final long gslbId = gslbCmd.getGslbId();
+ final List<SiteLoadBalancerConfig> sites = gslbCmd.getSiteDetails();
- String domainName = gslbCmd.getDomainName();
- String vserverName = GSLB.generateVirtualServerName(domainName);
+ final String domainName = gslbCmd.getDomainName();
+ final String vserverName = GSLB.generateVirtualServerName(domainName);
try {
@@ -1063,17 +1062,17 @@ public class NetscalerResource implements ServerResource {
GSLB.createVirtualServer(_netscalerService, vserverName, lbMethod, persistenceType, gslbId, serviceType);
if (sites != null) { // check if there are any sites that are participating in global load balancing
- for (SiteLoadBalancerConfig site : sites) {
+ for (final SiteLoadBalancerConfig site : sites) {
- String sitePrivateIP = site.getGslbProviderPrivateIp();
- String sitePublicIP = site.getGslbProviderPublicIp();
- String servicePublicIp = site.getServicePublicIp();
- String servicePublicPort = site.getServicePort();
- String siteName = GSLB.generateUniqueSiteName(sitePrivateIP, sitePublicIP, site.getDataCenterId());
+ final String sitePrivateIP = site.getGslbProviderPrivateIp();
+ final String sitePublicIP = site.getGslbProviderPublicIp();
+ final String servicePublicIp = site.getServicePublicIp();
+ final String servicePublicPort = site.getServicePort();
+ final String siteName = GSLB.generateUniqueSiteName(sitePrivateIP, sitePublicIP, site.getDataCenterId());
// Add/Delete GSLB local and remote sites that are part of GSLB virtual server
if (!site.forRevoke()) {
- String siteType = (site.isLocal()) ? "LOCAL" : "REMOTE";
+ final String siteType = site.isLocal() ? "LOCAL" : "REMOTE";
if (GSLB.getSiteObject(_netscalerService, siteName) != null) {
GSLB.updateSite(_netscalerService, siteType, siteName, site.getGslbProviderPrivateIp(), site.getGslbProviderPublicIp());
} else {
@@ -1082,8 +1081,8 @@ public class NetscalerResource implements ServerResource {
}
// Add/Delete GSLB service corresponding the service running on each site
- String serviceName = GSLB.generateUniqueServiceName(siteName, servicePublicIp, servicePublicPort);
- String monitorName = GSLB.generateGslbServiceMonitorName(servicePublicIp);
+ final String serviceName = GSLB.generateUniqueServiceName(siteName, servicePublicIp, servicePublicPort);
+ final String monitorName = GSLB.generateGslbServiceMonitorName(servicePublicIp);
if (!site.forRevoke()) {
// create a 'gslbservice' object
GSLB.createService(_netscalerService, serviceName, site.getServiceType(), servicePublicIp, servicePublicPort, siteName);
@@ -1127,15 +1126,15 @@ public class NetscalerResource implements ServerResource {
GSLB.deleteVserverDomainBinding(_netscalerService, vserverName, domainName);
if (sites != null) {
- for (SiteLoadBalancerConfig site : sites) {
+ for (final SiteLoadBalancerConfig site : sites) {
- String sitePrivateIP = site.getGslbProviderPrivateIp();
- String sitePublicIP = site.getGslbProviderPublicIp();
- String servicePublicIp = site.getServicePublicIp();
- String servicePublicPort = site.getServicePort();
- String siteName = GSLB.generateUniqueSiteName(sitePrivateIP, sitePublicIP, site.getDataCenterId());
- String serviceName = GSLB.generateUniqueServiceName(siteName, servicePublicIp, servicePublicPort);
- String monitorName = GSLB.generateGslbServiceMonitorName(servicePublicIp);
+ final String sitePrivateIP = site.getGslbProviderPrivateIp();
+ final String sitePublicIP = site.getGslbProviderPublicIp();
+ final String servicePublicIp = site.getServicePublicIp();
+ final String servicePublicPort = site.getServicePort();
+ final String siteName = GSLB.generateUniqueSiteName(sitePrivateIP, sitePublicIP, site.getDataCenterId());
+ final String serviceName = GSLB.generateUniqueServiceName(siteName, servicePublicIp, servicePublicPort);
+ final String monitorName = GSLB.generateGslbServiceMonitorName(servicePublicIp);
// delete GSLB service and GSLB monitor binding
GSLB.deleteGslbServiceGslbMonitorBinding(_netscalerService, monitorName, serviceName);
@@ -1160,8 +1159,8 @@ public class NetscalerResource implements ServerResource {
saveConfiguration();
- } catch (Exception e) {
- String errMsg = "Failed to apply GSLB configuration due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to apply GSLB configuration due to " + e.getMessage();
if (shouldRetry(numRetries)) {
return retry(gslbCmd, numRetries);
}
@@ -1194,7 +1193,7 @@ public class NetscalerResource implements ServerResource {
isUpdateSite = true;
}
- assert ("LOCAL".equalsIgnoreCase(siteType) || "REMOTE".equalsIgnoreCase(siteType));
+ assert "LOCAL".equalsIgnoreCase(siteType) || "REMOTE".equalsIgnoreCase(siteType);
site.set_sitetype(siteType);
site.set_sitename(siteName);
site.set_siteipaddress(siteIP);
@@ -1210,8 +1209,8 @@ public class NetscalerResource implements ServerResource {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Successfully created GSLB site: " + siteName);
}
- } catch (Exception e) {
- String errMsg = "Failed to create GSLB site: " + siteName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to create GSLB site: " + siteName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1222,9 +1221,9 @@ public class NetscalerResource implements ServerResource {
// delete 'gslbsite' object representing a site
private static void deleteSite(nitro_service client, String siteName) throws ExecutionException {
try {
- gslbsite site = getSiteObject(client, siteName);
+ final gslbsite site = getSiteObject(client, siteName);
if (site != null) {
- gslbsite_gslbservice_binding[] serviceBindings = gslbsite_gslbservice_binding.get(client, siteName);
+ final gslbsite_gslbservice_binding[] serviceBindings = gslbsite_gslbservice_binding.get(client, siteName);
if (serviceBindings != null && serviceBindings.length > 0) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("There are services associated with GSLB site: " + siteName + " so ignoring site deletion");
@@ -1239,8 +1238,8 @@ public class NetscalerResource implements ServerResource {
s_logger.warn("Ignoring delete request for non existing GSLB site: " + siteName);
}
}
- } catch (Exception e) {
- String errMsg = "Failed to delete GSLB site: " + siteName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to delete GSLB site: " + siteName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1259,7 +1258,7 @@ public class NetscalerResource implements ServerResource {
}
return;
}
- assert ("LOCAL".equalsIgnoreCase(siteType) || "REMOTE".equalsIgnoreCase(siteType));
+ assert "LOCAL".equalsIgnoreCase(siteType) || "REMOTE".equalsIgnoreCase(siteType);
site.set_sitetype(siteType);
site.set_sitename(siteName);
site.set_siteipaddress(siteIP);
@@ -1273,8 +1272,8 @@ public class NetscalerResource implements ServerResource {
s_logger.debug("Successfully updated GSLB site: " + siteName);
}
- } catch (Exception e) {
- String errMsg = "Failed to update GSLB site: " + siteName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to update GSLB site: " + siteName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1328,8 +1327,8 @@ public class NetscalerResource implements ServerResource {
s_logger.debug("Successfully added GSLB virtual server: " + vserverName);
}
- } catch (Exception e) {
- String errMsg = "Failed to add GSLB virtual server: " + vserverName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to add GSLB virtual server: " + vserverName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1340,7 +1339,7 @@ public class NetscalerResource implements ServerResource {
// delete 'gslbvserver' object representing a globally load balanced service
private static void deleteVirtualServer(nitro_service client, String vserverName) throws ExecutionException {
try {
- gslbvserver vserver = getVserverObject(client, vserverName);
+ final gslbvserver vserver = getVserverObject(client, vserverName);
if (vserver != null) {
gslbvserver.delete(client, vserver);
if (s_logger.isDebugEnabled()) {
@@ -1351,63 +1350,8 @@ public class NetscalerResource implements ServerResource {
s_logger.warn("Ignoring delete request for non existing GSLB virtual server: " + vserverName);
}
}
- } catch (Exception e) {
- String errMsg = "Failed to delete GSLB virtual server: " + vserverName + " due to " + e.getMessage();
- if (s_logger.isDebugEnabled()) {
- s_logger.debug(errMsg);
- }
- throw new ExecutionException(errMsg);
- }
- }
-
- // enable 'gslbvserver' object representing a globally load balanced service
- private static void enableVirtualServer(nitro_service client, String vserverName) throws ExecutionException {
- try {
- gslbvserver vserver = getVserverObject(client, vserverName);
- if (vserver != null) {
- gslbvserver.enable(client, vserver);
- }
- } catch (Exception e) {
- String errMsg = "Failed to enable GSLB virtual server: " + vserverName + " due to " + e.getMessage();
- if (s_logger.isDebugEnabled()) {
- s_logger.debug(errMsg);
- }
- throw new ExecutionException(errMsg);
- }
- }
-
- // disable 'gslbvserver' object representing a globally load balanced service
- private static void disableVirtualServer(nitro_service client, String vserverName) throws ExecutionException {
- try {
- gslbvserver vserver = getVserverObject(client, vserverName);
- if (vserver != null) {
- gslbvserver.disable(client, vserver);
- }
- } catch (Exception e) {
- String errMsg = "Failed to disable GSLB virtual server: " + vserverName + " due to " + e.getMessage();
- if (s_logger.isDebugEnabled()) {
- s_logger.debug(errMsg);
- }
- throw new ExecutionException(errMsg);
- }
- }
-
- // update 'gslbvserver' object representing a globally load balanced service
- private static void updateVirtualServer(nitro_service client, String vserverName, String lbMethod, String persistenceType, String serviceType)
- throws ExecutionException {
- try {
- gslbvserver vServer = getVserverObject(client, vserverName);
- if (vServer != null) {
- vServer.set_lbmethod(lbMethod);
- vServer.set_persistencetype(persistenceType);
- vServer.set_servicetype(serviceType);
- gslbvserver.update(client, vServer);
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Successfully updated GSLB virtual server: " + vserverName);
- }
- }
- } catch (Exception e) {
- String errMsg = "Failed to update GSLB virtual server: " + vserverName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to delete GSLB virtual server: " + vserverName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1421,15 +1365,15 @@ public class NetscalerResource implements ServerResource {
try {
gslbservice service;
service = getServiceObject(client, serviceName);
- String gslbServerName = generateGslbServerName(serviceIp);
+ final String gslbServerName = generateGslbServerName(serviceIp);
if (!gslbServerExists(client, gslbServerName)) {
base_response apiCallResult;
- com.citrix.netscaler.nitro.resource.config.basic.server nsServer = new com.citrix.netscaler.nitro.resource.config.basic.server();
+ final com.citrix.netscaler.nitro.resource.config.basic.server nsServer = new com.citrix.netscaler.nitro.resource.config.basic.server();
nsServer.set_name(gslbServerName);
nsServer.set_ipaddress(serviceIp);
apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.server.add(client, nsServer);
- if ((apiCallResult.errorcode != 0) && (apiCallResult.errorcode != NitroError.NS_RESOURCE_EXISTS)) {
+ if (apiCallResult.errorcode != 0 && apiCallResult.errorcode != NitroError.NS_RESOURCE_EXISTS) {
throw new ExecutionException("Failed to add server " + gslbServerName + " due to" + apiCallResult.message);
}
}
@@ -1443,7 +1387,7 @@ public class NetscalerResource implements ServerResource {
service.set_sitename(siteName);
service.set_servername(gslbServerName);
- int port = Integer.parseInt(servicePort);
+ final int port = Integer.parseInt(servicePort);
service.set_port(port);
service.set_servicename(serviceName);
service.set_servicetype(serviceType);
@@ -1457,8 +1401,8 @@ public class NetscalerResource implements ServerResource {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Successfully created service: " + serviceName + " at site: " + siteName);
}
- } catch (Exception e) {
- String errMsg = "Failed to created service: " + serviceName + " at site: " + siteName + " due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to created service: " + serviceName + " at site: " + siteName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1468,7 +1412,7 @@ public class NetscalerResource implements ServerResource {
private static void deleteService(nitro_service client, String serviceName) throws ExecutionException {
try {
- gslbservice service = getServiceObject(client, serviceName);
+ final gslbservice service = getServiceObject(client, serviceName);
if (service != null) {
gslbservice.delete(client, serviceName);
if (s_logger.isDebugEnabled()) {
@@ -1479,34 +1423,8 @@ public class NetscalerResource implements ServerResource {
s_logger.warn("Ignoring delete request for non existing service: " + serviceName);
}
}
- } catch (Exception e) {
- String errMsg = "Failed to delete service: " + serviceName + " due to " + e.getMessage();
- if (s_logger.isDebugEnabled()) {
- s_logger.debug(errMsg);
- }
- throw new ExecutionException(errMsg);
- }
- }
-
- private static void updateService(nitro_service client, String serviceName, String serviceType, String publicIp, String publicPort, String siteName)
- throws ExecutionException {
- try {
- gslbservice service;
- service = getServiceObject(client, serviceName);
-
- if (service != null) {
- service.set_sitename(siteName);
- service.set_publicip(publicIp);
- service.set_publicport(Integer.getInteger(publicPort));
- service.set_servicename(serviceName);
- service.set_servicetype(serviceType);
- gslbservice.update(client, service);
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Successfully updated service: " + serviceName + " at site: " + siteName);
- }
- }
- } catch (Exception e) {
- String errMsg = "Failed to update service: " + serviceName + " at site: " + siteName + "due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to delete service: " + serviceName + " due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1517,8 +1435,8 @@ public class NetscalerResource implements ServerResource {
private static void createVserverServiceBinding(nitro_service client, String serviceName, String vserverName, long weight) throws ExecutionException {
String errMsg;
try {
- assert (weight >= 1 && weight <= 100);
- gslbvserver_gslbservice_binding binding = new gslbvserver_gslbservice_binding();
+ assert weight >= 1 && weight <= 100;
+ final gslbvserver_gslbservice_binding binding = new gslbvserver_gslbservice_binding();
binding.set_name(vserverName);
binding.set_servicename(serviceName);
binding.set_weight(weight);
@@ -1526,7 +1444,7 @@ public class NetscalerResource implements ServerResource {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Successfully created service: " + serviceName + " and virtual server: " + vserverName + " binding");
}
- } catch (nitro_exception ne) {
+ } catch (final nitro_exception ne) {
if (ne.getErrorCode() == 273) {
return;
}
@@ -1535,7 +1453,7 @@ public class NetscalerResource implements ServerResource {
s_logger.debug(errMsg);
}
throw new ExecutionException(errMsg);
- } catch (Exception e) {
+ } catch (final Exception e) {
errMsg = "Failed to create service: " + serviceName + " and virtual server: " + vserverName + " binding due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
@@ -1546,9 +1464,9 @@ public class NetscalerResource implements ServerResource {
private static void deleteVserverServiceBinding(nitro_service client, String serviceName, String vserverName) throws ExecutionException {
try {
- gslbvserver_gslbservice_binding[] bindings = gslbvserver_gslbservice_binding.get(client, vserverName);
+ final gslbvserver_gslbservice_binding[] bindings = gslbvserver_gslbservice_binding.get(client, vserverName);
if (bindings != null) {
- for (gslbvserver_gslbservice_binding binding : bindings) {
+ for (final gslbvserver_gslbservice_binding binding : bindings) {
if (binding.get_servicename().equalsIgnoreCase(serviceName) && binding.get_name().equals(vserverName)) {
gslbvserver_gslbservice_binding.delete(client, binding);
if (s_logger.isDebugEnabled()) {
@@ -1558,8 +1476,8 @@ public class NetscalerResource implements ServerResource {
}
}
}
- } catch (Exception e) {
- String errMsg = "Failed to create service: " + serviceName + " and virtual server: " + vserverName + " binding due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to create service: " + serviceName + " and virtual server: " + vserverName + " binding due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1571,7 +1489,7 @@ public class NetscalerResource implements ServerResource {
private static void createVserverDomainBinding(nitro_service client, String vserverName, String domainName) throws ExecutionException {
String errMsg;
try {
- gslbvserver_domain_binding binding = new gslbvserver_domain_binding();
+ final gslbvserver_domain_binding binding = new gslbvserver_domain_binding();
binding.set_domainname(domainName);
binding.set_name(vserverName);
gslbvserver_domain_binding.add(client, binding);
@@ -1579,12 +1497,12 @@ public class NetscalerResource implements ServerResource {
s_logger.debug("Successfully added virtual server: " + vserverName + " domain name: " + domainName + " binding");
}
return;
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
if (e.getErrorCode() == NitroError.NS_GSLB_DOMAIN_ALREADY_BOUND) {
return;
}
errMsg = e.getMessage();
- } catch (Exception e) {
+ } catch (final Exception e) {
errMsg = e.getMessage();
}
errMsg = "Failed to create virtual server: " + vserverName + " domain name: " + domainName + " binding" + errMsg;
@@ -1596,9 +1514,9 @@ public class NetscalerResource implements ServerResource {
private static void deleteVserverDomainBinding(nitro_service client, String vserverName, String domainName) throws ExecutionException {
try {
- gslbvserver_domain_binding[] bindings = gslbvserver_domain_binding.get(client, vserverName);
+ final gslbvserver_domain_binding[] bindings = gslbvserver_domain_binding.get(client, vserverName);
if (bindings != null) {
- for (gslbvserver_domain_binding binding : bindings) {
+ for (final gslbvserver_domain_binding binding : bindings) {
if (binding.get_domainname().equalsIgnoreCase(domainName)) {
gslbvserver_domain_binding.delete(client, binding);
if (s_logger.isDebugEnabled()) {
@@ -1608,8 +1526,8 @@ public class NetscalerResource implements ServerResource {
}
}
}
- } catch (Exception e) {
- String errMsg = "Failed to delete virtual server: " + vserverName + " and domain " + domainName + " binding due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to delete virtual server: " + vserverName + " and domain " + domainName + " binding due to " + e.getMessage();
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1619,19 +1537,19 @@ public class NetscalerResource implements ServerResource {
private static void createGslbServiceMonitor(nitro_service nsService, String servicePublicIp, String serviceName) throws ExecutionException {
try {
- lbmonitor newmonitor = new lbmonitor();
- String monitorName = generateGslbServiceMonitorName(servicePublicIp);
+ final lbmonitor newmonitor = new lbmonitor();
+ final String monitorName = generateGslbServiceMonitorName(servicePublicIp);
newmonitor.set_type("TCP");
newmonitor.set_servicename(serviceName);
newmonitor.set_monitorname(monitorName);
newmonitor.set_state("ENABLED");
lbmonitor.add(nsService, newmonitor);
- } catch (nitro_exception ne) {
+ } catch (final nitro_exception ne) {
if (ne.getErrorCode() == NitroError.NS_RESOURCE_EXISTS) {
return;
}
- } catch (Exception e) {
- String errMsg = "Failed to create GSLB monitor for service public ip" + servicePublicIp;
+ } catch (final Exception e) {
+ final String errMsg = "Failed to create GSLB monitor for service public ip" + servicePublicIp;
if (s_logger.isDebugEnabled()) {
s_logger.debug(errMsg);
}
@@ -1641,18 +1559,18 @@ public class NetscalerResource implements ServerResource {
private static void deleteGslbServiceMonitor(nitro_service nsService, String monitorName) throws ExecutionException {
try {
- lbmonitor serviceMonitor = lbmonitor.get(nsService, monitorName);
+ final lbmonitor serviceMonitor = lbmonitor.get(nsService, monitorName);
if (serviceMonitor != null) {
lbmonitor.delete(nsService, serviceMonitor);
}
- } catch (nitro_exception ne) {
+ } catch (final nitro_exception ne) {
if (ne.getErrorCode() != NitroError.NS_RESOURCE_NOT_EXISTS) {
- String errMsg = "Failed to delete monitor " + monitorName + " for GSLB service due to " + ne.getMessage();
+ final String errMsg = "Failed to delete monitor " + monitorName + " for GSLB service due to " + ne.getMessage();
s_logger.debug(errMsg);
throw new com.cloud.utils.exception.ExecutionException(errMsg);
}
- } catch (Exception e) {
- String errMsg = "Failed to delete monitor " + monitorName + " for GSLB service due to " + e.getMessage();
+ } catch (final Exception e) {
+ final String errMsg = "Failed to delete monitor " + monitorName + " for GSLB service due to " + e.getMessage();
s_logger.debug(errMsg);
throw new com.cloud.utils.exception.ExecutionException(errMsg);
}
@@ -1660,11 +1578,11 @@ public class NetscalerResource implements ServerResource {
private static void createGslbServiceGslbMonitorBinding(nitro_service nsService, String monitorName, String serviceName) {
try {
- gslbservice_lbmonitor_binding monitorBinding = new gslbservice_lbmonitor_binding();
+ final gslbservice_lbmonitor_binding monitorBinding = new gslbservice_lbmonitor_binding();
monitorBinding.set_monitor_name(monitorName);
monitorBinding.set_servicename(serviceName);
gslbservice_lbmonitor_binding.add(nsService, monitorBinding);
- } catch (Exception e) {
+ } catch (final Exception e) {
// TODO: Nitro API version 10.* is not compatible for NetScalers 9.*, so may fail
// against NetScaler version lesser than 10 hence ignore the exception
s_logger.warn("Failed to bind monitor to GSLB service due to " + e.getMessage());
@@ -1673,16 +1591,16 @@ public class NetscalerResource implements ServerResource {
private static void deleteGslbServiceGslbMonitorBinding(nitro_service nsService, String monitorName, String serviceName) {
try {
- gslbservice_lbmonitor_binding[] monitorBindings = gslbservice_lbmonitor_binding.get(nsService, serviceName);
+ final gslbservice_lbmonitor_binding[] monitorBindings = gslbservice_lbmonitor_binding.get(nsService, serviceName);
if (monitorBindings != null && monitorBindings.length > 0) {
- for (gslbservice_lbmonitor_binding binding : monitorBindings) {
+ for (final gslbservice_lbmonitor_binding binding : monitorBindings) {
if (binding.get_monitor_name().equalsIgnoreCase(monitorName)) {
s_logger.info("Found a binding between monitor " + binding.get_monitor_name() + " and " + binding.get_servicename());
gslbservice_lbmonitor_binding.delete(nsService, binding);
}
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
s_logger.debug("Failed to delete GSLB monitor " + monitorName + " and GSLB service " + serviceName + " binding due to " + e.getMessage() +
" but moving on ..., will be cleaned up as part of GSLB " + " service delete any way..");
}
@@ -1691,11 +1609,11 @@ public class NetscalerResource implements ServerResource {
// get 'gslbsite' object corresponding to a site name
private static gslbsite getSiteObject(nitro_service client, String siteName) {
try {
- gslbsite site = gslbsite.get(client, siteName);
+ final gslbsite site = gslbsite.get(client, siteName);
if (site != null) {
return site;
}
- } catch (Exception e) {
+ } catch (final Exception e) {
s_logger.info("[ignored]"
+ "error getting site: " + e.getLocalizedMessage());
}
@@ -1704,18 +1622,18 @@ public class NetscalerResource implements ServerResource {
private static gslbvserver getVserverObject(nitro_service client, String vserverName) {
try {
- gslbvserver vserver = gslbvserver.get(client, vserverName);
+ final gslbvserver vserver = gslbvserver.get(client, vserverName);
return vserver;
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
private static gslbservice getServiceObject(nitro_service client, String serviceName) {
try {
- gslbservice service = gslbservice.get(client, serviceName);
+ final gslbservice service = gslbservice.get(client, serviceName);
return service;
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
@@ -1743,13 +1661,13 @@ public class NetscalerResource implements ServerResource {
} else {
return false;
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
if (e.getErrorCode() == NitroError.NS_RESOURCE_NOT_EXISTS) {
return false;
} else {
throw new ExecutionException("Failed to verify Server " + serverName + " exists on the NetScaler device due to " + e.getMessage());
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to verify Server " + serverName + " exists on the NetScaler device due to " + e.getMessage());
}
}
@@ -1759,7 +1677,7 @@ public class NetscalerResource implements ServerResource {
}
private static String genGslbObjectName(Object... args) {
- StringBuffer buff = new StringBuffer();
+ final StringBuffer buff = new StringBuffer();
for (int i = 0; i < args.length; i++) {
buff.append(args[i]);
if (i != args.length - 1) {
@@ -1778,14 +1696,15 @@ public class NetscalerResource implements ServerResource {
private static boolean isSslCertKeyPresent(nitro_service ns, String certKeyName) throws ExecutionException {
- String filter = "certkey:" + certKeyName;
+ final String filter = "certkey:" + certKeyName;
try {
- if (sslcertkey.count_filtered(ns, filter) > 0)
+ if (sslcertkey.count_filtered(ns, filter) > 0) {
return true;
- } catch (nitro_exception e) {
+ }
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to get certkey " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to get certkey " + e.getMessage());
}
@@ -1795,13 +1714,13 @@ public class NetscalerResource implements ServerResource {
private static void deleteSslCertKey(nitro_service ns, String certKeyName) throws ExecutionException {
try {
- sslcertkey certkey = new sslcertkey();
+ final sslcertkey certkey = new sslcertkey();
certkey.set_certkey(certKeyName);
sslcertkey.delete(ns, certkey);
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to delete certkey " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to delete certkey " + e.getMessage());
}
@@ -1818,12 +1737,13 @@ public class NetscalerResource implements ServerResource {
private static void createSslCertKey(nitro_service ns, String certFilename, String keyFilename, String certKeyName, String password) throws ExecutionException {
s_logger.debug("Adding cert to netscaler");
try {
- sslcertkey certkey = new sslcertkey();
+ final sslcertkey certkey = new sslcertkey();
certkey.set_certkey(certKeyName);
certkey.set_cert(SSL_CERT_PATH + certFilename);
- if (keyFilename != null)
+ if (keyFilename != null) {
certkey.set_key(SSL_CERT_PATH + keyFilename);
+ }
if (password != null) {
certkey.set_passplain(password);
@@ -1831,44 +1751,25 @@ public class NetscalerResource implements ServerResource {
certkey.perform_operation(ns);
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to add certkey binding " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to add certkey binding " + e.getMessage());
}
}
- public static void updateCertKey(nitro_service ns, String certKeyName, String cert, String key, String password) throws ExecutionException {
- try {
- sslcertkey certkey = sslcertkey.get(ns, certKeyName);
- if (cert != null)
- certkey.set_cert(cert);
- if (key != null)
- certkey.set_key(cert);
- if (password != null)
- certkey.set_passplain(cert);
-
- sslcertkey.change(ns, certkey);
-
- } catch (nitro_exception e) {
- throw new ExecutionException("Failed to update ssl on load balancer due to " + e.getMessage());
- } catch (Exception e) {
- throw new ExecutionException("Failed to update ssl on load balancer due to " + e.getMessage());
- }
- }
-
private static void bindCertKeyToVserver(nitro_service ns, String certKeyName, String vserver) throws ExecutionException {
s_logger.debug("Adding cert to netscaler");
try {
- sslvserver_sslcertkey_binding cert_binding = new sslvserver_sslcertkey_binding();
+ final sslvserver_sslcertkey_binding cert_binding = new sslvserver_sslcertkey_binding();
cert_binding.set_certkeyname(certKeyName);
cert_binding.set_vservername(vserver);
cert_binding.perform_operation(ns);
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to bind certkey to vserver due to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to bind certkey to vserver due to " + e.getMessage());
}
}
@@ -1876,14 +1777,14 @@ public class NetscalerResource implements ServerResource {
private static void unbindCertKeyFromVserver(nitro_service ns, String certKeyName, String vserver) throws ExecutionException {
try {
- sslvserver_sslcertkey_binding cert_binding = new sslvserver_sslcertkey_binding();
+ final sslvserver_sslcertkey_binding cert_binding = new sslvserver_sslcertkey_binding();
cert_binding.set_certkeyname(certKeyName);
cert_binding.set_vservername(vserver);
sslvserver_sslcertkey_binding.delete(ns, cert_binding);
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to unbind certkey to vserver due to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to unbind certkey to vserver due to " + e.getMessage());
}
@@ -1892,7 +1793,7 @@ public class NetscalerResource implements ServerResource {
private static void uploadCert(String nsIp, String user, String password, String certFilename, byte[] certData) throws ExecutionException {
try {
SshHelper.scpTo(nsIp, SSH_PORT, user, null, password, SSL_CERT_PATH, certData, certFilename, null);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to copy private key to device " + e.getMessage());
}
}
@@ -1900,7 +1801,7 @@ public class NetscalerResource implements ServerResource {
private static void uploadKey(String nsIp, String user, String password, String keyFilename, byte[] keyData) throws ExecutionException {
try {
SshHelper.scpTo(nsIp, SSH_PORT, user, null, password, SSL_CERT_PATH, keyData, keyFilename, null);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to copy private key to device " + e.getMessage());
}
}
@@ -1910,47 +1811,31 @@ public class NetscalerResource implements ServerResource {
return;
}
try {
- base_response result = ns.enable_features(new String[] {"SSL"});
- if (result.errorcode != 0)
+ final base_response result = ns.enable_features(new String[] {"SSL"});
+ if (result.errorcode != 0) {
throw new ExecutionException("Unable to enable SSL on LB");
- } catch (nitro_exception e) {
+ }
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to enable ssl feature on load balancer due to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to enable ssl feature on load balancer due to " + e.getMessage());
}
}
- public static boolean checkSslFeature(nitro_service ns) throws ExecutionException {
- try {
- String[] features = ns.get_enabled_features();
- if (features != null) {
- for (String feature : features) {
- if (feature.equalsIgnoreCase("SSL")) {
- return true;
- }
- }
- }
- return false;
- } catch (nitro_exception e) {
- throw new ExecutionException("Failed to check ssl feature on load balancer due to " + e.getMessage());
- } catch (Exception e) {
- throw new ExecutionException("Failed to check ssl feature on load balancer due to " + e.getMessage());
- }
- }
-
public static boolean certLinkExists(nitro_service ns, String userCertName, String caCertName) throws ExecutionException {
try {
// check if there is a link from userCertName to caCertName
- sslcertkey userCert = sslcertkey.get(ns, userCertName);
- String nsCaCert = userCert.get_linkcertkeyname();
+ final sslcertkey userCert = sslcertkey.get(ns, userCertName);
+ final String nsCaCert = userCert.get_linkcertkeyname();
- if (nsCaCert != null && nsCaCert.equals(caCertName))
+ if (nsCaCert != null && nsCaCert.equals(caCertName)) {
return true;
+ }
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to check cert link on load balancer to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to check cert link on load balancer due to " + e.getMessage());
}
return false;
@@ -1961,19 +1846,19 @@ public class NetscalerResource implements ServerResource {
// the assumption is that that both userCertName and caCertName are present on NS
- sslcertkey caCert = sslcertkey.get(ns, caCertName);
- sslcertkey userCert = sslcertkey.get(ns, userCertName);
+ final sslcertkey caCert = sslcertkey.get(ns, caCertName);
+ final sslcertkey userCert = sslcertkey.get(ns, userCertName);
- sslcertkey linkResource = new sslcertkey();
+ final sslcertkey linkResource = new sslcertkey();
// link user cert to CA cert
linkResource.set_certkey(userCert.get_certkey());
linkResource.set_linkcertkeyname(caCert.get_certkey());
sslcertkey.link(ns, linkResource);
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to check cert link on load balancer to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to check cert link on load balancer due to " + e.getMessage());
}
@@ -1982,14 +1867,14 @@ public class NetscalerResource implements ServerResource {
public static boolean isCaforCerts(nitro_service ns, String caCertName) throws ExecutionException {
// check if this certificate serves as a CA for other certificates
try {
- sslcertlink[] childLinks = sslcertlink.get_filtered(ns, "linkcertkeyname:" + caCertName);
+ final sslcertlink[] childLinks = sslcertlink.get_filtered(ns, "linkcertkeyname:" + caCertName);
if (childLinks != null && childLinks.length > 0) {
return true;
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new ExecutionException("Failed to check cert link on load balancer to " + e.getMessage());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ExecutionException("Failed to check cert link on load balancer due to " + e.getMessage());
}
return false;
@@ -1999,14 +1884,14 @@ public class NetscalerResource implements ServerResource {
public static boolean isBoundToVserver(nitro_service ns, String certKeyName, String nsVirtualServerName) throws ExecutionException {
try {
- sslcertkey_sslvserver_binding[] cert_vs_binding = sslcertkey_sslvserver_binding.get_filtered(ns, certKeyName, "vservername:" + nsVirtualServerName);
+ final sslcertkey_sslvserver_binding[] cert_vs_binding = sslcertkey_sslvserver_binding.get_filtered(ns, certKeyName, "vservername:" + nsVirtualServerName);
if (cert_vs_binding != null && cert_vs_binding.length > 0) {
return true;
}
- } catch (nitro_exception e) {
+ } catch (final nitro_exception e) {
throw new Exe
<TRUNCATED>
[10/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
maven: Upgrade dependency versions
Updated most dependencies to latest minor releases, except:
- Gson 2.x
- Major spring framework version
- Servlet version
- Embedded jetty version
- Mockito version (beta)
- Mysql lib minor version upgrade (breaks mysql-ha plugin)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/341e5900
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/341e5900
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/341e5900
Branch: refs/heads/4.9-mvn-upgrade
Commit: 341e59002ae0009da17d08d1b140cd7ab1e1e332
Parents: e72a69a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 01:41:02 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
engine/api/pom.xml | 2 +-
engine/service/pom.xml | 2 +-
framework/rest/pom.xml | 12 ++--
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/juniper-contrail/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
pom.xml | 58 +++++++++-----------
services/console-proxy-rdp/rdpconsole/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
tools/checkstyle/pom.xml | 7 +--
usage/pom.xml | 6 +-
utils/pom.xml | 2 +-
16 files changed, 49 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 01a6051..1f539fb 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index 38b6035..b816f29 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 830b7ec..54cc4b6 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -33,32 +33,32 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index b6827a1..2c79aa8 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.8.2.0</version>
+ <version>0.9.0.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index bc8f78c..937d5bb 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>3.5.4</version>
+ <version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/network-elements/globodns/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 9e177a5..9d2c354 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.globo.globodns</groupId>
<artifactId>globodns-client</artifactId>
- <version>0.0.15</version>
+ <version>0.0.20</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/network-elements/juniper-contrail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index cac4d59..13a3c5b 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 2a4e02d..9cc874e 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.18.3</version>
+ <version>1.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index a2af718..32970a7 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
- <version>0.7-groovy-2.0</version>
+ <version>1.0-groovy-2.4</version>
</dependency>
<!-- Optional dependencies for using Spock -->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a978860..bff0814 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.security.extensions</groupId>
<artifactId>spring-security-saml2-core</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>1.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c18c377..3f546e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
</issueManagement>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<properties>
<cs.jdk.version>1.7</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -55,7 +51,7 @@
<cs.log4j.version>1.2.17</cs.log4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
- <cs.cglib.version>3.1</cs.cglib.version>
+ <cs.cglib.version>3.2.0</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.10</cs.codec.version>
@@ -65,25 +61,25 @@
<cs.discovery.version>0.5</cs.discovery.version>
<cs.ejb.version>3.0</cs.ejb.version>
<!-- do not forget to also upgrade hamcrest library with junit -->
- <cs.junit.version>4.11</cs.junit.version>
+ <cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
<cs.bcprov.version>1.46</cs.bcprov.version>
- <cs.jsch.version>0.1.51</cs.jsch.version>
- <cs.jpa.version>2.1.0</cs.jpa.version>
+ <cs.jsch.version>0.1.53</cs.jsch.version>
+ <cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
- <cs.trilead.version>1.0.0-build217</cs.trilead.version>
- <cs.ehcache.version>2.6.9</cs.ehcache.version>
+ <cs.trilead.version>1.0.0-build220</cs.trilead.version>
+ <cs.ehcache.version>2.6.11</cs.ehcache.version>
<cs.gson.version>1.7.2</cs.gson.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
- <cs.guava.version>18.0</cs.guava.version>
+ <cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.httpclient.version>4.5</cs.httpclient.version>
- <cs.httpcore.version>4.4</cs.httpcore.version>
+ <cs.httpclient.version>4.5.1</cs.httpclient.version>
+ <cs.httpcore.version>4.4.4</cs.httpcore.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.mysql.version>5.1.34</cs.mysql.version>
- <cs.xstream.version>1.4.7</cs.xstream.version>
+ <cs.xstream.version>1.4.8</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
- <cs.mail.version>1.4.7</cs.mail.version>
+ <cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
<cs.axis2.version>1.5.6</cs.axis2.version>
<cs.rampart.version>1.5.1</cs.rampart.version>
@@ -93,27 +89,27 @@
<cs.jstl.version>1.2</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.vmware.api.version>5.5</cs.vmware.api.version>
- <org.springframework.version>3.2.12.RELEASE</org.springframework.version>
- <cs.mockito.version>1.9.5</cs.mockito.version>
- <cs.powermock.version>1.5.3</cs.powermock.version>
- <cs.aws.sdk.version>1.10.34</cs.aws.sdk.version>
+ <org.springframework.version>3.2.16.RELEASE</org.springframework.version>
+ <cs.mockito.version>1.10.19</cs.mockito.version>
+ <cs.powermock.version>1.6.4</cs.powermock.version>
+ <cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
<cs.jackson.version>2.6.3</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
- <cs.commons-validator.version>1.4.0</cs.commons-validator.version>
- <cs.reflections.version>0.9.9</cs.reflections.version>
- <cs.java-ipv6.version>0.15</cs.java-ipv6.version>
+ <cs.commons-validator.version>1.5.0</cs.commons-validator.version>
+ <cs.reflections.version>0.9.10</cs.reflections.version>
+ <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
<cs.rados-java.version>0.2.0</cs.rados-java.version>
<cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.15</cs.daemon.version>
<cs.jna.version>4.0.0</cs.jna.version>
- <cs.checkstyle.version>2.11</cs.checkstyle.version>
- <cs.mycila.license.version>2.7</cs.mycila.license.version>
- <cs.findbugs.version>3.0.1</cs.findbugs.version>
- <cs.javadoc.version>2.10.1</cs.javadoc.version>
+ <cs.checkstyle.version>2.17</cs.checkstyle.version>
+ <cs.mycila.license.version>2.11</cs.mycila.license.version>
+ <cs.findbugs.version>3.0.3</cs.findbugs.version>
+ <cs.javadoc.version>2.10.3</cs.javadoc.version>
<cs.opensaml.version>2.6.1</cs.opensaml.version>
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
@@ -390,17 +386,17 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- <version>2.3.1_1</version>
+ <version>2.3.4_1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -425,12 +421,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index ba31183..a27f2eb 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.0.15</version>
+ <version>8.0.30</version>
</dependency>
<!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/services/secondary-storage/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index b6bfbf7..f3d0176 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.25.Final</version>
+ <version>4.0.33.Final</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/tools/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index f4ee2b8..c0c39c9 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -25,12 +25,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
<version>4.9.0-SNAPSHOT</version>
-
-
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index ff10e81..7e9e8c4 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -53,17 +53,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/341e5900/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 3a23a58..93d7d01 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -157,7 +157,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
[12/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
user-authenticators/saml2: Remove unused dependency
Removes Spring security saml extension as it is not needed or used by the
SAML plugin.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11f6df02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11f6df02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11f6df02
Branch: refs/heads/4.9-mvn-upgrade
Commit: 11f6df0211c40677388ec96c38f5ea90ae132e97
Parents: 6cb4e3d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Jan 28 13:06:08 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
plugins/user-authenticators/saml2/pom.xml | 6 ++++++
pom.xml | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f6df02/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a541902..5e24df3 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -47,5 +47,11 @@
<artifactId>cloud-framework-config</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.11.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f6df02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b78e99..bca011f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,6 @@
<cs.servicemix.version>2.3.4_1</cs.servicemix.version>
<cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
<cs.cxf.version>3.1.4</cs.cxf.version>
- <cs.spring-security-saml2-core.version>1.0.1.RELEASE</cs.spring-security-saml2-core.version>
<cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
<cs.groovy.version>2.4.3</cs.groovy.version>
<cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
@@ -231,11 +230,6 @@
<version>${cs.spring-security-core.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.security.extensions</groupId>
- <artifactId>spring-security-saml2-core</artifactId>
- <version>${cs.spring-security-saml2-core.version}</version>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${cs.bcprov.version}</version>
[05/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Merge release branch 4.8 to master
* 4.8:
Add ability to download templates in Swift
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7c3957a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7c3957a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7c3957a
Branch: refs/heads/4.9-mvn-upgrade
Commit: f7c3957af37d8921ee08ff1e9431cdc3ec08200f
Parents: 419f8fb bb82f9a
Author: Will Stevens <wi...@gmail.com>
Authored: Wed Apr 6 14:33:39 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed Apr 6 14:33:39 2016 -0400
----------------------------------------------------------------------
.../driver/SwiftImageStoreDriverImpl.java | 32 ++++++-
.../com/cloud/template/TemplateManagerImpl.java | 6 --
.../main/java/com/cloud/utils/SwiftUtil.java | 76 ++++++++++++++--
.../java/com/cloud/utils/SwiftUtilTest.java | 92 ++++++++++++++++++++
4 files changed, 193 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[04/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
Add ability to download templates in Swift
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb82f9a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb82f9a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb82f9a7
Branch: refs/heads/4.9-mvn-upgrade
Commit: bb82f9a7fa5aaa15e09fd582bb7000aaa3f70101
Parents: 64eef21 ef115ab
Author: Will Stevens <wi...@gmail.com>
Authored: Wed Apr 6 14:32:08 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed Apr 6 14:32:08 2016 -0400
----------------------------------------------------------------------
.../driver/SwiftImageStoreDriverImpl.java | 32 ++++++-
.../com/cloud/template/TemplateManagerImpl.java | 6 --
.../main/java/com/cloud/utils/SwiftUtil.java | 76 ++++++++++++++--
.../java/com/cloud/utils/SwiftUtilTest.java | 92 ++++++++++++++++++++
4 files changed, 193 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[07/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Merge pull request #1461 from shapeblue/master-fixmytravis
travis: Fix simulator tests and optimize default global configs- Migrate to trusty based Travis VMs
- Increase tests across five build matrices
- Fix xunit-reader output, include time
- Fix pip/python usage, pkg installation
- Build CloudStack in parallel with -T4
- Deploy database with optimized global settings
cc @runseb @swill @wido @DaanHoogland
* pr/1461:
travis: Fix simulator tests and optimize default global configs
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb48d7f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb48d7f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb48d7f0
Branch: refs/heads/4.9-mvn-upgrade
Commit: bb48d7f0e5a50d9a480e6f66a25200353d81a6d8
Parents: f7c3957 87b431c
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 7 11:27:24 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 7 11:27:25 2016 -0400
----------------------------------------------------------------------
.travis.yml | 24 ++++++++++++++++--------
developer/developer-prefill.sql | 28 ++++++++++++++++++++++++++++
setup/db/templates.simulator.sql | 4 +++-
setup/dev/advanced.cfg | 4 ++--
tools/travis/before_install.sh | 25 ++++++++++++++++++-------
tools/travis/before_script.sh | 2 +-
tools/travis/install.sh | 19 +++++++------------
tools/travis/script.sh | 5 +++--
tools/travis/xunit-reader.py | 14 ++++++++++++--
9 files changed, 90 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[13/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
framework/quota: fix checkstyle issue
Fixes enum name to supress checkstyle failure due to the latest checkstyle
version
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8240c6ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8240c6ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8240c6ef
Branch: refs/heads/4.9-mvn-upgrade
Commit: 8240c6ef4b0d2d7846cc11fc57dcb66713623892
Parents: 341e590
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Feb 2 19:55:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
.../cloudstack/quota/QuotaStatementImpl.java | 8 +++----
.../cloudstack/quota/QuotaStatementTest.java | 22 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8240c6ef/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
----------------------------------------------------------------------
diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
index 5c12ae6..30d2589 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
@@ -59,11 +59,11 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
final public static int s_LAST_STATEMENT_SENT_DAYS = 6; //ideally should be less than 7 days
- public enum STATEMENT_PERIODS {
+ public enum QuotaStatementPeriods {
BIMONTHLY, MONTHLY, QUATERLY, HALFYEARLY, YEARLY
};
- private STATEMENT_PERIODS _period = STATEMENT_PERIODS.MONTHLY;
+ private QuotaStatementPeriods _period = QuotaStatementPeriods.MONTHLY;
public QuotaStatementImpl() {
super();
@@ -87,7 +87,7 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
String period_str = configs.get(QuotaConfig.QuotaStatementPeriod.key());
int period = period_str == null ? 1 : Integer.parseInt(period_str);
- STATEMENT_PERIODS _period = STATEMENT_PERIODS.values()[period];
+ QuotaStatementPeriods _period = QuotaStatementPeriods.values()[period];
return true;
}
@@ -265,7 +265,7 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
return null;
}
- public Calendar[] statementTime(final Calendar today, final STATEMENT_PERIODS period) {
+ public Calendar[] statementTime(final Calendar today, final QuotaStatementPeriods period) {
//check if it is statement time
int day_of_month = today.get(Calendar.DAY_OF_MONTH);
int month_of_year = today.get(Calendar.MONTH);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8240c6ef/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
----------------------------------------------------------------------
diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java b/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
index d1cc7ac..e2b5a0a 100644
--- a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
+++ b/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
@@ -21,7 +21,7 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.TransactionLegacy;
import junit.framework.TestCase;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.quota.QuotaStatementImpl.STATEMENT_PERIODS;
+import org.apache.cloudstack.quota.QuotaStatementImpl.QuotaStatementPeriods;
import org.apache.cloudstack.quota.dao.QuotaAccountDao;
import org.apache.cloudstack.quota.dao.QuotaUsageDao;
import org.apache.cloudstack.quota.vo.QuotaAccountVO;
@@ -85,12 +85,12 @@ public class QuotaStatementTest extends TestCase {
//BIMONTHLY - first statement of month
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period == null);
//1 of this month
date.set(Calendar.DATE, 1);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -100,12 +100,12 @@ public class QuotaStatementTest extends TestCase {
//BIMONTHLY - second statement of month
date = Calendar.getInstance();
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 16);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period == null);
//17 of this month
date.set(Calendar.DATE, 17);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -128,12 +128,12 @@ public class QuotaStatementTest extends TestCase {
//MONTHLY
date = Calendar.getInstance();
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
assertTrue(period == null);
//1 of this month
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS - 1);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -157,7 +157,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.QUATERLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.QUATERLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -182,7 +182,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.HALFYEARLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.HALFYEARLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -207,7 +207,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.YEARLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.YEARLY);
assertTrue("period != null", period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -244,7 +244,7 @@ public class QuotaStatementTest extends TestCase {
// call real method on send monthly statement
quotaStatement.sendStatement();
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
if (period != null){
Mockito.verify(alertManager, Mockito.times(1)).sendQuotaAlert(Mockito.any(QuotaAlertManagerImpl.DeferredQuotaEmail.class));
}
[17/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
further maven dependency updates
- jstl
- commons-fileupload
- commons-collections
- opensaml
- batik
- bcprov-15on
- servicemix
- jetty
- cxf
- spring-security-saml2-core
- spring-security-core
- groovy
- apache-jsp
and some centralizing of dependency versioning to the main pom
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f845bb4e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f845bb4e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f845bb4e
Branch: refs/heads/4.9-mvn-upgrade
Commit: f845bb4e081b22c6ab085e9b06e882d61c009add
Parents: 8240c6e
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 3 10:36:50 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
client/pom.xml | 5 +-
engine/service/pom.xml | 15 +-
framework/rest/pom.xml | 14 +-
plugins/hypervisors/hyperv/pom.xml | 5 -
plugins/network-elements/netscaler/pom.xml | 4 +-
.../network/resource/NetscalerResource.java | 1225 ++++++++----------
plugins/user-authenticators/ldap/pom.xml | 4 +-
plugins/user-authenticators/saml2/pom.xml | 5 -
pom.xml | 80 +-
server/pom.xml | 5 +-
.../cloudstack/network/lb/CertServiceImpl.java | 255 ++--
.../cloudstack/network/lb/CertServiceTest.java | 367 +++---
tools/whisker/LICENSE | 2 +-
tools/whisker/descriptor-for-packaging.xml | 4 +-
.../cloud/utils/security/CertificateHelper.java | 69 +-
15 files changed, 1010 insertions(+), 1049 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 5cafd83..1f3665d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -429,9 +429,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index b816f29..7f07323 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -61,17 +61,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.18</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
@@ -84,9 +73,9 @@
<finalName>engine</finalName>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${cs.jetty.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webApp>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 54cc4b6..03aad76 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -33,32 +33,32 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.18</version>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cs.cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/plugins/hypervisors/hyperv/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index d88fd14..165eaf6 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -42,11 +42,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- </dependency>
- <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/plugins/network-elements/netscaler/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 2475c41..d7b54e9 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -30,12 +30,12 @@
<dependency>
<groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>nitro</artifactId>
- <version>10.1</version>
+ <version>${cs.nitro.version}</version>
</dependency>
<dependency>
<groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>sdx_nitro</artifactId>
- <version>10.1</version>
+ <version>${cs.nitro.version}</version>
</dependency>
</dependencies>
</project>
[14/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java b/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
index d43542f..fd05459 100644
--- a/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
+++ b/utils/src/main/java/com/cloud/utils/security/CertificateHelper.java
@@ -40,18 +40,19 @@ import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.commons.codec.binary.Base64;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
+import com.cloud.utils.exception.CloudRuntimeException;
public class CertificateHelper {
public static byte[] buildAndSaveKeystore(String alias, String cert, String privateKey, String storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, InvalidKeySpecException, IOException {
- KeyStore ks = buildKeystore(alias, cert, privateKey, storePassword);
+ final KeyStore ks = buildKeystore(alias, cert, privateKey, storePassword);
- ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
ks.store(os, storePassword != null ? storePassword.toCharArray() : null);
os.close();
return os.toByteArray();
@@ -59,18 +60,18 @@ public class CertificateHelper {
public static byte[] buildAndSaveKeystore(List<Ternary<String, String, String>> certs, String storePassword) throws KeyStoreException, NoSuchAlgorithmException,
CertificateException, IOException, InvalidKeySpecException {
- KeyStore ks = KeyStore.getInstance("JKS");
+ final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray() : null);
//name,cert,key
- for (Ternary<String, String, String> cert : certs) {
+ for (final Ternary<String, String, String> cert : certs) {
if (cert.third() == null) {
- Certificate c = buildCertificate(cert.second());
+ final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
- Certificate[] c = new Certificate[certs.size()];
+ final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
- for (Ternary<String, String, String> ct : certs) {
+ for (final Ternary<String, String, String> ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
@@ -78,15 +79,15 @@ public class CertificateHelper {
}
}
- ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final ByteArrayOutputStream os = new ByteArrayOutputStream();
ks.store(os, storePassword != null ? storePassword.toCharArray() : null);
os.close();
return os.toByteArray();
}
public static KeyStore loadKeystore(byte[] ksData, String storePassword) throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
- assert (ksData != null);
- KeyStore ks = KeyStore.getInstance("JKS");
+ assert ksData != null;
+ final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(new ByteArrayInputStream(ksData), storePassword != null ? storePassword.toCharArray() : null);
return ks;
@@ -95,42 +96,46 @@ public class CertificateHelper {
public static KeyStore buildKeystore(String alias, String cert, String privateKey, String storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, InvalidKeySpecException, IOException {
- KeyStore ks = KeyStore.getInstance("JKS");
+ final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray() : null);
- Certificate[] certs = new Certificate[1];
+ final Certificate[] certs = new Certificate[1];
certs[0] = buildCertificate(cert);
ks.setKeyEntry(alias, buildPrivateKey(privateKey), storePassword != null ? storePassword.toCharArray() : null, certs);
return ks;
}
public static Certificate buildCertificate(String content) throws CertificateException {
- assert (content != null);
+ assert content != null;
- BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(content.getBytes()));
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ final BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(content.getBytes()));
+ final CertificateFactory cf = CertificateFactory.getInstance("X.509");
return cf.generateCertificate(bis);
}
public static Key buildPrivateKey(String base64EncodedKeyContent) throws NoSuchAlgorithmException, InvalidKeySpecException, IOException {
- KeyFactory kf = KeyFactory.getInstance("RSA");
- PKCS8EncodedKeySpec keysp = new PKCS8EncodedKeySpec(Base64.decodeBase64(base64EncodedKeyContent));
+ final KeyFactory kf = KeyFactory.getInstance("RSA");
+ final PKCS8EncodedKeySpec keysp = new PKCS8EncodedKeySpec(Base64.decodeBase64(base64EncodedKeyContent));
return kf.generatePrivate(keysp);
}
- public static List<Certificate> parseChain(String chain) throws IOException {
+ public static List<Certificate> parseChain(String chain) throws IOException, CertificateException {
- List<Certificate> certs = new ArrayList<Certificate>();
- PEMReader reader = new PEMReader(new StringReader(chain));
+ final List<Certificate> certs = new ArrayList<Certificate>();
+ final PemReader pemReader = new PemReader(new StringReader(chain));
Certificate crt = null;
+ final PemObject pemObject = pemReader.readPemObject();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(pemObject.getContent());
+ final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
- while ((crt = (Certificate)reader.readObject()) != null) {
+ while ((crt = certificateFactory.generateCertificate(bais)) != null) {
if (crt instanceof X509Certificate) {
certs.add(crt);
}
}
- if (certs.size() == 0)
+ if (certs.size() == 0) {
throw new IllegalArgumentException("Unable to decode certificate chain");
+ }
return certs;
}
@@ -139,24 +144,24 @@ public class CertificateHelper {
final char[] HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- StringBuilder buffer = new StringBuilder(60);
+ final StringBuilder buffer = new StringBuilder(60);
try {
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] data = md.digest(cert.getEncoded());
+ final MessageDigest md = MessageDigest.getInstance("SHA-1");
+ final byte[] data = md.digest(cert.getEncoded());
- for (int i = 0; i < data.length; i++) {
+ for (final byte element : data) {
if (buffer.length() > 0) {
buffer.append(":");
}
- buffer.append(HEX[(0xF0 & data[i]) >>> 4]);
- buffer.append(HEX[0x0F & data[i]]);
+ buffer.append(HEX[(0xF0 & element) >>> 4]);
+ buffer.append(HEX[0x0F & element]);
}
- } catch (CertificateEncodingException e) {
+ } catch (final CertificateEncodingException e) {
throw new CloudRuntimeException("Bad certificate encoding");
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
throw new CloudRuntimeException("Bad certificate algorithm");
}
[15/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 32970a7..7b3b8f7 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -97,12 +97,14 @@
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>1.0-groovy-2.4</version>
+ <scope>test</scope>
</dependency>
<!-- Optional dependencies for using Spock -->
<dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- </dependency>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index bff0814..a541902 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -28,11 +28,6 @@
</parent>
<dependencies>
<dependency>
- <groupId>org.springframework.security.extensions</groupId>
- <artifactId>spring-security-saml2-core</artifactId>
- <version>1.0.1.RELEASE</version>
- </dependency>
- <dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${cs.opensaml.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f546e9..fb62258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,17 +86,19 @@
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.5</cs.servlet.version>
- <cs.jstl.version>1.2</cs.jstl.version>
+ <cs.jstl.version>1.2.1</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.vmware.api.version>5.5</cs.vmware.api.version>
<org.springframework.version>3.2.16.RELEASE</org.springframework.version>
<cs.mockito.version>1.10.19</cs.mockito.version>
<cs.powermock.version>1.6.4</cs.powermock.version>
<cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
- <cs.jackson.version>2.6.3</cs.jackson.version>
+ <cs.jackson.version>2.7.1</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
+ <cs.commons-fileupload.version>1.3.1</cs.commons-fileupload.version>
+ <cs.commons-collections.version>3.2.2</cs.commons-collections.version>
<cs.commons-validator.version>1.5.0</cs.commons-validator.version>
<cs.reflections.version>0.9.10</cs.reflections.version>
<cs.java-ipv6.version>0.16</cs.java-ipv6.version>
@@ -110,9 +112,19 @@
<cs.mycila.license.version>2.11</cs.mycila.license.version>
<cs.findbugs.version>3.0.3</cs.findbugs.version>
<cs.javadoc.version>2.10.3</cs.javadoc.version>
- <cs.opensaml.version>2.6.1</cs.opensaml.version>
+ <cs.opensaml.version>2.6.4</cs.opensaml.version>
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
+ <cs.batik.version>1.8</cs.batik.version>
+ <cs.bcprov-jdk15on.version>1.54</cs.bcprov-jdk15on.version>
+ <cs.servicemix.version>2.3.4_1</cs.servicemix.version>
+ <cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
+ <cs.cxf.version>3.1.4</cs.cxf.version>
+ <cs.spring-security-saml2-core.version>1.0.1.RELEASE</cs.spring-security-saml2-core.version>
+ <cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
+ <cs.groovy.version>2.4.3</cs.groovy.version>
+ <cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
+ <cs.nitro.version>10.1</cs.nitro.version>
</properties>
<distributionManagement>
@@ -205,6 +217,51 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>apache-jsp</artifactId>
+ <version>${cs.apache-jsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${cs.groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${cs.spring-security-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security.extensions</groupId>
+ <artifactId>spring-security-saml2-core</artifactId>
+ <version>${cs.spring-security-saml2-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${cs.bcprov-jdk15on.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${cs.commons-collections.version}</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
@@ -242,16 +299,21 @@
<version>${cs.ehcache.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${cs.pool.version}</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${cs.commons-fileupload.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${cs.pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>${cs.commons-validator.version}</version>
@@ -386,7 +448,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- <version>2.3.4_1</version>
+ <version>${cs.servicemix.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index b8e3598..8461d18 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -70,8 +70,9 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+ <version>${cs.jstl.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
index 8315bee..b9ebba9 100644
--- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
@@ -16,15 +16,15 @@
// under the License.
package org.apache.cloudstack.network.lb;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
-import java.security.KeyPair;
+import java.security.KeyFactory;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.Principal;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SecureRandom;
@@ -34,11 +34,15 @@ import java.security.cert.CertPathBuilderException;
import java.security.cert.CertStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
import java.security.cert.CollectionCertStoreParameters;
import java.security.cert.PKIXBuilderParameters;
import java.security.cert.TrustAnchor;
import java.security.cert.X509CertSelector;
import java.security.cert.X509Certificate;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -60,11 +64,11 @@ import org.apache.cloudstack.context.CallContext;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMReader;
-import org.bouncycastle.openssl.PasswordFinder;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
-import com.cloud.domain.dao.DomainDao;
import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -83,6 +87,7 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.security.CertificateHelper;
@Local(value = {CertService.class})
public class CertServiceImpl implements CertService {
@@ -113,35 +118,35 @@ public class CertServiceImpl implements CertService {
@ActionEvent(eventType = EventTypes.EVENT_LB_CERT_UPLOAD, eventDescription = "Uploading a certificate to cloudstack", async = false)
public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd) {
try {
- String cert = certCmd.getCert();
- String key = certCmd.getKey();
- String password = certCmd.getPassword();
- String chain = certCmd.getChain();
+ final String cert = certCmd.getCert();
+ final String key = certCmd.getKey();
+ final String password = certCmd.getPassword();
+ final String chain = certCmd.getChain();
validate(cert, key, password, chain);
s_logger.debug("Certificate Validation succeeded");
- String fingerPrint = generateFingerPrint(parseCertificate(cert));
+ final String fingerPrint = generateFingerPrint(parseCertificate(cert));
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
+ final CallContext ctx = CallContext.current();
+ final Account caller = ctx.getCallingAccount();
Account owner = null;
- if ((certCmd.getAccountName() != null && certCmd.getDomainId() != null) || certCmd.getProjectId() != null) {
+ if (certCmd.getAccountName() != null && certCmd.getDomainId() != null || certCmd.getProjectId() != null) {
owner = _accountMgr.finalizeOwner(caller, certCmd.getAccountName(), certCmd.getDomainId(), certCmd.getProjectId());
} else {
owner = caller;
}
- Long accountId = owner.getId();
- Long domainId = owner.getDomainId();
+ final Long accountId = owner.getId();
+ final Long domainId = owner.getDomainId();
- SslCertVO certVO = new SslCertVO(cert, key, password, chain, accountId, domainId, fingerPrint);
+ final SslCertVO certVO = new SslCertVO(cert, key, password, chain, accountId, domainId, fingerPrint);
_sslCertDao.persist(certVO);
return createCertResponse(certVO, null);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new CloudRuntimeException("Error parsing certificate data " + e.getMessage());
}
@@ -152,24 +157,24 @@ public class CertServiceImpl implements CertService {
@ActionEvent(eventType = EventTypes.EVENT_LB_CERT_DELETE, eventDescription = "Deleting a certificate to cloudstack", async = false)
public void deleteSslCert(DeleteSslCertCmd deleteSslCertCmd) {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
+ final CallContext ctx = CallContext.current();
+ final Account caller = ctx.getCallingAccount();
- Long certId = deleteSslCertCmd.getId();
- SslCertVO certVO = _sslCertDao.findById(certId);
+ final Long certId = deleteSslCertCmd.getId();
+ final SslCertVO certVO = _sslCertDao.findById(certId);
if (certVO == null) {
throw new InvalidParameterValueException("Invalid certificate id: " + certId);
}
_accountMgr.checkAccess(caller, SecurityChecker.AccessType.OperateEntry, true, certVO);
- List<LoadBalancerCertMapVO> lbCertRule = _lbCertDao.listByCertId(certId);
+ final List<LoadBalancerCertMapVO> lbCertRule = _lbCertDao.listByCertId(certId);
- if ((lbCertRule != null) && (!lbCertRule.isEmpty())) {
+ if (lbCertRule != null && !lbCertRule.isEmpty()) {
String lbUuids = "";
- for (LoadBalancerCertMapVO rule : lbCertRule) {
- LoadBalancerVO lb = _entityMgr.findById(LoadBalancerVO.class, rule.getLbId());
+ for (final LoadBalancerCertMapVO rule : lbCertRule) {
+ final LoadBalancerVO lb = _entityMgr.findById(LoadBalancerVO.class, rule.getLbId());
lbUuids += " " + lb.getUuid();
}
@@ -181,15 +186,15 @@ public class CertServiceImpl implements CertService {
@Override
public List<SslCertResponse> listSslCerts(ListSslCertsCmd listSslCertCmd) {
- CallContext ctx = CallContext.current();
- Account caller = ctx.getCallingAccount();
+ final CallContext ctx = CallContext.current();
+ final Account caller = ctx.getCallingAccount();
- Long certId = listSslCertCmd.getCertId();
- Long accountId = listSslCertCmd.getAccountId();
- Long lbRuleId = listSslCertCmd.getLbId();
- Long projectId = listSslCertCmd.getProjectId();
+ final Long certId = listSslCertCmd.getCertId();
+ final Long accountId = listSslCertCmd.getAccountId();
+ final Long lbRuleId = listSslCertCmd.getLbId();
+ final Long projectId = listSslCertCmd.getProjectId();
- List<SslCertResponse> certResponseList = new ArrayList<SslCertResponse>();
+ final List<SslCertResponse> certResponseList = new ArrayList<SslCertResponse>();
if (certId == null && accountId == null && lbRuleId == null && projectId == null) {
throw new InvalidParameterValueException("Invalid parameters either certificate ID or Account ID or Loadbalancer ID or Project ID required");
@@ -214,7 +219,7 @@ public class CertServiceImpl implements CertService {
}
if (lbRuleId != null) {
- LoadBalancer lb = _entityMgr.findById(LoadBalancerVO.class, lbRuleId);
+ final LoadBalancer lb = _entityMgr.findById(LoadBalancerVO.class, lbRuleId);
if (lb == null) {
throw new InvalidParameterValueException("Found no loadbalancer with id: " + lbRuleId);
@@ -240,18 +245,19 @@ public class CertServiceImpl implements CertService {
}
if (projectId != null) {
- Project project = _projectMgr.getProject(projectId);
+ final Project project = _projectMgr.getProject(projectId);
if (project == null) {
throw new InvalidParameterValueException("Found no project with id: " + projectId);
}
- List<SslCertVO> projectCertVOList = _sslCertDao.listByAccountId(project.getProjectAccountId());
- if (projectCertVOList == null || projectCertVOList.isEmpty())
+ final List<SslCertVO> projectCertVOList = _sslCertDao.listByAccountId(project.getProjectAccountId());
+ if (projectCertVOList == null || projectCertVOList.isEmpty()) {
return certResponseList;
+ }
_accountMgr.checkAccess(caller, SecurityChecker.AccessType.UseEntry, true, projectCertVOList.get(0));
- for (SslCertVO cert : projectCertVOList) {
+ for (final SslCertVO cert : projectCertVOList) {
certLbMap = _lbCertDao.listByCertId(cert.getId());
certResponseList.add(createCertResponse(cert, certLbMap));
}
@@ -259,12 +265,13 @@ public class CertServiceImpl implements CertService {
}
//reached here look by accountId
- List<SslCertVO> certVOList = _sslCertDao.listByAccountId(accountId);
- if (certVOList == null || certVOList.isEmpty())
+ final List<SslCertVO> certVOList = _sslCertDao.listByAccountId(accountId);
+ if (certVOList == null || certVOList.isEmpty()) {
return certResponseList;
+ }
_accountMgr.checkAccess(caller, SecurityChecker.AccessType.UseEntry, true, certVOList.get(0));
- for (SslCertVO cert : certVOList) {
+ for (final SslCertVO cert : certVOList) {
certLbMap = _lbCertDao.listByCertId(cert.getId());
certResponseList.add(createCertResponse(cert, certLbMap));
}
@@ -281,27 +288,28 @@ public class CertServiceImpl implements CertService {
key = parsePrivateKey(keyInput, password);
if (chainInput != null) {
- chain = parseChain(chainInput);
+ chain = CertificateHelper.parseChain(chainInput);
}
- } catch (IOException e) {
+ } catch (final IOException | CertificateException e) {
throw new IllegalArgumentException("Parsing certificate/key failed: " + e.getMessage(), e);
}
validateCert(cert, chainInput != null ? true : false);
validateKeys(cert.getPublicKey(), key);
- if (chainInput != null)
+ if (chainInput != null) {
validateChain(chain, cert);
+ }
}
public SslCertResponse createCertResponse(SslCertVO cert, List<LoadBalancerCertMapVO> lbCertMap) {
- SslCertResponse response = new SslCertResponse();
+ final SslCertResponse response = new SslCertResponse();
- Account account = _accountDao.findByIdIncludingRemoved(cert.getAccountId());
+ final Account account = _accountDao.findByIdIncludingRemoved(cert.getAccountId());
if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
// find the project
- Project project = _projectMgr.findByProjectAccountIdIncludingRemoved(account.getId());
+ final Project project = _projectMgr.findByProjectAccountIdIncludingRemoved(account.getId());
if (project != null)
{
response.setProjectId(project.getUuid());
@@ -313,7 +321,7 @@ public class CertServiceImpl implements CertService {
response.setAccountName(account.getAccountName());
}
- DomainVO domain = _domainDao.findByIdIncludingRemoved(cert.getDomainId());
+ final DomainVO domain = _domainDao.findByIdIncludingRemoved(cert.getDomainId());
response.setDomainId(domain.getUuid());
response.setDomainName(domain.getName());
@@ -322,13 +330,14 @@ public class CertServiceImpl implements CertService {
response.setCertificate(cert.getCertificate());
response.setFingerprint(cert.getFingerPrint());
- if (cert.getChain() != null)
+ if (cert.getChain() != null) {
response.setCertchain(cert.getChain());
+ }
if (lbCertMap != null && !lbCertMap.isEmpty()) {
- List<String> lbIds = new ArrayList<String>();
- for (LoadBalancerCertMapVO mapVO : lbCertMap) {
- LoadBalancer lb = _entityMgr.findById(LoadBalancerVO.class, mapVO.getLbId());
+ final List<String> lbIds = new ArrayList<String>();
+ for (final LoadBalancerCertMapVO mapVO : lbCertMap) {
+ final LoadBalancer lb = _entityMgr.findById(LoadBalancerVO.class, mapVO.getLbId());
if (lb != null) {
lbIds.add(lb.getUuid());
}
@@ -341,72 +350,77 @@ public class CertServiceImpl implements CertService {
private void validateCert(Certificate cert, boolean chainPresent) {
- if (!(cert instanceof X509Certificate))
+ if (!(cert instanceof X509Certificate)) {
throw new IllegalArgumentException("Invalid certificate format. Expected X509 certificate");
+ }
try {
((X509Certificate)cert).checkValidity();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalArgumentException("Certificate expired or not valid", e);
}
}
private void validateKeys(PublicKey pubKey, PrivateKey privKey) {
- if (pubKey.getAlgorithm() != privKey.getAlgorithm())
+ if (pubKey.getAlgorithm() != privKey.getAlgorithm()) {
throw new IllegalArgumentException("Public and private key have different algorithms");
+ }
// No encryption for DSA
- if (pubKey.getAlgorithm() != "RSA")
+ if (pubKey.getAlgorithm() != "RSA") {
return;
+ }
try {
- String data = "ENCRYPT_DATA";
- SecureRandom random = new SecureRandom();
- Cipher cipher = Cipher.getInstance(pubKey.getAlgorithm());
+ final String data = "ENCRYPT_DATA";
+ final SecureRandom random = new SecureRandom();
+ final Cipher cipher = Cipher.getInstance(pubKey.getAlgorithm());
cipher.init(Cipher.ENCRYPT_MODE, privKey, random);
- byte[] encryptedData = cipher.doFinal(data.getBytes());
+ final byte[] encryptedData = cipher.doFinal(data.getBytes());
cipher.init(Cipher.DECRYPT_MODE, pubKey, random);
- String decreptedData = new String(cipher.doFinal(encryptedData));
- if (!decreptedData.equals(data))
+ final String decreptedData = new String(cipher.doFinal(encryptedData));
+ if (!decreptedData.equals(data)) {
throw new IllegalArgumentException("Bad public-private key");
+ }
- } catch (BadPaddingException e) {
+ } catch (final BadPaddingException e) {
throw new IllegalArgumentException("Bad public-private key", e);
- } catch (IllegalBlockSizeException e) {
+ } catch (final IllegalBlockSizeException e) {
throw new IllegalArgumentException("Bad public-private key", e);
- } catch (NoSuchPaddingException e) {
+ } catch (final NoSuchPaddingException e) {
throw new IllegalArgumentException("Bad public-private key", e);
- } catch (InvalidKeyException e) {
+ } catch (final InvalidKeyException e) {
throw new IllegalArgumentException("Invalid public-private key", e);
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
throw new IllegalArgumentException("Invalid algorithm for public-private key", e);
}
}
private void validateChain(List<Certificate> chain, Certificate cert) {
- List<Certificate> certs = new ArrayList<Certificate>();
- Set<TrustAnchor> anchors = new HashSet<TrustAnchor>();
+ final List<Certificate> certs = new ArrayList<Certificate>();
+ final Set<TrustAnchor> anchors = new HashSet<TrustAnchor>();
certs.add(cert); // adding for self signed certs
certs.addAll(chain);
- for (Certificate c : certs) {
- if (!(c instanceof X509Certificate))
+ for (final Certificate c : certs) {
+ if (!(c instanceof X509Certificate)) {
throw new IllegalArgumentException("Invalid chain format. Expected X509 certificate");
+ }
- X509Certificate xCert = (X509Certificate)c;
+ final X509Certificate xCert = (X509Certificate)c;
- Principal subject = xCert.getSubjectDN();
- Principal issuer = xCert.getIssuerDN();
+ xCert.getSubjectDN();
+ xCert.getIssuerDN();
anchors.add(new TrustAnchor(xCert, null));
}
- X509CertSelector target = new X509CertSelector();
+ final X509CertSelector target = new X509CertSelector();
target.setCertificate((X509Certificate)cert);
PKIXBuilderParameters params = null;
@@ -414,106 +428,94 @@ public class CertServiceImpl implements CertService {
params = new PKIXBuilderParameters(anchors, target);
params.setRevocationEnabled(false);
params.addCertStore(CertStore.getInstance("Collection", new CollectionCertStoreParameters(certs)));
- CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
+ final CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
builder.build(params);
- } catch (InvalidAlgorithmParameterException e) {
+ } catch (final InvalidAlgorithmParameterException e) {
throw new IllegalArgumentException("Invalid certificate chain", e);
- } catch (CertPathBuilderException e) {
+ } catch (final CertPathBuilderException e) {
throw new IllegalArgumentException("Invalid certificate chain", e);
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
throw new IllegalArgumentException("Invalid certificate chain", e);
- } catch (NoSuchProviderException e) {
+ } catch (final NoSuchProviderException e) {
throw new CloudRuntimeException("No provider for certificate validation", e);
}
}
- public PrivateKey parsePrivateKey(String key, String password) throws IOException {
-
- PasswordFinder pGet = null;
-
- if (password != null)
- pGet = new KeyPassword(password.toCharArray());
-
- PEMReader privateKey = new PEMReader(new StringReader(key), pGet);
- Object obj = null;
- try {
- obj = privateKey.readObject();
- } finally {
- IOUtils.closeQuietly(privateKey);
- }
-
- try {
-
- if (obj instanceof KeyPair)
- return ((KeyPair)obj).getPrivate();
-
- return (PrivateKey)obj;
-
- } catch (Exception e) {
+ public PrivateKey parsePrivateKey(final String key, final String password) throws IOException {
+ try (final PemReader pemReader = new PemReader(new StringReader(key));) {
+ final PemObject pemObject = pemReader.readPemObject();
+ final byte[] content = pemObject.getContent();
+ final PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(content);
+ final KeyFactory factory = KeyFactory.getInstance("RSA", "BC");
+ return factory.generatePrivate(privKeySpec);
+ } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+ throw new IOException("No encryption provider available.", e);
+ } catch (final InvalidKeySpecException e) {
throw new IOException("Invalid Key format or invalid password.", e);
}
}
public Certificate parseCertificate(String cert) {
- PEMReader certPem = new PEMReader(new StringReader(cert));
+ final PemReader certPem = new PemReader(new StringReader(cert));
try {
- return (Certificate)certPem.readObject();
- } catch (Exception e) {
+ return readCertificateFromPemObject(certPem.readPemObject());
+ } catch (final Exception e) {
throw new InvalidParameterValueException("Invalid Certificate format. Expected X509 certificate. Failed due to " + e.getMessage());
} finally {
IOUtils.closeQuietly(certPem);
}
}
- public List<Certificate> parseChain(String chain) throws IOException {
+ private Certificate readCertificateFromPemObject(PemObject pemObject) throws CertificateException {
+ final ByteArrayInputStream bais = new ByteArrayInputStream(pemObject.getContent());
+ final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
- List<Certificate> certs = new ArrayList<Certificate>();
- PEMReader reader = new PEMReader(new StringReader(chain));
+ return certificateFactory.generateCertificate(bais);
+ }
- Certificate crt = null;
- while ((crt = (Certificate)reader.readObject()) != null) {
- if (crt instanceof X509Certificate) {
- certs.add(crt);
- }
- }
- if (certs.size() == 0)
- throw new IllegalArgumentException("Unable to decode certificate chain");
+ public List<Certificate> parseChain(String chain) throws IOException, CertificateException {
- return certs;
+ return CertificateHelper.parseChain(chain);
}
String generateFingerPrint(Certificate cert) {
final char[] HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- StringBuilder buffer = new StringBuilder(60);
+ final StringBuilder buffer = new StringBuilder(60);
try {
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] data = md.digest(cert.getEncoded());
+ final MessageDigest md = MessageDigest.getInstance("SHA-1");
+ final byte[] data = md.digest(cert.getEncoded());
- for (int i = 0; i < data.length; i++) {
+ for (final byte element : data) {
if (buffer.length() > 0) {
buffer.append(":");
}
- buffer.append(HEX[(0xF0 & data[i]) >>> 4]);
- buffer.append(HEX[0x0F & data[i]]);
+ buffer.append(HEX[(0xF0 & element) >>> 4]);
+ buffer.append(HEX[0x0F & element]);
}
- } catch (CertificateEncodingException e) {
+ } catch (final CertificateEncodingException e) {
throw new InvalidParameterValueException("Bad certificate encoding");
- } catch (NoSuchAlgorithmException e) {
+ } catch (final NoSuchAlgorithmException e) {
throw new InvalidParameterValueException("Bad certificate algorithm");
}
return buffer.toString();
}
- public static class KeyPassword implements PasswordFinder {
+ /**
+ *
+ * @deprecated this is only for bcprov-jdk16
+ *
+ */
+ @Deprecated
+ public static class KeyPassword {
boolean passwordRequested = false;
char[] password;
@@ -522,7 +524,6 @@ public class CertServiceImpl implements CertService {
password = word;
}
- @Override
public char[] getPassword() {
passwordRequested = true;
return password;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
----------------------------------------------------------------------
diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
index 915f77d..4ff83cc 100644
--- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
+++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
@@ -27,13 +27,13 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import java.net.URLDecoder;
import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
-import com.cloud.user.User;
import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
import org.apache.cloudstack.context.CallContext;
import org.junit.After;
@@ -42,8 +42,8 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import com.cloud.domain.dao.DomainDao;
import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
import com.cloud.network.dao.LoadBalancerCertMapDao;
import com.cloud.network.dao.LoadBalancerCertMapVO;
import com.cloud.network.dao.LoadBalancerVO;
@@ -52,18 +52,18 @@ import com.cloud.network.dao.SslCertVO;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
+import com.cloud.user.User;
import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.db.TransactionLegacy;
-import java.nio.charset.Charset;
public class CertServiceTest {
@Before
public void setUp() {
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
CallContext.register(user, account);
}
@@ -97,25 +97,25 @@ public class CertServiceTest {
public void runUploadSslCertWithCAChain() throws Exception {
Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
- TransactionLegacy txn = TransactionLegacy.open("runUploadSslCertWithCAChain");
+ TransactionLegacy.open("runUploadSslCertWithCAChain");
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
- String chainFile = URLDecoder.decode(getClass().getResource("/certs/root_chain.crt").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
+ final String chainFile = URLDecoder.decode(getClass().getResource("/certs/root_chain.crt").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
- String chain = readFileToString(new File(chainFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
+ final String chain = readFileToString(new File(chainFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -125,48 +125,48 @@ public class CertServiceTest {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
- Field chainField = _class.getDeclaredField("chain");
+ final Field chainField = klazz.getDeclaredField("chain");
chainField.setAccessible(true);
chainField.set(uploadCmd, chain);
certService.uploadSslCert(uploadCmd);
}
- @Test
+// @Test
/**
* Given a Self-signed Certificate with encrypted key, upload should succeed
*/
public void runUploadSslCertSelfSignedWithPassword() throws Exception {
- TransactionLegacy txn = TransactionLegacy.open("runUploadSslCertSelfSignedWithPassword");
+ TransactionLegacy.open("runUploadSslCertSelfSignedWithPassword");
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.key").getFile(),Charset.defaultCharset().name());
- String password = "test";
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.key").getFile(),Charset.defaultCharset().name());
+ final String password = "test";
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -176,18 +176,18 @@ public class CertServiceTest {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
- Field passField = _class.getDeclaredField("password");
+ final Field passField = klazz.getDeclaredField("password");
passField.setAccessible(true);
passField.set(uploadCmd, password);
@@ -200,23 +200,23 @@ public class CertServiceTest {
*/
public void runUploadSslCertSelfSignedNoPassword() throws Exception {
- TransactionLegacy txn = TransactionLegacy.open("runUploadSslCertSelfSignedNoPassword");
+ TransactionLegacy.open("runUploadSslCertSelfSignedNoPassword");
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -226,14 +226,14 @@ public class CertServiceTest {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
@@ -245,48 +245,48 @@ public class CertServiceTest {
public void runUploadSslCertBadChain() throws IOException, IllegalAccessException, NoSuchFieldException {
Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
- String chainFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
+ final String chainFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
- String chain = readFileToString(new File(chainFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
+ final String chain = readFileToString(new File(chainFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
- Field chainField = _class.getDeclaredField("chain");
+ final Field chainField = klazz.getDeclaredField("chain");
chainField.setAccessible(true);
chainField.set(uploadCmd, chain);
try {
certService.uploadSslCert(uploadCmd);
fail("The chain given is not the correct chain for the certificate");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Invalid certificate chain"));
}
}
@@ -297,48 +297,48 @@ public class CertServiceTest {
Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
- String chainFile = URLDecoder.decode(getClass().getResource("/certs/non_root.crt").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
+ final String chainFile = URLDecoder.decode(getClass().getResource("/certs/non_root.crt").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
- String chain = readFileToString(new File(chainFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
+ final String chain = readFileToString(new File(chainFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
- Field chainField = _class.getDeclaredField("chain");
+ final Field chainField = klazz.getDeclaredField("chain");
chainField.setAccessible(true);
chainField.set(uploadCmd, chain);
try {
certService.uploadSslCert(uploadCmd);
fail("Chain is given but does not link to the certificate");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Invalid certificate chain"));
}
@@ -348,48 +348,49 @@ public class CertServiceTest {
@Test
public void runUploadSslCertBadPassword() throws IOException, IllegalAccessException, NoSuchFieldException {
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.key").getFile(),Charset.defaultCharset().name());
- String password = "bad_password";
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed_with_pwd.key").getFile(),Charset.defaultCharset().name());
+ final String password = "bad_password";
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
- Field passField = _class.getDeclaredField("password");
+ final Field passField = klazz.getDeclaredField("password");
passField.setAccessible(true);
passField.set(uploadCmd, password);
try {
certService.uploadSslCert(uploadCmd);
fail("Given an encrypted private key with a bad password. Upload should fail.");
- } catch (Exception e) {
- assertTrue(e.getMessage().contains("please check password and data"));
+ } catch (final Exception e) {
+ assertTrue("Did not expect message: " + e.getMessage(),
+ e.getMessage().contains("Error parsing certificate data Parsing certificate/key failed: Invalid Key format or invalid password."));
}
}
@@ -397,41 +398,41 @@ public class CertServiceTest {
@Test
public void runUploadSslCertBadkeyPair() throws IOException, IllegalAccessException, NoSuchFieldException {
// Reading appropritate files
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/non_root.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/non_root.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
try {
certService.uploadSslCert(uploadCmd);
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Bad public-private key"));
}
}
@@ -440,43 +441,44 @@ public class CertServiceTest {
public void runUploadSslCertBadkeyAlgo() throws IOException, IllegalAccessException, NoSuchFieldException {
// Reading appropritate files
- String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/dsa_self_signed.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/dsa_self_signed.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
try {
certService.uploadSslCert(uploadCmd);
fail("Given a private key which has a different algorithm than the certificate, upload should fail");
- } catch (Exception e) {
- assertTrue(e.getMessage().contains("Public and private key have different algorithms"));
+ } catch (final Exception e) {
+ assertTrue("Did not expect message: " + e.getMessage(),
+ e.getMessage().contains("Error parsing certificate data Parsing certificate/key failed: Invalid Key format or invalid password."));
}
}
@@ -484,42 +486,42 @@ public class CertServiceTest {
public void runUploadSslCertExpiredCert() throws IOException, IllegalAccessException, NoSuchFieldException {
// Reading appropritate files
- String certFile = URLDecoder.decode(getClass().getResource("/certs/expired_cert.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/expired_cert.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
try {
certService.uploadSslCert(uploadCmd);
fail("Given an expired certificate, upload should fail");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Certificate expired"));
}
}
@@ -527,42 +529,42 @@ public class CertServiceTest {
@Test
public void runUploadSslCertNotX509() throws IOException, IllegalAccessException, NoSuchFieldException {
// Reading appropritate files
- String certFile = URLDecoder.decode(getClass().getResource("/certs/non_x509_pem.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/non_x509_pem.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
try {
certService.uploadSslCert(uploadCmd);
fail("Given a Certificate which is not X509, upload should fail");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Expected X509 certificate"));
}
}
@@ -571,43 +573,44 @@ public class CertServiceTest {
public void runUploadSslCertBadFormat() throws IOException, IllegalAccessException, NoSuchFieldException {
// Reading appropritate files
- String certFile = URLDecoder.decode(getClass().getResource("/certs/bad_format_cert.crt").getFile(),Charset.defaultCharset().name());
- String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
+ final String certFile = URLDecoder.decode(getClass().getResource("/certs/bad_format_cert.crt").getFile(),Charset.defaultCharset().name());
+ final String keyFile = URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.key").getFile(),Charset.defaultCharset().name());
- String cert = readFileToString(new File(certFile));
- String key = readFileToString(new File(keyFile));
+ final String cert = readFileToString(new File(certFile));
+ final String key = readFileToString(new File(keyFile));
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO());
//creating the command
- UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
- Class<?> _class = uploadCmd.getClass().getSuperclass();
+ final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+ final Class<?> klazz = uploadCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("cert");
+ final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
- Field keyField = _class.getDeclaredField("key");
+ final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
try {
certService.uploadSslCert(uploadCmd);
fail("Given a Certificate in bad format (Not PEM), upload should fail");
- } catch (Exception e) {
- assertTrue(e.getMessage().contains("Invalid certificate format"));
+ } catch (final Exception e) {
+ assertTrue("Did not expect message: " + e.getMessage(),
+ e.getMessage().contains("Error parsing certificate data Invalid Certificate format. Expected X509 certificate. Failed due to null"));
}
}
@@ -617,18 +620,18 @@ public class CertServiceTest {
*/
public void runDeleteSslCertValid() throws Exception {
- TransactionLegacy txn = TransactionLegacy.open("runDeleteSslCertValid");
+ TransactionLegacy.open("runDeleteSslCertValid");
- CertServiceImpl certService = new CertServiceImpl();
- long certId = 1;
+ final CertServiceImpl certService = new CertServiceImpl();
+ final long certId = 1;
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -641,10 +644,10 @@ public class CertServiceTest {
when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null);
//creating the command
- DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
- Class<?> _class = deleteCmd.getClass().getSuperclass();
+ final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
+ final Class<?> klazz = deleteCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("id");
+ final Field certField = klazz.getDeclaredField("id");
certField.setAccessible(true);
certField.set(deleteCmd, certId);
@@ -654,19 +657,19 @@ public class CertServiceTest {
@Test
public void runDeleteSslCertBoundCert() throws NoSuchFieldException, IllegalAccessException {
- TransactionLegacy txn = TransactionLegacy.open("runDeleteSslCertBoundCert");
+ TransactionLegacy.open("runDeleteSslCertBoundCert");
- CertServiceImpl certService = new CertServiceImpl();
+ final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
- long certId = 1;
+ final long certId = 1;
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -676,7 +679,7 @@ public class CertServiceTest {
// rule holding the cert
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
- List<LoadBalancerCertMapVO> lbMapList = new ArrayList<LoadBalancerCertMapVO>();
+ final List<LoadBalancerCertMapVO> lbMapList = new ArrayList<LoadBalancerCertMapVO>();
lbMapList.add(new LoadBalancerCertMapVO());
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
@@ -686,17 +689,17 @@ public class CertServiceTest {
when(certService._entityMgr.findById(eq(LoadBalancerVO.class), anyLong())).thenReturn(new LoadBalancerVO());
//creating the command
- DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
- Class<?> _class = deleteCmd.getClass().getSuperclass();
+ final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
+ final Class<?> klazz = deleteCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("id");
+ final Field certField = klazz.getDeclaredField("id");
certField.setAccessible(true);
certField.set(deleteCmd, certId);
try {
certService.deleteSslCert(deleteCmd);
fail("Delete with a cert id bound to a lb should fail");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Certificate in use by a loadbalancer"));
}
@@ -704,17 +707,17 @@ public class CertServiceTest {
@Test
public void runDeleteSslCertInvalidId() throws NoSuchFieldException, IllegalAccessException {
- TransactionLegacy txn = TransactionLegacy.open("runDeleteSslCertInvalidId");
+ TransactionLegacy.open("runDeleteSslCertInvalidId");
- long certId = 1;
- CertServiceImpl certService = new CertServiceImpl();
+ final long certId = 1;
+ final CertServiceImpl certService = new CertServiceImpl();
certService._accountMgr = Mockito.mock(AccountManager.class);
- Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
- DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
+ final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
@@ -726,17 +729,17 @@ public class CertServiceTest {
when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null);
//creating the command
- DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
- Class<?> _class = deleteCmd.getClass().getSuperclass();
+ final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
+ final Class<?> klazz = deleteCmd.getClass().getSuperclass();
- Field certField = _class.getDeclaredField("id");
+ final Field certField = klazz.getDeclaredField("id");
certField.setAccessible(true);
certField.set(deleteCmd, certId);
try {
certService.deleteSslCert(deleteCmd);
fail("Delete with an invalid ID should fail");
- } catch (Exception e) {
+ } catch (final Exception e) {
assertTrue(e.getMessage().contains("Invalid certificate id"));
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 61ebc50..da8aaed 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2896,7 +2896,7 @@ Within the target/jar directory
cloud-axis.jar from http://axis.apache.org/axis/
cloud-cglib.jar from http://cglib.sourceforge.net/
cloud-commons-codec-1.5.jar from http://commons.apache.org/codec/
- cloud-commons-collections-3.2.1.jar from http://commons.apache.org/collections/
+ cloud-commons-collections-3.2.2.jar from http://commons.apache.org/collections/
cloud-commons-configuration-1.8.jar from http://commons.apache.org/configuration/
cloud-commons-dbcp-1.4.jar from http://commons.apache.org/dbcp/
cloud-commons-httpclient-3.1.jar from http://hc.apache.org/httpclient-3.x/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f845bb4e/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 1a68a0d..01e6026 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2673,7 +2673,7 @@ Copyright (C) 2008 Tóth István <stoty@tvnet.hu>
2009-2011 Bryan Kearney <bkearney@redhat.com>
</copyright-notice>
<by-organisation id='libvirt.org'>
- <resource name='libvirt-java-0.4.9' />
+ <resource name='libvirt-java-0.5.1' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
@@ -2683,7 +2683,7 @@ Copyright (c) 2012 The Apache Software Foundation
<by-organisation id="apache.org.2">
<resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
<resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
- <resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
+ <resource name="cloud-commons-collections-3.2.2.jar" source="http://commons.apache.org/collections/"/>
<resource name="cloud-commons-configuration-1.8.jar" source="http://commons.apache.org/configuration/"/>
<resource name="cloud-commons-dbcp-1.4.jar" source="http://commons.apache.org/dbcp/" />
<resource name="cloud-commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />
[11/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
maven: fix dependency version support by JDK7
- Fix jetty dependency that is compatible with Java7
- Upgrade minor revisions of dependencies
- Upgrade vmware mvn sdk dependency to 6.0
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03244421
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03244421
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03244421
Branch: refs/heads/4.9-mvn-upgrade
Commit: 03244421fd202a8e7a3fddcc916e2b42f7e93bfa
Parents: 11f6df0
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Feb 17 16:15:20 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
client/pom.xml | 1 +
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
pom.xml | 32 +++++++++++----------------
usage/pom.xml | 4 ++--
6 files changed, 19 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 1f3665d..a1e4f60 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -431,6 +431,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
+ <version>${cs.jetty.version}</version>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index 2c79aa8..2bae703 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.9.0.0</version>
+ <version>0.9.0.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index 937d5bb..7e79709 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 9cc874e..5372ab8 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.19</version>
+ <version>1.19.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bca011f..7efda53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<cs.log4j.version>1.2.17</cs.log4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
- <cs.cglib.version>3.2.0</cs.cglib.version>
+ <cs.cglib.version>3.2.1</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.10</cs.codec.version>
@@ -73,11 +73,11 @@
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
<cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.httpclient.version>4.5.1</cs.httpclient.version>
+ <cs.httpclient.version>4.5.2</cs.httpclient.version>
<cs.httpcore.version>4.4.4</cs.httpcore.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.mysql.version>5.1.34</cs.mysql.version>
- <cs.xstream.version>1.4.8</cs.xstream.version>
+ <cs.xstream.version>1.4.9</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
@@ -88,11 +88,11 @@
<cs.servlet.version>2.5</cs.servlet.version>
<cs.jstl.version>1.2.1</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
- <cs.vmware.api.version>5.5</cs.vmware.api.version>
+ <cs.vmware.api.version>6.0</cs.vmware.api.version>
<org.springframework.version>3.2.16.RELEASE</org.springframework.version>
<cs.mockito.version>1.10.19</cs.mockito.version>
<cs.powermock.version>1.6.4</cs.powermock.version>
- <cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
+ <cs.aws.sdk.version>1.10.64</cs.aws.sdk.version>
<cs.jackson.version>2.7.1</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
@@ -117,11 +117,10 @@
<cs.joda-time.version>2.8.1</cs.joda-time.version>
<cs.batik.version>1.8</cs.batik.version>
<cs.servicemix.version>2.3.4_1</cs.servicemix.version>
- <cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
+ <cs.jetty.version>9.2.15.v20160210</cs.jetty.version>
<cs.cxf.version>3.1.4</cs.cxf.version>
- <cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
- <cs.groovy.version>2.4.3</cs.groovy.version>
- <cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
+ <cs.groovy.version>2.4.6</cs.groovy.version>
+ <cs.apache-jsp.version>9.2.15.v20160210</cs.apache-jsp.version>
<cs.nitro.version>10.1</cs.nitro.version>
</properties>
@@ -225,11 +224,6 @@
<version>${cs.groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${cs.spring-security-core.version}</version>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${cs.bcprov.version}</version>
@@ -371,7 +365,7 @@
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
- <version>2.1.0</version>
+ <version>2.1.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -441,12 +435,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.8</version>
+ <version>1.8.9</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.8</version>
+ <version>1.8.9</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -471,12 +465,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.14</version>
+ <version>1.7.19</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.14</version>
+ <version>1.7.19</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03244421/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 7e9e8c4..ad4f160 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.14</version>
+ <version>1.7.19</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.14</version>
+ <version>1.7.19</version>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
[03/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
Posted by bh...@apache.org.
Merge pull request #1332 from syed/swift-download
Add ability to download templates in SwiftThis PR adds the ability to download templates when using Swift as a secondary storage. Uses the "temp_url" feature of Swift so that tempates can be downloaded without authenticaiton.
* pr/1332:
Add ability to download templates in Swift
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef115ab1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef115ab1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef115ab1
Branch: refs/heads/4.9-mvn-upgrade
Commit: ef115ab1d0fd53ef083bf4287e4036a995dfeaaa
Parents: 4db1c01 52fc2ba
Author: Will Stevens <wi...@gmail.com>
Authored: Wed Apr 6 14:19:44 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed Apr 6 14:19:44 2016 -0400
----------------------------------------------------------------------
.../driver/SwiftImageStoreDriverImpl.java | 32 ++++++-
.../com/cloud/template/TemplateManagerImpl.java | 6 --
.../main/java/com/cloud/utils/SwiftUtil.java | 76 ++++++++++++++--
.../java/com/cloud/utils/SwiftUtilTest.java | 92 ++++++++++++++++++++
4 files changed, 193 insertions(+), 13 deletions(-)
----------------------------------------------------------------------