You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/30 23:40:52 UTC
[01/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Updated Branches:
refs/heads/ui-restyle 326b3a607 -> 849d601cc
CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ac48934
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ac48934
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ac48934
Branch: refs/heads/ui-restyle
Commit: 7ac48934f77c3b9a72c05300163088a4c198ebf2
Parents: 807dc09
Author: Rajesh Battala <ra...@citrix.com>
Authored: Tue Jan 28 06:42:54 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Jan 28 07:03:08 2014 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ac48934/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index d6dc8f0..df80a28 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -135,7 +135,7 @@ get_boot_params() {
virtualpc|hyperv)
# Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
#waiting for the hv_kvp_daemon to start up
- #sleep 30 need to fix the race condition of hv_kvp_daemon and cloud-early-config
+ #sleep need to fix the race condition of hv_kvp_daemon and cloud-early-config
sleep 5
cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline
cat /dev/null > /var/opt/hyperv/.kvp_pool_0
@@ -1211,6 +1211,10 @@ start() {
patch_log4j
parse_cmd_line
change_password
+ if [ "$hyp" == "hyperv" ]; then
+ # eject the systemvm.iso
+ eject
+ fi
case $TYPE in
router)
[ "$NAME" == "" ] && NAME=router
[43/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68937cd2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68937cd2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68937cd2
Branch: refs/heads/ui-restyle
Commit: 68937cd20770c1154544bfb239b8f72e9d781a9b
Parents: 12777e9
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 11:33:24 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 11:50:27 2014 -0800
----------------------------------------------------------------------
.../command/user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 ++-
.../command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68937cd2/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
index 4ea4a58..4b0ea54 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
@@ -1,3 +1,4 @@
+
// 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
@@ -42,7 +43,7 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AssignCertToLoadBalancerCmd.class.getName());
- private static final String s_name = "assignCertToLoadBalancer";
+ private static final String s_name = "assigncerttoloadbalancerresponse";
@Parameter(name = ApiConstants.LBID,
type = CommandType.UUID,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68937cd2/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
index e92d208..ea420f3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
@@ -41,7 +41,7 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(RemoveCertFromLoadBalancerCmd.class.getName());
- private static final String s_name = "removeCertFromLoadBalancer";
+ private static final String s_name = "removecertfromloadbalancerresponse";
@Parameter(name = ApiConstants.LBID,
type = CommandType.UUID,
[02/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4583bac0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4583bac0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4583bac0
Branch: refs/heads/ui-restyle
Commit: 4583bac05bb3c2df2e7f199599765eb297023bf8
Parents: 39447cc
Author: Likitha Shetty <li...@citrix.com>
Authored: Mon Jan 27 17:52:16 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Jan 28 09:21:05 2014 +0530
----------------------------------------------------------------------
.../resource/VmwareStorageProcessor.java | 21 ++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4583bac0/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 0ed09c4..6157bd6 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -957,7 +957,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
String backupUuid = UUID.randomUUID().toString();
Pair<String, String[]> snapshotInfo = exportVolumeToSecondaryStroage(vmMo, volumePath, secStorageUrl, installPath, backupUuid, workerVmName);
- return new Ternary<String, String, String[]>(backupUuid + "/" + backupUuid, snapshotInfo.first(), snapshotInfo.second());
+ return new Ternary<String, String, String[]>(backupUuid, snapshotInfo.first(), snapshotInfo.second());
}
@Override
@@ -1040,8 +1040,25 @@ public class VmwareStorageProcessor implements StorageProcessor {
answer = new CopyCmdAnswer(details);
} else {
details = "Successfully backedUp the snapshot with Uuid: " + snapshotUuid + " to secondary storage.";
+
+ // Get snapshot physical size
+ long physicalSize = 0l;
+ String secondaryMountPoint = mountService.getMountPoint(secondaryStorageUrl);
+ String snapshotDir = destSnapshot.getPath() + "/" + snapshotBackupUuid;
+ File[] files = new File(secondaryMountPoint + "/" + snapshotDir).listFiles();
+ if(files != null) {
+ for(File file : files) {
+ String fileName = file.getName();
+ if(fileName.toLowerCase().startsWith(snapshotBackupUuid) && fileName.toLowerCase().endsWith(".vmdk")) {
+ physicalSize = new File(secondaryMountPoint + "/" + snapshotDir + "/" + fileName).length();
+ break;
+ }
+ }
+ }
+
SnapshotObjectTO newSnapshot = new SnapshotObjectTO();
- newSnapshot.setPath(destSnapshot.getPath() + "/" + snapshotBackupUuid);
+ newSnapshot.setPath(snapshotDir + "/" + snapshotBackupUuid);
+ newSnapshot.setPhysicalSize(physicalSize);
answer = new CopyCmdAnswer(newSnapshot);
}
} finally {
[17/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: removed fields injected in parent(cherry picked from commit 866a539b067663b346bd8d087c578987a86fe834)
Signed-off-by: Daan Hoogland <dh...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0daca84e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0daca84e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0daca84e
Branch: refs/heads/ui-restyle
Commit: 0daca84efff98e74a4d800441d52a55067e31518
Parents: a16759a
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 16:49:18 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 15:59:04 2014 +0100
----------------------------------------------------------------------
.../kvm/discoverer/LibvirtServerDiscoverer.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0daca84e/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index da1bb88..770099c 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -28,8 +28,6 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
import com.cloud.agent.api.AgentControlAnswer;
@@ -41,7 +39,6 @@ import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.configuration.Config;
import com.cloud.dc.ClusterVO;
-import com.cloud.dc.dao.ClusterDao;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.DiscoveredWithErrorException;
import com.cloud.exception.DiscoveryException;
@@ -49,10 +46,8 @@ import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.NetworkModel;
import com.cloud.network.PhysicalNetworkSetupInfo;
import com.cloud.resource.Discoverer;
import com.cloud.resource.DiscovererBase;
@@ -70,17 +65,9 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject
- HostDao _hostDao = null;
- @Inject
- ClusterDao _clusterDao;
- @Inject
ResourceManager _resourceMgr;
@Inject
AgentManager _agentMgr;
- @Inject
- ConfigurationDao _configDao;
- @Inject
- NetworkModel _networkMgr;
@Override
public abstract Hypervisor.HypervisorType getHypervisorType();
[10/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from
commit 9a1b882d0eb871c64fe0f0f3fbafbabae89188fa)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c736175
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c736175
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c736175
Branch: refs/heads/ui-restyle
Commit: 1c7361756cb41091deb7798377ae5ed04b7de8d9
Parents: 60e8d13
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 14:24:21 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 14:24:21 2014 +0100
----------------------------------------------------------------------
api/src/com/cloud/network/rules/FirewallRule.java | 3 ++-
api/src/com/cloud/network/vpc/StaticRoute.java | 3 ++-
server/src/com/cloud/api/ApiResponseHelper.java | 18 ++++++++----------
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c736175/api/src/com/cloud/network/rules/FirewallRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/com/cloud/network/rules/FirewallRule.java
index 4cfa42b..274242a 100644
--- a/api/src/com/cloud/network/rules/FirewallRule.java
+++ b/api/src/com/cloud/network/rules/FirewallRule.java
@@ -36,7 +36,8 @@ public interface FirewallRule extends ControlledEntity, Identity, InternalIdenti
Staged, // Rule been created but has never got through network rule conflict detection. Rules in this state can not be sent to network elements.
Add, // Add means the rule has been created and has gone through network rule conflict detection.
Active, // Rule has been sent to the network elements and reported to be active.
- Revoke // Revoke means this rule has been revoked. If this rule has been sent to the network elements, the rule will be deleted from database.
+ Revoke, // Revoke means this rule has been revoked. If this rule has been sent to the network elements, the rule will be deleted from database.
+ Deleting // rule has been revoked and is scheduled for deletion
}
enum TrafficType {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c736175/api/src/com/cloud/network/vpc/StaticRoute.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/StaticRoute.java b/api/src/com/cloud/network/vpc/StaticRoute.java
index ccdbec8..5707ca1 100644
--- a/api/src/com/cloud/network/vpc/StaticRoute.java
+++ b/api/src/com/cloud/network/vpc/StaticRoute.java
@@ -25,7 +25,8 @@ public interface StaticRoute extends ControlledEntity, Identity, InternalIdentit
Staged, // route been created but has never got through network rule conflict detection. Routes in this state can not be sent to VPC virtual router.
Add, // Add means the route has been created and has gone through network rule conflict detection.
Active, // Route has been sent to the VPC router and reported to be active.
- Revoke // Revoke means this route has been revoked. If this route has been sent to the VPC router, the route will be deleted from database.
+ Revoke, // Revoke means this route has been revoked. If this route has been sent to the VPC router, the route will be deleted from database.
+ Deleting // rule has been revoked and is scheduled for deletion
}
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c736175/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index c9e5581..a50b3ee 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -384,8 +384,9 @@ public class ApiResponseHelper implements ResponseGenerator {
populateDomain(resourceLimitResponse, accountTemp.getDomainId());
}
resourceLimitResponse.setResourceType(Integer.valueOf(limit.getType().getOrdinal()).toString());
+
if ((limit.getType() == ResourceType.primary_storage || limit.getType() == ResourceType.secondary_storage) && limit.getMax() >= 0) {
- resourceLimitResponse.setMax((long)Math.ceil(limit.getMax() / ResourceType.bytesToGiB));
+ resourceLimitResponse.setMax((long)Math.ceil((double)limit.getMax() / ResourceType.bytesToGiB));
} else {
resourceLimitResponse.setMax(limit.getMax());
}
@@ -1804,8 +1805,6 @@ public class ApiResponseHelper implements ResponseGenerator {
public SecurityGroupResponse createSecurityGroupResponseFromSecurityGroupRule(List<? extends SecurityRule> securityRules) {
SecurityGroupResponse response = new SecurityGroupResponse();
Map<Long, Account> securiytGroupAccounts = new HashMap<Long, Account>();
- Map<Long, SecurityGroup> allowedSecurityGroups = new HashMap<Long, SecurityGroup>();
- Map<Long, Account> allowedSecuriytGroupAccounts = new HashMap<Long, Account>();
if ((securityRules != null) && !securityRules.isEmpty()) {
SecurityGroupJoinVO securityGroup = ApiDBUtils.findSecurityGroupViewById(securityRules.get(0).getSecurityGroupId()).get(0);
@@ -3008,11 +3007,10 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setCidr(result.getCidr());
StaticRoute.State state = result.getState();
- String stateToSet = state.toString();
- if (state.equals(FirewallRule.State.Revoke)) {
- stateToSet = "Deleting";
+ if (state.equals(StaticRoute.State.Revoke)) {
+ state = StaticRoute.State.Deleting;
}
- response.setState(stateToSet);
+ response.setState(state.toString());
populateAccount(response, result.getAccountId());
populateDomain(response, result.getDomainId());
@@ -3501,11 +3499,11 @@ public class ApiResponseHelper implements ResponseGenerator {
ApplicationLoadBalancerRuleResponse ruleResponse = new ApplicationLoadBalancerRuleResponse();
ruleResponse.setInstancePort(lb.getDefaultPortStart());
ruleResponse.setSourcePort(lb.getSourcePortStart());
- String stateToSet = lb.getState().toString();
+ FirewallRule.State stateToSet = lb.getState();
if (stateToSet.equals(FirewallRule.State.Revoke)) {
- stateToSet = "Deleting";
+ stateToSet = FirewallRule.State.Deleting;
}
- ruleResponse.setState(stateToSet);
+ ruleResponse.setState(stateToSet.toString());
ruleResponse.setObjectName("loadbalancerrule");
ruleResponses.add(ruleResponse);
lbResponse.setLbRules(ruleResponses);
[23/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
fix checkstyle in DedicatedResourceVO.java, trailing space
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29e22384
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29e22384
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29e22384
Branch: refs/heads/ui-restyle
Commit: 29e22384b7e758d12f72dab9cb05d53ed297e147
Parents: 53777c9
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 10:38:30 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Tue Jan 28 10:38:30 2014 -0700
----------------------------------------------------------------------
server/src/com/cloud/dc/DedicatedResourceVO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29e22384/server/src/com/cloud/dc/DedicatedResourceVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java
index 41bdfec..e7d7b3b 100644
--- a/server/src/com/cloud/dc/DedicatedResourceVO.java
+++ b/server/src/com/cloud/dc/DedicatedResourceVO.java
@@ -30,7 +30,7 @@ import javax.persistence.Table;
public class DedicatedResourceVO implements DedicatedResources {
/**
- *
+ *
*/
private static final long serialVersionUID = -6659510127145101917L;
[27/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Add listView async tests
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08d124d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08d124d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08d124d6
Branch: refs/heads/ui-restyle
Commit: 08d124d6b664bedea28b75fab02c6fd217a67a47
Parents: 0518936
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 11:24:20 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 11:24:20 2014 -0800
----------------------------------------------------------------------
ui/tests/test.widget.listView.js | 88 +++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08d124d6/ui/tests/test.widget.listView.js
----------------------------------------------------------------------
diff --git a/ui/tests/test.widget.listView.js b/ui/tests/test.widget.listView.js
index 2209c42..3640a5a 100644
--- a/ui/tests/test.widget.listView.js
+++ b/ui/tests/test.widget.listView.js
@@ -86,4 +86,92 @@
equal($field.html(), v.label, k + '-> Has correct label');
});
});
+
+ test('Data loading state', function() {
+ var $listView = listView();
+
+ equal($listView.find('table.body tr.loading').size(), 1, 'Row has loading state');
+ equal($listView.find('table.body tr.loading td.loading.icon').size(), 1, 'Row cell has loading icon');
+ });
+
+ asyncTest('Data provider: basic', function() {
+ expect(3);
+ var $listView = listView({
+ listView: {
+ fields: {
+ fieldA: { label: 'TestFieldA' },
+ fieldB: { label: 'TestFieldB' }
+ },
+ dataProvider: function(args) {
+ args.response.success({ data: [] });
+
+ ok(true, 'Data provider called');
+ start();
+ }
+ }
+ });
+
+ equal($listView.find('.data-table table.body tbody tr.empty td').size(), 1, 'Body table has empty table row');
+ equal($listView.find('.data-table table.body tbody tr.empty td').html(), 'label.no.data', 'Empty contents notice displayed');
+ });
+
+ asyncTest('Data provider: load data', function() {
+ var $listView = listView({
+ listView: {
+ fields: {
+ fieldA: { label: 'TestFieldA' },
+ fieldB: { label: 'TestFieldB' }
+ },
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { fieldA: 'FieldDataA', fieldB: 'FieldDataB' }
+ ]
+ });
+
+ start();
+ }
+ }
+ });
+
+ equal($listView.find('table.body tbody tr').size(), 1, 'Body table has table row');
+ equal($listView.find('table.body tbody tr td').size(), 2, 'Body table has table cells');
+ equal($listView.find('table.body tbody tr td.fieldA > span').html(), 'FieldDataA', 'FieldDataA content present');
+ equal($listView.find('table.body tbody tr td.fieldB > span').html(), 'FieldDataB', 'FieldDataB content present');
+ });
+
+ asyncTest('Data provider: multiple rows of data', function() {
+ var testData = [
+ { fieldA: 'FieldDataA1', fieldB: 'FieldDataB1' },
+ { fieldA: 'FieldDataA2', fieldB: 'FieldDataB2' },
+ { fieldA: 'FieldDataA3', fieldB: 'FieldDataB3' }
+ ];
+
+ var $listView = listView({
+ listView: {
+ fields: {
+ fieldA: { label: 'TestFieldA' },
+ fieldB: { label: 'TestFieldB' }
+ },
+ dataProvider: function(args) {
+ args.response.success({
+ data: testData
+ });
+
+ start();
+ }
+ }
+ });
+
+ equal($listView.find('table.body tbody tr').size(), 3, 'Body table has correct # of table rows');
+
+ $(testData).map(function(index, data) {
+ var $tr = $listView.find('table.body tbody tr').filter(function() {
+ return $(this).index() === index;
+ });
+
+ equal($tr.find('td.fieldA > span').html(), 'FieldDataA' + (index + 1), 'FieldDataA' + (index + 1) + ' present');
+ equal($tr.find('td.fieldB > span').html(), 'FieldDataB' + (index + 1), 'FieldDataB' + (index + 1) + ' present');
+ });
+ });
}());
[15/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: null-checks(cherry picked from commit
c58e509924e97dfced80981da5c27b9f3aae9b33)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44bc2beb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44bc2beb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44bc2beb
Branch: refs/heads/ui-restyle
Commit: 44bc2beb143992b10ad9a92642dfa1882e48c4d8
Parents: fe262ca
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 15:44:04 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 15:44:04 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/acl/DomainChecker.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44bc2beb/server/src/com/cloud/acl/DomainChecker.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java
index 2e43da3..31b273f 100755
--- a/server/src/com/cloud/acl/DomainChecker.java
+++ b/server/src/com/cloud/acl/DomainChecker.java
@@ -307,7 +307,9 @@ public class DomainChecker extends AdapterBase implements SecurityChecker {
}
}
//didn't find in upper tree
- if (zoneDomainRecord.getPath().contains(accountDomainRecord.getPath())) {
+ if (zoneDomainRecord != null &&
+ accountDomainRecord != null &&
+ zoneDomainRecord.getPath().contains(accountDomainRecord.getPath())) {
return true;
}
}
[05/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Fix the exclusion for opensaml1, this should take care of the repository dependencies causing grief on the jenkins slaves.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/997c0f8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/997c0f8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/997c0f8d
Branch: refs/heads/ui-restyle
Commit: 997c0f8d154cf8d9530ebb3b96c30170faa454c0
Parents: 3bd38eb
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Jan 28 10:33:31 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jan 28 10:33:31 2014 +0100
----------------------------------------------------------------------
awsapi/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/997c0f8d/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index d9f5627..4a6c89c 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -142,7 +142,7 @@
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <artifactId>opensaml1</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -162,7 +162,7 @@
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <artifactId>opensaml1</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -178,7 +178,7 @@
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <artifactId>opensaml1</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -194,7 +194,7 @@
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <artifactId>opensaml1</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -210,7 +210,7 @@
</exclusion>
<exclusion>
<groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
+ <artifactId>opensaml1</artifactId>
</exclusion>
</exclusions>
</dependency>
[35/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
List view: tests for field pre-filter
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebcf6a1d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebcf6a1d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebcf6a1d
Branch: refs/heads/ui-restyle
Commit: ebcf6a1da88c4d750f9342df45fc409be80c9759
Parents: 16a9171
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 14:54:30 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 15:48:44 2014 -0800
----------------------------------------------------------------------
ui/tests/test.widget.listView.js | 38 ++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebcf6a1d/ui/tests/test.widget.listView.js
----------------------------------------------------------------------
diff --git a/ui/tests/test.widget.listView.js b/ui/tests/test.widget.listView.js
index 3640a5a..84f914b 100644
--- a/ui/tests/test.widget.listView.js
+++ b/ui/tests/test.widget.listView.js
@@ -104,7 +104,7 @@
},
dataProvider: function(args) {
args.response.success({ data: [] });
-
+
ok(true, 'Data provider called');
start();
}
@@ -128,7 +128,7 @@
{ fieldA: 'FieldDataA', fieldB: 'FieldDataB' }
]
});
-
+
start();
}
}
@@ -146,7 +146,7 @@
{ fieldA: 'FieldDataA2', fieldB: 'FieldDataB2' },
{ fieldA: 'FieldDataA3', fieldB: 'FieldDataB3' }
];
-
+
var $listView = listView({
listView: {
fields: {
@@ -157,7 +157,7 @@
args.response.success({
data: testData
});
-
+
start();
}
}
@@ -169,9 +169,37 @@
var $tr = $listView.find('table.body tbody tr').filter(function() {
return $(this).index() === index;
});
-
+
equal($tr.find('td.fieldA > span').html(), 'FieldDataA' + (index + 1), 'FieldDataA' + (index + 1) + ' present');
equal($tr.find('td.fieldB > span').html(), 'FieldDataB' + (index + 1), 'FieldDataB' + (index + 1) + ' present');
});
});
+
+ test('Field pre-filter', function() {
+ var $listView = listView({
+ listView: {
+ fields: {
+ fieldA: { label: 'TestFieldA' },
+ fieldB: { label: 'TestFieldB' },
+ fieldHidden: { label: 'TestFieldHidden' }
+ },
+ preFilter: function(args) {
+ return ['fieldHidden'];
+ },
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { fieldA: 'FieldDataA', fieldB: 'FieldDataB', fieldHidden: 'FieldDataHidden' }
+ ]
+ });
+
+ start();
+ }
+ }
+ });
+
+ equal($listView.find('table tr th').size(), 2, 'Correct number of header columns present');
+ equal($listView.find('table.body tbody tr td').size(), 2, 'Correct number of data body columns present');
+ ok(!$listView.find('table.body tbody td.fieldHidden').size(), 'Hidden field not present');
+ });
}());
[46/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65c5de1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65c5de1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65c5de1c
Branch: refs/heads/ui-restyle
Commit: 65c5de1cb604a6547a9bd01bc9c28d55aa30e904
Parents: fdb25d6
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 13:32:29 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 14:57:01 2014 -0800
----------------------------------------------------------------------
.../cloudstack/config/ApiServiceConfiguration.java | 2 +-
server/src/com/cloud/configuration/Config.java | 1 -
.../src/com/cloud/network/as/AutoScaleManagerImpl.java | 4 ++--
.../cloud/network/lb/LoadBalancingRulesManagerImpl.java | 12 +++++-------
setup/db/db/schema-421to430.sql | 2 --
5 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c5de1c/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java
index edf5a21..94c0a55 100644
--- a/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java
+++ b/api/src/org/apache/cloudstack/config/ApiServiceConfiguration.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.framework.config.Configurable;
@Local(value = {ApiServiceConfiguration.class})
public class ApiServiceConfiguration implements Configurable {
public static final ConfigKey<String> ManagementHostIPAdr = new ConfigKey<String>("Advanced", String.class, "host", "localhost", "The ip address of management server", true);
- public static final ConfigKey<String> ApiServletPath = new ConfigKey<String>("Advanced", String.class, "api.servlet.endpoint", "http://localhost:8080/client/api?",
+ public static final ConfigKey<String> ApiServletPath = new ConfigKey<String>("Advanced", String.class, "endpointe.url", "http://localhost:8080/client/api",
"API end point. Can be used by CS components/services deployed remotely, for sending CS API requests", true);
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c5de1c/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 6ba6774..975eecd 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -985,7 +985,6 @@ public enum Config {
"FirstFitPlanner",
"'FirstFitPlanner', 'UserDispersingPlanner', 'UserConcentratedPodPlanner': DeploymentPlanner heuristic that will be used for VM deployment.",
null),
- EndpointeUrl("Advanced", ManagementServer.class, String.class, "endpointe.url", "http://localhost:8080/client/api", "Endpointe Url", null),
ElasticLoadBalancerEnabled(
"Advanced",
ManagementServer.class,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c5de1c/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 321c29f..7492c9a 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -50,13 +50,13 @@ import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.ApiDispatcher;
-import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
@@ -312,7 +312,7 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScale
String apiKey = user.getApiKey();
String secretKey = user.getSecretKey();
- String csUrl = _configDao.getValue(Config.EndpointeUrl.key());
+ String csUrl = ApiServiceConfiguration.ApiServletPath.value();
if (apiKey == null) {
throw new InvalidParameterValueException("apiKey for user: " + user.getUsername() + " is empty. Please generate it");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c5de1c/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 8214274..67346e1 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -30,11 +30,6 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;
@@ -44,14 +39,15 @@ import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleI
import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRulesCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;
import org.apache.cloudstack.api.response.ServiceResponse;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenter.NetworkType;
@@ -168,6 +164,8 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
@Local(value = {LoadBalancingRulesManager.class, LoadBalancingRulesService.class})
public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService {
@@ -305,7 +303,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
User user = _userDao.findByIdIncludingRemoved(autoscaleUserId);
String apiKey = user.getApiKey();
String secretKey = user.getSecretKey();
- String csUrl = _configDao.getValue(Config.EndpointeUrl.key());
+ String csUrl = ApiServiceConfiguration.ApiServletPath.value();
String zoneId = _dcDao.findById(autoScaleVmProfile.getZoneId()).getUuid();
String domainId = _domainDao.findById(autoScaleVmProfile.getDomainId()).getUuid();
String serviceOfferingId = _offeringsDao.findById(autoScaleVmProfile.getServiceOfferingId()).getUuid();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c5de1c/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index fcf9b9f..afad06c 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -898,8 +898,6 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hype
ALTER TABLE `cloud`.`network_acl_item` modify `cidr` varchar(2048);
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'management-server', "api.servlet.endpoint", "http://localhost:8080/client/api?", "API end point. Can be used by CS components/services deployed remotely, for sending CS API requests", "http://localhost:8080/client/api?", NULL,NULL,0);
-
DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
CREATE VIEW `cloud`.`user_vm_view` AS
select
[09/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: moved call on static object to synchronized block(cherry
picked from commit f3529a19a9aad36dbd92e311018643629f19c748)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60e8d131
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60e8d131
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60e8d131
Branch: refs/heads/ui-restyle
Commit: 60e8d131cf27834f4cbbcbccf0174a273cd570c3
Parents: 9eae5f6
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 14:14:47 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 14:14:47 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDispatcher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60e8d131/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 9f4f766..55ef53a 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -427,8 +427,8 @@ public class ApiDispatcher {
}
} else {
DateFormat format = BaseCmd.INPUT_FORMAT;
- format.setLenient(false);
synchronized (format) {
+ format.setLenient(false);
field.set(cmdObj, format.parse(paramObj.toString()));
}
}
[19/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: assign result of string manipulations(cherry picked from
commit 20127e09dc0e341a2f790a8a52cded4c5f1f0cc1)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9edeb24f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9edeb24f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9edeb24f
Branch: refs/heads/ui-restyle
Commit: 9edeb24f3fc64bc5dd42f466fd65025884cee63a
Parents: fae0556
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 16:36:27 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 16:36:27 2014 +0100
----------------------------------------------------------------------
.../security/SecurityGroupManagerImpl.java | 7 +++--
server/src/com/cloud/test/IPRangeConfig.java | 29 ++------------------
2 files changed, 6 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9edeb24f/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index cd68440..d5f9405 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -40,6 +40,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;
@@ -51,8 +54,6 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationSe
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.NetworkRulesSystemVmCommand;
@@ -373,7 +374,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
protected String generateRulesetSignature(Map<PortAndProto, Set<String>> ingress, Map<PortAndProto, Set<String>> egress) {
String ruleset = ingress.toString();
- ruleset.concat(egress.toString());
+ ruleset = ruleset.concat(egress.toString());
return DigestUtils.md5Hex(ruleset);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9edeb24f/server/src/com/cloud/test/IPRangeConfig.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/test/IPRangeConfig.java b/server/src/com/cloud/test/IPRangeConfig.java
index f461995..1d56471 100755
--- a/server/src/com/cloud/test/IPRangeConfig.java
+++ b/server/src/com/cloud/test/IPRangeConfig.java
@@ -69,7 +69,7 @@ public class IPRangeConfig {
long zoneId = PodZoneConfig.getZoneId(zone);
result = changeRange(op, "public", -1, zoneId, startIP, endIP, null, -1);
- result.replaceAll("<br>", "/n");
+ result = result.replaceAll("<br>", "/n");
System.out.println(result);
} else if (type.equals("private")) {
if (args.length != 5 && args.length != 6) {
@@ -92,7 +92,7 @@ public class IPRangeConfig {
long podId = PodZoneConfig.getPodId(pod, zone);
long zoneId = PodZoneConfig.getZoneId(zone);
result = changeRange(op, "private", podId, zoneId, startIP, endIP, null, -1);
- result.replaceAll("<br>", "/n");
+ result = result.replaceAll("<br>", "/n");
System.out.println(result);
} else {
printError(usage());
@@ -569,31 +569,6 @@ public class IPRangeConfig {
"Unable to start DB connection to read guest cidr network. Please contact Cloud Support.");
}
-// public static String getGuestIpNetwork() {
-// return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.ip.network\"", "value",
-// "Unable to start DB connection to read guest IP network. Please contact Cloud Support.");
-// }
-//
-// public static String getGuestNetmask() {
-// return DatabaseConfig.getDatabaseValueString("SELECT * FROM `cloud`.`configuration` WHERE name = \"guest.netmask\"", "value",
-// "Unable to start DB connection to read guest netmask. Please contact Cloud Support.");
-// }
-
-// public static String getGuestSubnet() {
-// String guestIpNetwork = getGuestIpNetwork();
-// String guestNetmask = getGuestNetmask();
-//
-// if (guestIpNetwork == null || guestIpNetwork.isEmpty()) printError("Please enter a valid guest IP network address.");
-// if (guestNetmask == null || guestNetmask.isEmpty()) printError("Please enter a valid guest IP network netmask");
-//
-// return NetUtils.getSubNet(guestIpNetwork, guestNetmask);
-// }
-
-// public static long getGuestCidrSize() {
-// String guestNetmask = getGuestNetmask();
-// return NetUtils.getCidrSize(guestNetmask);
-// }
-
public static boolean validCIDR(final String cidr) {
if (cidr == null || cidr.isEmpty()) {
return false;
[12/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7ee7a74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7ee7a74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7ee7a74
Branch: refs/heads/ui-restyle
Commit: d7ee7a74315fd13b1fd3e4701e8810788aa1e680
Parents: 53feeca
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Tue Jan 28 19:09:26 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Tue Jan 28 19:21:10 2014 +0530
----------------------------------------------------------------------
.../resource/NfsSecondaryStorageResource.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7ee7a74/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 30722e2..4d11dd3 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1716,16 +1716,16 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
parent += File.separator;
}
String absoluteTemplatePath = parent + relativeTemplatePath;
- File tmpltParent = new File(absoluteTemplatePath).getParentFile();
+ File tmpltDir = new File(absoluteTemplatePath);
String details = null;
- if (!tmpltParent.exists()) {
- details = "template parent directory " + tmpltParent.getName() + " doesn't exist";
+ if (!tmpltDir.exists()) {
+ details = "template parent directory " + tmpltDir.getName() + " doesn't exist";
s_logger.debug(details);
return new Answer(cmd, true, details);
}
- File[] tmpltFiles = tmpltParent.listFiles();
+ File[] tmpltFiles = tmpltDir.listFiles();
if (tmpltFiles == null || tmpltFiles.length == 0) {
- details = "No files under template parent directory " + tmpltParent.getName();
+ details = "No files under template parent directory " + tmpltDir.getName();
s_logger.debug(details);
} else {
boolean found = false;
@@ -1751,12 +1751,12 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
if (!found) {
- details = "Can not find template.properties under " + tmpltParent.getName();
+ details = "Can not find template.properties under " + tmpltDir.getName();
s_logger.debug(details);
}
}
- if (!tmpltParent.delete()) {
- details = "Unable to delete directory " + tmpltParent.getName() + " under Template path " + relativeTemplatePath;
+ if (!tmpltDir.delete()) {
+ details = "Unable to delete directory " + tmpltDir.getName() + " under Template path " + relativeTemplatePath;
s_logger.debug(details);
return new Answer(cmd, false, details);
}
[47/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37fa8012
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37fa8012
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37fa8012
Branch: refs/heads/ui-restyle
Commit: 37fa8012f869b24a937034537ee378cdcf8053ff
Parents: 65c5de1
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 14:31:40 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 14:57:01 2014 -0800
----------------------------------------------------------------------
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37fa8012/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index c7906f5..5393a6a 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -26,6 +26,7 @@ import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.ResourceDetail;
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+import org.apache.cloudstack.resourcedetail.dao.AutoScaleVmProfileDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao;
import org.apache.cloudstack.resourcedetail.dao.NetworkACLItemDetailsDao;
@@ -107,6 +108,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
DiskOfferingDetailsDao _diskOfferingDetailsDao;
@Inject
UserDetailsDao _userDetailsDao;
+ @Inject
+ AutoScaleVmProfileDetailsDao _autoScaleVmProfileDetailsDao;
private static Map<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>> s_daoMap = new HashMap<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>>();
@@ -134,6 +137,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
s_daoMap.put(ResourceObjectType.VpnConnection, _vpnConnectionDetailsDao);
s_daoMap.put(ResourceObjectType.DiskOffering, _diskOfferingDetailsDao);
s_daoMap.put(ResourceObjectType.User, _userDetailsDao);
+ s_daoMap.put(ResourceObjectType.AutoScaleVmProfile, _autoScaleVmProfileDetailsDao);
return true;
}
[08/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9eae5f69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9eae5f69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9eae5f69
Branch: refs/heads/ui-restyle
Commit: 9eae5f6929da28182a5218199f4bccaf30f4f7f0
Parents: 4f6638d 95bd04e
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Tue Jan 28 13:49:42 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 13:49:42 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[03/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
These are additional fixes to make Juniper Contrail plugin work
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc981250
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc981250
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc981250
Branch: refs/heads/ui-restyle
Commit: cc98125067575f305ea7621df28c70785128750a
Parents: 4583bac
Author: Sachchidanand Vaidya <va...@juniper.net>
Authored: Wed Jan 8 00:26:46 2014 -0800
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jan 28 08:58:22 2014 +0000
----------------------------------------------------------------------
.../network-elements/juniper-contrail/pom.xml | 6 +
.../cloudstack/contrail/module.properties | 18 +++
.../contrail/spring-contrail-context.xml | 50 ++++++++
.../management/ContrailElementImpl.java | 7 --
.../IntegrationTestConfiguration.java | 73 +++++++++--
.../contrail/management/MockAccountManager.java | 3 -
.../test/resources/commonContext.xml | 126 ++++++-------------
7 files changed, 172 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/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 ae6961e..8c6877d 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -83,6 +83,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-spring-lifecycle</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties b/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties
new file mode 100644
index 0000000..ced0f3a
--- /dev/null
+++ b/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/module.properties
@@ -0,0 +1,18 @@
+# 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.
+name=contrail
+parent=network
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml b/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml
new file mode 100644
index 0000000..4614af7
--- /dev/null
+++ b/plugins/network-elements/juniper-contrail/resources/META-INF/cloudstack/contrail/spring-contrail-context.xml
@@ -0,0 +1,50 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ >
+ <bean id="ContrailManager"
+ class="org.apache.cloudstack.network.contrail.management.ContrailManagerImpl"/>
+ <bean id="ContrailElement"
+ class="org.apache.cloudstack.network.contrail.management.ContrailElementImpl">
+ <property name="name" value="ContrailElement"/>
+ </bean>
+
+ <bean id="ContrailGuru"
+ class="org.apache.cloudstack.network.contrail.management.ContrailGuru">
+ <property name="name" value="ContrailGuru"/>
+ </bean>
+
+ <bean id="ServerDBSync"
+ class="org.apache.cloudstack.network.contrail.management.ServerDBSyncImpl"/>
+ <bean id="ServerEventHandler"
+ class="org.apache.cloudstack.network.contrail.management.ServerEventHandlerImpl"/>
+ <bean id="EventUtils"
+ class="org.apache.cloudstack.network.contrail.management.EventUtils"/>
+ <bean id="ServiceManager"
+ class="org.apache.cloudstack.network.contrail.management.ServiceManagerImpl"/>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java
index 092e4bc..05723b0 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java
@@ -26,7 +26,6 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -90,12 +89,6 @@ public class ContrailElementImpl extends AdapterBase
ServerDBSync _dbSync;
private static final Logger s_logger = Logger.getLogger(ContrailElement.class);
- @Override
- public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- s_logger.debug("configure");
- return true;
- }
-
// PluggableService
@Override
public List<Class<?>> getCommands() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
index 416653d..1a53c17 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
@@ -45,14 +45,17 @@ import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDaoImpl;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDaoImpl;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.DcDetailsDaoImpl;
+import org.apache.cloudstack.engine.orchestration.NetworkOrchestrator;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.service.api.OrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
import org.apache.cloudstack.framework.config.ConfigDepot;
import org.apache.cloudstack.framework.config.ConfigDepotAdmin;
import org.apache.cloudstack.framework.config.dao.ConfigurationDaoImpl;
@@ -65,6 +68,7 @@ import org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor;
import org.apache.cloudstack.framework.jobs.impl.SyncQueueManager;
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDaoImpl;
+import org.apache.cloudstack.network.element.InternalLoadBalancerElement;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMManager;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
@@ -73,6 +77,9 @@ import org.apache.cloudstack.region.PortableIpDaoImpl;
import org.apache.cloudstack.region.PortableIpRangeDaoImpl;
import org.apache.cloudstack.region.RegionManager;
import org.apache.cloudstack.region.dao.RegionDaoImpl;
+import org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry;
+import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
+import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
import org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl;
import org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl;
@@ -120,6 +127,7 @@ import com.cloud.dc.dao.AccountVlanMapDaoImpl;
import com.cloud.dc.dao.ClusterDaoImpl;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.dc.dao.DataCenterDaoImpl;
+import com.cloud.dc.dao.DataCenterDetailsDaoImpl;
import com.cloud.dc.dao.DataCenterIpAddressDaoImpl;
import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl;
import com.cloud.dc.dao.DataCenterVnetDaoImpl;
@@ -141,11 +149,11 @@ import com.cloud.host.dao.HostDetailsDaoImpl;
import com.cloud.host.dao.HostTagsDaoImpl;
import com.cloud.hypervisor.HypervisorGuruManagerImpl;
import com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl;
+import com.cloud.hypervisor.XenServerGuru;
import com.cloud.network.ExternalDeviceUsageManager;
import com.cloud.network.IpAddress;
import com.cloud.network.IpAddressManagerImpl;
import com.cloud.network.Ipv6AddressManagerImpl;
-import com.cloud.network.NetworkModelImpl;
import com.cloud.network.NetworkServiceImpl;
import com.cloud.network.NetworkUsageService;
import com.cloud.network.StorageNetworkManager;
@@ -161,6 +169,7 @@ import com.cloud.network.as.dao.CounterDaoImpl;
import com.cloud.network.dao.AccountGuestVlanMapDaoImpl;
import com.cloud.network.dao.FirewallRulesCidrsDaoImpl;
import com.cloud.network.dao.FirewallRulesDaoImpl;
+import com.cloud.network.dao.IPAddressDaoImpl;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.LBHealthCheckPolicyDaoImpl;
import com.cloud.network.dao.LBStickinessPolicyDaoImpl;
@@ -183,7 +192,11 @@ import com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl;
import com.cloud.network.dao.UserIpv6AddressDaoImpl;
import com.cloud.network.dao.VirtualRouterProviderDaoImpl;
import com.cloud.network.dao.VpnUserDaoImpl;
+import com.cloud.network.element.FirewallServiceProvider;
+import com.cloud.network.element.NetworkACLServiceProvider;
+import com.cloud.network.element.PortForwardingServiceProvider;
import com.cloud.network.element.Site2SiteVpnServiceProvider;
+import com.cloud.network.element.VpcProvider;
import com.cloud.network.firewall.FirewallManagerImpl;
import com.cloud.network.lb.LoadBalancingRulesManagerImpl;
import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl;
@@ -234,7 +247,7 @@ import com.cloud.storage.VolumeApiService;
import com.cloud.storage.dao.DiskOfferingDaoImpl;
import com.cloud.storage.dao.GuestOSCategoryDaoImpl;
import com.cloud.storage.dao.GuestOSDaoImpl;
-import com.cloud.storage.dao.LaunchPermissionDao;
+import com.cloud.storage.dao.LaunchPermissionDaoImpl;
import com.cloud.storage.dao.SnapshotDaoImpl;
import com.cloud.storage.dao.SnapshotPolicyDaoImpl;
import com.cloud.storage.dao.StoragePoolDetailsDaoImpl;
@@ -271,10 +284,13 @@ import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallbackNoReturn;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.vm.ItWorkDaoImpl;
+import com.cloud.vm.UserVmManagerImpl;
+import com.cloud.vm.VirtualMachineManagerImpl;
import com.cloud.vm.dao.ConsoleProxyDaoImpl;
import com.cloud.vm.dao.DomainRouterDaoImpl;
import com.cloud.vm.dao.InstanceGroupDaoImpl;
import com.cloud.vm.dao.InstanceGroupVMMapDaoImpl;
+import com.cloud.vm.dao.NicDaoImpl;
import com.cloud.vm.dao.NicIpAliasDaoImpl;
import com.cloud.vm.dao.NicSecondaryIpDaoImpl;
import com.cloud.vm.dao.SecondaryStorageVmDaoImpl;
@@ -291,19 +307,19 @@ import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
AsyncJobJournalDaoImpl.class, AsyncJobManagerImpl.class, AutoScalePolicyConditionMapDaoImpl.class, AutoScalePolicyDaoImpl.class, AutoScaleVmGroupDaoImpl.class,
AutoScaleVmGroupPolicyMapDaoImpl.class, AutoScaleVmProfileDaoImpl.class, CapacityDaoImpl.class, ClusterDaoImpl.class, ClusterDetailsDaoImpl.class,
ConditionDaoImpl.class, ConfigurationDaoImpl.class, ConfigurationManagerImpl.class, ConfigurationServerImpl.class, ConsoleProxyDaoImpl.class,
- ContrailElementImpl.class, ContrailGuru.class, ContrailManagerImpl.class, CounterDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class,
+ ContrailElementImpl.class, ContrailGuru.class, ContrailManagerImpl.class, CounterDaoImpl.class, DataCenterDaoImpl.class, DataCenterDetailsDaoImpl.class, DataCenterIpAddressDaoImpl.class,
DataCenterJoinDaoImpl.class, DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, DcDetailsDaoImpl.class, DedicatedResourceDaoImpl.class,
DiskOfferingDaoImpl.class, DiskOfferingJoinDaoImpl.class, DomainDaoImpl.class, DomainManagerImpl.class, DomainRouterDaoImpl.class, DomainRouterJoinDaoImpl.class,
- EventDaoImpl.class, EventJoinDaoImpl.class, EventUtils.class, EventUtils.class, FirewallManagerImpl.class, FirewallRulesCidrsDaoImpl.class,
+ EventDaoImpl.class, EventJoinDaoImpl.class, EventUtils.class, ExtensionRegistry.class, FirewallManagerImpl.class, FirewallRulesCidrsDaoImpl.class,
FirewallRulesDaoImpl.class, GuestOSCategoryDaoImpl.class, GuestOSDaoImpl.class, HostDaoImpl.class, HostDetailsDaoImpl.class, HostJoinDaoImpl.class,
HostPodDaoImpl.class, HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, HypervisorCapabilitiesDaoImpl.class, HypervisorGuruManagerImpl.class,
ImageStoreDaoImpl.class, ImageStoreJoinDaoImpl.class, InstanceGroupDaoImpl.class, InstanceGroupJoinDaoImpl.class,
- InstanceGroupVMMapDaoImpl.class, IpAddressManagerImpl.class, Ipv6AddressManagerImpl.class, ItWorkDaoImpl.class, LBHealthCheckPolicyDaoImpl.class,
- LBStickinessPolicyDaoImpl.class, LaunchPermissionDao.class, LoadBalancerDaoImpl.class, LoadBalancerVMMapDaoImpl.class, LoadBalancingRulesManagerImpl.class,
+ InstanceGroupVMMapDaoImpl.class, InternalLoadBalancerElement.class, IPAddressDaoImpl.class, IpAddressManagerImpl.class, Ipv6AddressManagerImpl.class, ItWorkDaoImpl.class, LBHealthCheckPolicyDaoImpl.class,
+ LBStickinessPolicyDaoImpl.class, LaunchPermissionDaoImpl.class, LoadBalancerDaoImpl.class, LoadBalancerVMMapDaoImpl.class, LoadBalancingRulesManagerImpl.class,
ManagementServerHostDaoImpl.class, MockAccountManager.class, NetworkACLDaoImpl.class, NetworkACLItemDaoImpl.class, NetworkACLManagerImpl.class,
- NetworkAccountDaoImpl.class, NetworkDaoImpl.class, NetworkDomainDaoImpl.class, NetworkModelImpl.class, NetworkOfferingDaoImpl.class,
- NetworkOfferingDetailsDaoImpl.class, NetworkOfferingServiceMapDaoImpl.class, NetworkOpDaoImpl.class, NetworkRuleConfigDaoImpl.class, NetworkServiceImpl.class,
- NetworkServiceMapDaoImpl.class, NicIpAliasDaoImpl.class, NicSecondaryIpDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class,
+ NetworkAccountDaoImpl.class, NetworkDaoImpl.class, NetworkDomainDaoImpl.class, NetworkOfferingDaoImpl.class,
+ NetworkOfferingDetailsDaoImpl.class, NetworkOfferingServiceMapDaoImpl.class, NetworkOpDaoImpl.class, NetworkOrchestrator.class, NetworkRuleConfigDaoImpl.class, NetworkServiceImpl.class,
+ NetworkServiceMapDaoImpl.class, NicDaoImpl.class, NicIpAliasDaoImpl.class, NicSecondaryIpDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkServiceProviderDaoImpl.class,
PhysicalNetworkTrafficTypeDaoImpl.class, PlannerHostReservationDaoImpl.class, PodVlanDaoImpl.class, PodVlanMapDaoImpl.class, PortForwardingRulesDaoImpl.class,
PortableIpDaoImpl.class, PortableIpRangeDaoImpl.class, PrimaryDataStoreDaoImpl.class, PrivateIpDaoImpl.class, ProjectAccountDaoImpl.class,
ProjectAccountJoinDaoImpl.class, ProjectInvitationDaoImpl.class, ProjectDaoImpl.class, ProjectInvitationJoinDaoImpl.class, ProjectJoinDaoImpl.class,
@@ -315,11 +331,11 @@ import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
SnapshotDaoImpl.class, SnapshotPolicyDaoImpl.class, StaticRouteDaoImpl.class, StatsCollector.class, StoragePoolDetailsDaoImpl.class, StoragePoolHostDaoImpl.class,
StoragePoolJoinDaoImpl.class, SyncQueueItemDaoImpl.class, TemplateDataStoreDaoImpl.class, TemplateJoinDaoImpl.class, UploadDaoImpl.class, UsageEventDaoImpl.class,
UserAccountJoinDaoImpl.class, UserDaoImpl.class, UserIpv6AddressDaoImpl.class, UserStatisticsDaoImpl.class, UserStatsLogDaoImpl.class,
- UserVmCloneSettingDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, UserVmJoinDaoImpl.class, VMInstanceDaoImpl.class, VMSnapshotDaoImpl.class,
- VMTemplateDaoImpl.class, VMTemplateDetailsDaoImpl.class, VMTemplateHostDaoImpl.class, VMTemplateZoneDaoImpl.class, VirtualRouterProviderDaoImpl.class,
+ UserVmCloneSettingDaoImpl.class, UserVmDaoImpl.class, UserVmDetailsDaoImpl.class, UserVmJoinDaoImpl.class, UserVmManagerImpl.class, VMInstanceDaoImpl.class, VMSnapshotDaoImpl.class,
+ VMTemplateDaoImpl.class, VMTemplateDetailsDaoImpl.class, VMTemplateHostDaoImpl.class, VMTemplateZoneDaoImpl.class, VirtualMachineManagerImpl.class, VirtualRouterProviderDaoImpl.class,
VlanDaoImpl.class, VmDiskStatisticsDaoImpl.class, VmRulesetLogDaoImpl.class, VolumeDaoImpl.class, VolumeHostDaoImpl.class, VolumeJoinDaoImpl.class, VpcDaoImpl.class,
VpcGatewayDaoImpl.class, VpcManagerImpl.class, VpcOfferingDaoImpl.class, VpcOfferingServiceMapDaoImpl.class, VpcServiceMapDaoImpl.class,
- VpcVirtualNetworkApplianceManagerImpl.class, VpnUserDaoImpl.class}, includeFilters = {@Filter(value = IntegrationTestConfiguration.ComponentFilter.class,
+ VpcVirtualNetworkApplianceManagerImpl.class, VpnUserDaoImpl.class, XenServerGuru.class}, includeFilters = {@Filter(value = IntegrationTestConfiguration.ComponentFilter.class,
type = FilterType.CUSTOM)}, useDefaultFilters = false)
@Configuration
public class IntegrationTestConfiguration {
@@ -711,5 +727,36 @@ public class IntegrationTestConfiguration {
public VolumeOrchestrationService volumeOrchestrationService() {
return Mockito.mock(VolumeOrchestrationService.class);
}
-
+ @Bean
+ public FirewallServiceProvider firewallServiceProvider() {
+ return Mockito.mock(FirewallServiceProvider.class);
+ }
+ @Bean
+ public PortForwardingServiceProvider portForwardingServiceProvider() {
+ return Mockito.mock(PortForwardingServiceProvider.class);
+ }
+ @Bean
+ public NetworkACLServiceProvider networkACLServiceProvider() {
+ return Mockito.mock(NetworkACLServiceProvider.class);
+ }
+ @Bean
+ public VpcProvider vpcProvier() {
+ return Mockito.mock(VpcProvider.class);
+ }
+ @Bean
+ public VolumeService volumeService() {
+ return Mockito.mock(VolumeService.class);
+ }
+ @Bean
+ public PrimaryDataStoreProviderManager privateDataStoreProviderManager() {
+ return Mockito.mock(PrimaryDataStoreProviderManager.class);
+ }
+ @Bean
+ public ImageStoreProviderManager imageStoreProviderManager() {
+ return Mockito.mock(ImageStoreProviderManager.class);
+ }
+ @Bean
+ public DataStoreProvider dataStoreProvider() {
+ return Mockito.mock(DataStoreProvider.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index 2f81688..fa7be58 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -34,7 +34,6 @@ import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import org.apache.cloudstack.context.CallContext;
-import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.vo.ControlledViewEntity;
import com.cloud.configuration.ResourceLimit;
import com.cloud.configuration.dao.ResourceCountDao;
@@ -69,8 +68,6 @@ public class MockAccountManager extends ManagerBase implements AccountManager {
ResourceCountDao _resourceCountDao;
@Inject
- AccountJoinDao _accountJoinDao;
- @Inject
UserDao _userDao;
UserVO _systemUser;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc981250/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml b/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
index eef908f..6f46f6d 100644
--- a/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
+++ b/plugins/network-elements/juniper-contrail/test/resources/commonContext.xml
@@ -23,6 +23,7 @@
<!-- <context:component-scan base-package="org.apache.cloudstack, com.cloud" /> -->
<!-- @DB support -->
+ <bean id="componentContext" class="com.cloud.utils.component.ComponentContext"/>
<bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
<bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
<bean id="contrailEventInterceptor"
@@ -40,103 +41,52 @@
<bean id="eventBus" class="org.apache.cloudstack.framework.messagebus.MessageBusBase" />
- <bean id="eventDaoImpl" class="com.cloud.event.dao.EventDaoImpl" />
- <bean id="actionEventUtils" class="com.cloud.event.ActionEventUtils" />
- <bean id="usageEventDaoImpl" class="com.cloud.event.dao.UsageEventDaoImpl" />
-
- <!--<bean id="eventUtils" class="com.cloud.event.EventUtils" /> -->
-
- <bean id="accountDaoImpl" class="com.cloud.user.dao.AccountDaoImpl" />
- <bean id="accountDetailsDaoImpl" class="com.cloud.user.AccountDetailsDaoImpl" />
- <bean id="accountJoinDaoImpl" class="com.cloud.api.query.dao.AccountJoinDaoImpl" />
- <bean id="accountVlanMapDaoImpl" class="com.cloud.dc.dao.AccountVlanMapDaoImpl" />
- <bean id="launchPermissionDaoImpl" class="com.cloud.storage.dao.LaunchPermissionDaoImpl" />
- <bean id="primaryDataStoreDaoImpl"
- class="org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl" />
- <bean id="iPAddressDaoImpl" class="com.cloud.network.dao.IPAddressDaoImpl" />
- <bean id="apiResponseHelper" class="com.cloud.api.ApiResponseHelper" />
- <bean id="nicDaoImpl" class="com.cloud.vm.dao.NicDaoImpl" />
-
- <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
-
- <bean id="IntegrationTestConfiguration"
- class="org.apache.cloudstack.network.contrail.management.IntegrationTestConfiguration" />
-
- <bean id="HypervisorGuru" class="com.cloud.hypervisor.XenServerGuru" />
-
- <!-- Management traffic -->
- <bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru" />
-
- <bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru" />
-
- <bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru" />
-
- <bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru" />
-
- <bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru" />
-
- <bean id="VpcVirtualRouterElement" class="com.cloud.network.element.VpcVirtualRouterElement" />
-
- <bean id="VirtualRouterElement" class="com.cloud.network.element.VirtualRouterElement" />
-
- <!-- <bean id="Ipv6AddressManager" class="com.cloud.network.Ipv6AddressManagerImpl"/> -->
-
-
- <bean id="com.cloud.network.security.SecurityGroupManager" class="com.cloud.network.security.SecurityGroupManagerImpl" />
-
- <bean id="SecurityGroupElement" class="com.cloud.network.element.SecurityGroupElement" />
-
- <bean id="InternalLbVm"
- class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
- <property name="name" value="InternalLbVm" />
+ <!-- registry definition -->
+ <bean id="networkGurusRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+ </bean>
+ <bean id="networkElementsRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
</bean>
- <!-- <bean id="UserAuthenticator" class="com.cloud.server.auth.PlainTextUserAuthenticator"/>
- <bean id="ManagementServer" class="com.cloud.server.ManagementServerImpl"/> <bean
- id="SecondaryStorageVmManager" class="com.cloud.storage.secondary.SecondaryStorageManagerImpl"/>
- <bean id="PodAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator"/> -->
- <bean id="com.cloud.vm.UserVmManager" class="com.cloud.vm.UserVmManagerImpl" />
-
- <bean id="com.cloud.vm.VirtualMachineManager" class="com.cloud.vm.VirtualMachineManagerImpl" />
-
- <!-- <bean id="com.cloud.vm.dao.UserVmDao" class="com.cloud.vm.dao.UserVmDaoImpl"/> -->
- <bean id="ContrailElement"
- class="org.apache.cloudstack.network.contrail.management.ContrailElementImpl" />
-
- <bean id="ContrailGuru" class="org.apache.cloudstack.network.contrail.management.ContrailGuru" />
- <bean id="networkElements" class="com.cloud.utils.component.AdapterList">
- <property name="Adapters">
- <list>
- <ref bean="ContrailElement" />
- <ref bean="VirtualRouterElement" />
- <ref bean="SecurityGroupElement" />
- <ref bean="VpcVirtualRouterElement" />
- <ref bean="InternalLbVm" />
- </list>
- </property>
+ <bean id="ipDeployersRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
</bean>
- <bean id="networkGurus" class="com.cloud.utils.component.AdapterList">
- <property name="Adapters">
- <list>
- <ref bean="ContrailGuru" />
- <ref bean="PublicNetworkGuru" />
- <ref bean="PodBasedNetworkGuru" />
- <ref bean="ControlNetworkGuru" />
- <ref bean="StorageNetworkGuru" />
- </list>
- </property>
+ <bean id="dhcpProvidersRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
</bean>
+ <!-- registry -->
+ <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
+ <property name="registry" ref="networkElementsRegistry" />
+ <property name="typeClass" value="com.cloud.network.element.NetworkElement" />
+ </bean>
- <bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl">
- <property name="NetworkElements" value="#{networkElements.Adapters}" />
+ <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
+ <property name="registry" ref="networkGurusRegistry" />
+ <property name="typeClass" value="com.cloud.network.guru.NetworkGuru" />
+ </bean>
+
+ <!-- registry users -->
+ <bean id="NetworkModel" class="com.cloud.network.NetworkModelImpl">
+ <property name="networkElements" value="#{networkElementsRegistry.registered}" />
</bean>
- <bean id="networkOrchestrator" class="org.apache.cloudstack.engine.orchestration.NetworkOrchestrator">
- <property name="NetworkElements" value="#{networkElements.Adapters}" />
- <property name="NetworkGurus" value="#{networkGurus.Adapters}" />
+ <bean id="networkServiceImpl" class="com.cloud.network.NetworkServiceImpl">
+ <property name="networkGurus" value="#{networkGurusRegistry.registered}" />
</bean>
-</beans>
+ <bean id="networkOrchestrator"
+ class="org.apache.cloudstack.engine.orchestration.NetworkOrchestrator">
+ <property name="networkGurus" value="#{networkGurusRegistry.registered}" />
+ <property name="networkElements" value="#{networkElementsRegistry.registered}" />
+ <property name="ipDeployers" value="#{ipDeployersRegistry.registered}" />
+ <property name="dhcpProviders" value="#{dhcpProvidersRegistry.registered}" />
+ </bean>
+
+ <bean id="IntegrationTestConfiguration"
+ class="org.apache.cloudstack.network.contrail.management.IntegrationTestConfiguration"/>
+
+ </beans>
[32/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: comparison of wrapper objects
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd2acd1e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd2acd1e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd2acd1e
Branch: refs/heads/ui-restyle
Commit: bd2acd1eff5d84630318cef0cde2c81204d07586
Parents: 547aa36
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 23:20:45 2014 +0100
Committer: Daan Hoogland <da...@gmail.com>
Committed: Tue Jan 28 23:20:45 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/server/StatsCollector.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd2acd1e/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 95ae047..601ab12 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -839,11 +839,11 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
Double sum = avgCounter.get(counter_count);
Double avg = sum / currentVM;
Operator op = conditionVO.getRelationalOperator();
- boolean bConditionCheck = ((op == com.cloud.network.as.Condition.Operator.EQ) && (thresholdPercent == avg))
- || ((op == com.cloud.network.as.Condition.Operator.GE) && (avg >= thresholdPercent))
- || ((op == com.cloud.network.as.Condition.Operator.GT) && (avg > thresholdPercent))
- || ((op == com.cloud.network.as.Condition.Operator.LE) && (avg <= thresholdPercent))
- || ((op == com.cloud.network.as.Condition.Operator.LT) && (avg < thresholdPercent));
+ boolean bConditionCheck = ((op == com.cloud.network.as.Condition.Operator.EQ) && (thresholdPercent.equals(avg)))
+ || ((op == com.cloud.network.as.Condition.Operator.GE) && (avg.doubleValue() >= thresholdPercent.doubleValue()))
+ || ((op == com.cloud.network.as.Condition.Operator.GT) && (avg.doubleValue() > thresholdPercent.doubleValue()))
+ || ((op == com.cloud.network.as.Condition.Operator.LE) && (avg.doubleValue() <= thresholdPercent.doubleValue()))
+ || ((op == com.cloud.network.as.Condition.Operator.LT) && (avg.doubleValue() < thresholdPercent.doubleValue()));
if (!bConditionCheck) {
bValid = false;
[44/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
ResizeVolume API - volumeId should be a required parameter
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b781d1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b781d1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b781d1a
Branch: refs/heads/ui-restyle
Commit: 3b781d1a227e59e8a7a1602737ed2cd04d393177
Parents: 68937cd
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 10:25:54 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 14:57:00 2014 -0800
----------------------------------------------------------------------
.../cloudstack/api/command/user/volume/ResizeVolumeCmd.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b781d1a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
index 0cc8039..e691944 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@ -16,8 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -28,6 +26,7 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
@@ -47,7 +46,7 @@ public class ResizeVolumeCmd extends BaseAsyncCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @Parameter(name = ApiConstants.ID, entityType = VolumeResponse.class, type = CommandType.UUID, description = "the ID of the disk volume")
+ @Parameter(name = ApiConstants.ID, entityType = VolumeResponse.class, required = true, type = CommandType.UUID, description = "the ID of the disk volume")
private Long id;
@Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, required = false, description = "New volume size in G")
[42/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Allow even more memory for findbugs, awsapi is hungry
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12777e9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12777e9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12777e9e
Branch: refs/heads/ui-restyle
Commit: 12777e9e3a633dda51f14229ae7d0587d6a34577
Parents: 920163f
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Jan 29 13:42:55 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Jan 29 13:44:20 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12777e9e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d8c8851..1d2304f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
<threshold>High</threshold>
<xmlOutput>true</xmlOutput>
<failOnError>false</failOnError>
- <maxHeap>1024</maxHeap>
+ <maxHeap>2048</maxHeap>
</configuration>
<executions>
<execution>
[49/50] [abbrv] Merge branch 'master' into ui-restyle
Posted by bf...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/index.jsp
----------------------------------------------------------------------
diff --cc ui/index.jsp
index 8e3062b,096747b..ca5b950
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@@ -62,9 -69,9 +62,9 @@@
<!-- Select language -->
<div class="select-language">
<select name="language">
- <option value=""></option> <!-- when this blank option is selected, browser's default language will be used -->
+ <option value=""><fmt:message key="label.use.default.language"/></option> <!-- when this blank option is selected, browser's default language will be used -->
<option value="en"><fmt:message key="label.lang.english"/></option>
- <option value="ja"><fmt:message key="label.lang.japanese"/></option>
+ <option value="ja_JP"><fmt:message key="label.lang.japanese"/></option>
<option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
<option value="ru_RU"><fmt:message key="label.lang.russian"/></option>
<option value="fr_FR"><fmt:message key="label.lang.french"/></option>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui-custom/accountsWizard.js
----------------------------------------------------------------------
diff --cc ui/scripts/ui-custom/accountsWizard.js
index 56064a6,f2017f8..f94173c
--- a/ui/scripts/ui-custom/accountsWizard.js
+++ b/ui/scripts/ui-custom/accountsWizard.js
@@@ -25,7 -25,11 +25,10 @@@
var $form = $wizard.find('form');
var close = function() {
-- $wizard.dialog('destroy');
+ $wizard.remove();
+ $('div.overlay').fadeOut(function() {
+ $('div.overlay').remove();
+ });
};
var completeAction = function() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
[22/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: removed obfuscating fields(cherry picked from commit
9495c68c1378e379880433d45ec43bfda75ec3f9)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53777c95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53777c95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53777c95
Branch: refs/heads/ui-restyle
Commit: 53777c9523aad0c4544811194f8fe44b7e9958d4
Parents: be21822
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 17:42:17 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 17:42:17 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/ExternalIpAddressAllocator.java | 9 ++++-----
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53777c95/server/src/com/cloud/network/ExternalIpAddressAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalIpAddressAllocator.java b/server/src/com/cloud/network/ExternalIpAddressAllocator.java
index 2b84231..3cf3580 100644
--- a/server/src/com/cloud/network/ExternalIpAddressAllocator.java
+++ b/server/src/com/cloud/network/ExternalIpAddressAllocator.java
@@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Local(value = IpAddrAllocator.class)
public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAllocator {
private static final Logger s_logger = Logger.getLogger(ExternalIpAddressAllocator.class);
- String _name;
@Inject
ConfigurationDao _configDao = null;
@Inject
@@ -52,10 +51,10 @@ public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAll
@Override
public IpAddr getPrivateIpAddress(String macAddr, long dcId, long podId) {
- if (_externalIpAllocatorUrl == null || this._externalIpAllocatorUrl.equalsIgnoreCase("")) {
+ if (_externalIpAllocatorUrl == null || _externalIpAllocatorUrl.equalsIgnoreCase("")) {
return new IpAddr();
}
- String urlString = this._externalIpAllocatorUrl + "?command=getIpAddr&mac=" + macAddr + "&dc=" + dcId + "&pod=" + podId;
+ String urlString = _externalIpAllocatorUrl + "?command=getIpAddr&mac=" + macAddr + "&dc=" + dcId + "&pod=" + podId;
s_logger.debug("getIP:" + urlString);
BufferedReader in = null;
@@ -101,11 +100,11 @@ public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAll
@Override
public boolean releasePrivateIpAddress(String ip, long dcId, long podId) {
/*TODO: call API to release the ip address from external DHCP server*/
- if (_externalIpAllocatorUrl == null || this._externalIpAllocatorUrl.equalsIgnoreCase("")) {
+ if (_externalIpAllocatorUrl == null || _externalIpAllocatorUrl.equalsIgnoreCase("")) {
return false;
}
- String urlString = this._externalIpAllocatorUrl + "?command=releaseIpAddr&ip=" + ip + "&dc=" + dcId + "&pod=" + podId;
+ String urlString = _externalIpAllocatorUrl + "?command=releaseIpAddr&ip=" + ip + "&dc=" + dcId + "&pod=" + podId;
s_logger.debug("releaseIP:" + urlString);
BufferedReader in = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53777c95/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 1e3926d..78652a2 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -105,7 +105,6 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana
public static final String VM_WORK_JOB_HANDLER = VMSnapshotManagerImpl.class.getSimpleName();
- String _name;
@Inject
VMInstanceDao _vmInstanceDao;
@Inject VMSnapshotDao _vmSnapshotDao;
[26/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5968 last patch fixes setting low currentMemory during
overprovision, this one explicitly tells libvirt we dont want a
balloon device (won't use it anyway, and will just suck up a percent
of vm memory)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05189361
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05189361
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05189361
Branch: refs/heads/ui-restyle
Commit: 05189361b79e9ebd33486cf8d564a5e85a6747d8
Parents: 0c28b66
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 11:50:40 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Tue Jan 28 11:51:23 2014 -0700
----------------------------------------------------------------------
.../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05189361/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 9fd058f..5aeacda 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -162,6 +162,8 @@ public class LibvirtVMDef {
}
if (_memBalloning) {
resBuidler.append("<devices>\n" + "<memballoon model='virtio'/>\n" + "</devices>\n");
+ } else {
+ resBuidler.append("<devices>\n" + "<memballoon model='none'/>\n" + "</devices>\n");
}
if (_vcpu != -1) {
resBuidler.append("<vcpu>" + _vcpu + "</vcpu>\n");
[38/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5900: Failed to delete template/ISO that failed to download.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c4bbecc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c4bbecc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c4bbecc
Branch: refs/heads/ui-restyle
Commit: 1c4bbecc4a50b059b8bb87a802023ee6f48ca1f2
Parents: 1c57dd7
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jan 29 13:55:44 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Wed Jan 29 14:07:59 2014 +0530
----------------------------------------------------------------------
.../resource/NfsSecondaryStorageResource.java | 23 +++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c4bbecc/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 4d11dd3..3d99443 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1716,16 +1716,23 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
parent += File.separator;
}
String absoluteTemplatePath = parent + relativeTemplatePath;
- File tmpltDir = new File(absoluteTemplatePath);
+
+ File tmpltParent;
+ if(absoluteTemplatePath.endsWith(String.valueOf(obj.getId()))) {
+ tmpltParent = new File(absoluteTemplatePath);
+ } else {
+ tmpltParent = new File(absoluteTemplatePath).getParentFile();
+ }
+
String details = null;
- if (!tmpltDir.exists()) {
- details = "template parent directory " + tmpltDir.getName() + " doesn't exist";
+ if (!tmpltParent.exists()) {
+ details = "template parent directory " + tmpltParent.getName() + " doesn't exist";
s_logger.debug(details);
return new Answer(cmd, true, details);
}
- File[] tmpltFiles = tmpltDir.listFiles();
+ File[] tmpltFiles = tmpltParent.listFiles();
if (tmpltFiles == null || tmpltFiles.length == 0) {
- details = "No files under template parent directory " + tmpltDir.getName();
+ details = "No files under template parent directory " + tmpltParent.getName();
s_logger.debug(details);
} else {
boolean found = false;
@@ -1751,12 +1758,12 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
if (!found) {
- details = "Can not find template.properties under " + tmpltDir.getName();
+ details = "Can not find template.properties under " + tmpltParent.getName();
s_logger.debug(details);
}
}
- if (!tmpltDir.delete()) {
- details = "Unable to delete directory " + tmpltDir.getName() + " under Template path " + relativeTemplatePath;
+ if (!tmpltParent.delete()) {
+ details = "Unable to delete directory " + tmpltParent.getName() + " under Template path " + relativeTemplatePath;
s_logger.debug(details);
return new Answer(cmd, false, details);
}
[14/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: retrieve the objects to remove from the collection(s)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe262caa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe262caa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe262caa
Branch: refs/heads/ui-restyle
Commit: fe262caa7561c23098cc8fc9674ff8d0e59e1c25
Parents: d7ee7a7
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Tue Jan 28 15:36:40 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 15:36:40 2014 +0100
----------------------------------------------------------------------
.../deploy/DeploymentPlanningManagerImpl.java | 23 ++++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe262caa/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index ec20067..35a0b39 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -165,7 +165,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
public void setStoragePoolAllocators(List<StoragePoolAllocator> storagePoolAllocators) {
- this._storagePoolAllocators = storagePoolAllocators;
+ _storagePoolAllocators = storagePoolAllocators;
}
protected List<HostAllocator> _hostAllocators;
@@ -175,7 +175,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
public void setHostAllocators(List<HostAllocator> hostAllocators) {
- this._hostAllocators = hostAllocators;
+ _hostAllocators = hostAllocators;
}
@Inject
@@ -221,7 +221,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
public void setPlanners(List<DeploymentPlanner> planners) {
- this._planners = planners;
+ _planners = planners;
}
protected List<AffinityGroupProcessor> _affinityProcessors;
@@ -231,7 +231,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {
- this._affinityProcessors = affinityProcessors;
+ _affinityProcessors = affinityProcessors;
}
@Override
@@ -1142,9 +1142,9 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
List<StoragePool> suitablePools = new ArrayList<StoragePool>();
StoragePool pool = null;
if (toBeCreated.getPoolId() != null) {
- pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());
+ pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(toBeCreated.getPoolId());
} else {
- pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(plan.getPoolId());
+ pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(plan.getPoolId());
}
if (!pool.isInMaintenance()) {
@@ -1156,7 +1156,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
if (plan.getDataCenterId() == exstPoolDcId && plan.getPodId() == exstPoolPodId && plan.getClusterId() == exstPoolClusterId) {
canReusePool = true;
} else if (plan.getDataCenterId() == exstPoolDcId) {
- DataStore dataStore = this.dataStoreMgr.getPrimaryDataStore(pool.getId());
+ DataStore dataStore = dataStoreMgr.getPrimaryDataStore(pool.getId());
if (dataStore != null && dataStore.getScope() != null && dataStore.getScope().getScopeType() == ScopeType.ZONE) {
canReusePool = true;
}
@@ -1259,9 +1259,14 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
}
}
- if (suitableVolumeStoragePools.values() != null) {
- poolsToAvoidOutput.removeAll(suitableVolumeStoragePools.values());
+ HashSet<Long> toRemove = new HashSet<Long>();
+ for (List<StoragePool> lsp : suitableVolumeStoragePools.values()) {
+ for (StoragePool sp : lsp) {
+ toRemove.add(sp.getId());
+ }
}
+ poolsToAvoidOutput.removeAll(toRemove);
+
if (avoid.getPoolsToAvoid() != null) {
avoid.getPoolsToAvoid().addAll(poolsToAvoidOutput);
}
[31/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
multi-edit UI: Fix wrapping for multirange (start-end) fields
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/547aa367
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/547aa367
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/547aa367
Branch: refs/heads/ui-restyle
Commit: 547aa36707087beca72055dc5eceef195061a3ba
Parents: 25d8e3d
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 11:55:43 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 11:55:43 2014 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/547aa367/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 18a88ba..993673b 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -7624,7 +7624,6 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal
.multi-edit .range input {
width: 35px;
- margin-left: 6px;
margin-right: 2px;
position: relative;
}
[48/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b38c033d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b38c033d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b38c033d
Branch: refs/heads/ui-restyle
Commit: b38c033d5c84af6a79150bc099b88ceba54a2c63
Parents: 37fa801
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 17:12:46 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 17:12:46 2014 -0800
----------------------------------------------------------------------
.../com/cloud/api/query/QueryManagerImpl.java | 22 +++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b38c033d/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index bdd4132..27a0529 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -26,9 +26,6 @@ import java.util.Set;
import javax.ejb.Local;
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -90,6 +87,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.query.QueryService;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.dao.AffinityGroupJoinDao;
@@ -175,8 +174,8 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDetailsDao;
import com.cloud.tags.ResourceTagVO;
import com.cloud.tags.dao.ResourceTagDao;
-import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.template.VirtualMachineTemplate.State;
+import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.DomainManager;
@@ -2828,10 +2827,17 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
if (!permittedAccounts.isEmpty()) {
for (Account account : permittedAccounts) {
permittedAccountIds.add(account.getId());
- DomainVO accountDomain = _domainDao.findById(account.getDomainId());
+ boolean publicTemplates = (templateFilter == TemplateFilter.featured || templateFilter == TemplateFilter.community);
// get all parent domain ID's all the way till root domain
- DomainVO domainTreeNode = accountDomain;
+ DomainVO domainTreeNode = null;
+ //if template filter is featured, or community, all child domains should be included in search
+ if (publicTemplates) {
+ domainTreeNode = _domainDao.findById(Domain.ROOT_DOMAIN);
+
+ } else {
+ domainTreeNode = _domainDao.findById(account.getDomainId());
+ }
relatedDomainIds.add(domainTreeNode.getId());
while (domainTreeNode.getParent() != null) {
domainTreeNode = _domainDao.findById(domainTreeNode.getParent());
@@ -2839,8 +2845,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
}
// get all child domain ID's
- if (_accountMgr.isAdmin(account.getType()) || (templateFilter == TemplateFilter.featured || templateFilter == TemplateFilter.community)) {
- List<DomainVO> allChildDomains = _domainDao.findAllChildren(accountDomain.getPath(), accountDomain.getId());
+ if (_accountMgr.isAdmin(account.getType()) || publicTemplates) {
+ List<DomainVO> allChildDomains = _domainDao.findAllChildren(domainTreeNode.getPath(), domainTreeNode.getId());
for (DomainVO childDomain : allChildDomains) {
relatedDomainIds.add(childDomain.getId());
}
[29/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5970: UI > network menu > guest network section > select non-VPC isolated network with SourceNAT enabled > IP Address section > select sourceNAT IP > show Configuration tab.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23f3047e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23f3047e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23f3047e
Branch: refs/heads/ui-restyle
Commit: 23f3047e7d4e0d53f830a9a316d9ec37cbfd0b3f
Parents: 18a3d3c
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jan 28 11:42:55 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Jan 28 11:44:09 2014 -0800
----------------------------------------------------------------------
ui/scripts/network.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23f3047e/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index e4cd8b0..0aa5473 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2226,7 +2226,7 @@
}
}
- if (ipAddress.issourcenat) {
+ if (ipAddress.vpcid != null && ipAddress.issourcenat) { //don't show Configuration(ipRules) tab on VPC sourceNAT IP
disableIpRules = true;
}
[13/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: null check for gateway and netmask instead of gateway
twice(cherry picked from commit
d30ddf6d59732fa30855811e7fe0aa639ee3849a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53feecaa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53feecaa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53feecaa
Branch: refs/heads/ui-restyle
Commit: 53feecaa76b7c4a10e1bbe8280b6f28c638b18f8
Parents: a71871d
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 14:53:11 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 14:53:11 2014 +0100
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53feecaa/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index f0c7f35..2003716 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -36,6 +36,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -83,7 +85,6 @@ import org.apache.cloudstack.region.dao.RegionDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.log4j.Logger;
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiDBUtils;
@@ -2640,8 +2641,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
return NetUtils.supersetOrSubset.neitherSubetNorSuperset;
- } else if (newVlanGateway == null || newVlanGateway == null) {
- throw new InvalidParameterValueException("either both netmask and gateway should be passed or both should me omited.");
+ } else if (newVlanGateway == null || newVlanNetmask == null) {
+ throw new InvalidParameterValueException(
+ "either both netmask and gateway should be passed or both should me omited.");
} else {
if (!NetUtils.sameSubnet(startIP, newVlanGateway, newVlanNetmask)) {
throw new InvalidParameterValueException("The start ip and gateway do not belong to the same subnet");
[30/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Browser UI: Fix broken breadcrumb navigation
Fix breadcrumb navigation becoming stuck when going back a couple
levels, due to previous panels not being removed from the DOM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25d8e3d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25d8e3d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25d8e3d7
Branch: refs/heads/ui-restyle
Commit: 25d8e3d7dbd2b08b521deaea9fa7ebfc7172b1a9
Parents: 23f3047
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 11:53:39 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 11:54:12 2014 -0800
----------------------------------------------------------------------
ui/scripts/ui/widgets/cloudBrowser.js | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25d8e3d7/ui/scripts/ui/widgets/cloudBrowser.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/cloudBrowser.js b/ui/scripts/ui/widgets/cloudBrowser.js
index ffb5f15..31ac533 100644
--- a/ui/scripts/ui/widgets/cloudBrowser.js
+++ b/ui/scripts/ui/widgets/cloudBrowser.js
@@ -205,16 +205,7 @@
.addClass('reduced')
).removeClass('active maximized');
- $toRemove.css(
- _panel.initialState($container), {
- duration: 500,
- complete: function() {
- $(this).remove();
-
- if (complete) complete($toShow);
- }
- }
- );
+ $toRemove.remove();
$toShow.show();
$panel.css({
left: _panel.position($container, {
[24/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1530c162
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1530c162
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1530c162
Branch: refs/heads/ui-restyle
Commit: 1530c162e58abd8e572a89d2a2706de00bd49e26
Parents: 29e2238
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 10:44:44 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Tue Jan 28 10:44:44 2014 -0700
----------------------------------------------------------------------
agent/conf/agent.properties | 4 ++++
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1530c162/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 5f5f368..a7376b6 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
# on,run virsh capabilities for more details.
# guest.cpu.model=
+#
+# vm.memballoon.disable=true
+# Disable memory ballooning on vm guests for overcommit, by default overcommit
+# feature enables balloon and sets currentMemory to a minimum value.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1530c162/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 1ea0989..fd0078c 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -424,6 +424,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private boolean _canBridgeFirewall;
protected String _localStoragePath;
protected String _localStorageUUID;
+ protected boolean _noMemBalloon = false;
protected String _guestCpuMode;
protected String _guestCpuModel;
private final Map<String, String> _pifs = new HashMap<String, String>();
@@ -771,6 +772,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
value = (String)params.get("cmds.timeout");
_cmdsTimeout = NumbersUtil.parseInt(value, 7200) * 1000;
+ value = (String) params.get("vm.memballoon.disable");
+ if (Boolean.parseBoolean(value)) {
+ _noMemBalloon = true;
+ }
+
value = (String)params.get("host.reserved.mem.mb");
_dom0MinMem = NumbersUtil.parseInt(value, 0) * 1024 * 1024;
@@ -3426,7 +3432,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
GuestResourceDef grd = new GuestResourceDef();
- if (vmTO.getMinRam() != vmTO.getMaxRam()) {
+ if (vmTO.getMinRam() != vmTO.getMaxRam() && !_noMemBalloon) {
grd.setMemBalloning(true);
grd.setCurrentMem(vmTO.getMinRam() / 1024);
grd.setMemorySize(vmTO.getMaxRam() / 1024);
[39/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: compare strings with equals()
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fef2daf5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fef2daf5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fef2daf5
Branch: refs/heads/ui-restyle
Commit: fef2daf5d4aeef80e8780fc1605c7bee6ecf3849
Parents: 1c4bbec
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jan 29 12:06:34 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jan 29 12:06:34 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/server/StatsCollector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fef2daf5/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 601ab12..548587c 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -737,7 +737,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
}
String counterName = getCounternamebyCondition(conditionId.longValue());
- if (counterName == Counter.Source.memory.toString()) {
+ if (Counter.Source.memory.toString().equals(counterName)) {
// calculate memory in percent
Long profileId = asGroup.getProfileId();
AutoScaleVmProfileVO profileVo = _asProfileDao.findById(profileId);
[20/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: nullpointer guards and wrappertype comparisons(cherry picked
from commit 791b7f8f7fe8f7d342e46fbb61a3f421e87fca59)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d8e8fd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d8e8fd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d8e8fd3
Branch: refs/heads/ui-restyle
Commit: 5d8e8fd3a2e8ffe9a2147129a9715a29cb4ce064
Parents: 9edeb24
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 16:46:05 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 16:46:05 2014 +0100
----------------------------------------------------------------------
.../com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 2 +-
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++--
server/src/com/cloud/vm/UserVmManagerImpl.java | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d8e8fd3/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 3a7251b..13c3051 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -877,7 +877,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
}
_resourceCountDao.setResourceCount(accountId, ResourceOwnerType.Account, type, (newCount == null) ? 0 : newCount.longValue());
- if (oldCount != newCount) {
+ if (!Long.valueOf(oldCount).equals(newCount)) {
s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type +
" for account ID " + accountId + " is fixed during resource count recalculation.");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d8e8fd3/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index a79d8b4..55582c6 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -449,8 +449,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
volume.setPoolId(null);
volume.setDataCenterId(zoneId);
volume.setPodId(null);
- volume.setAccountId(owner.getAccountId());
- volume.setDomainId(owner.getDomainId());
+ volume.setAccountId((owner == null) ? null : owner.getAccountId());
+ volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId());
long diskOfferingId = _diskOfferingDao.findByUniqueName("Cloud.com-Custom").getId();
volume.setDiskOfferingId(diskOfferingId);
// volume.setSize(size);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d8e8fd3/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 85f3527..1dcaf79 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -34,6 +34,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -79,8 +82,6 @@ import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -458,7 +459,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
protected boolean _dailyOrHourly = false;
private int capacityReleaseInterval;
- protected String _name;
protected String _instance;
protected String _zone;
protected boolean _instanceNameFlag;
@@ -4004,13 +4004,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
//if hosts are dedicated to different account/domains, raise an alert
if (srcExplDedicated && destExplDedicated) {
- if ((accountOfDedicatedHost(srcHost) != null) && (accountOfDedicatedHost(srcHost) != accountOfDedicatedHost(destHost))) {
+ if (!((accountOfDedicatedHost(srcHost) == null) || (accountOfDedicatedHost(srcHost).equals(accountOfDedicatedHost(destHost))))) {
String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(srcHost) + " to host "
+ destHost.getName() + " explicitly dedicated to account " + accountOfDedicatedHost(destHost);
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg);
s_logger.warn(msg);
}
- if ((domainOfDedicatedHost(srcHost) != null) && (domainOfDedicatedHost(srcHost) != domainOfDedicatedHost(destHost))) {
+ if (!((domainOfDedicatedHost(srcHost) == null) || (domainOfDedicatedHost(srcHost).equals(domainOfDedicatedHost(destHost))))) {
String msg = "VM is being migrated from host " + srcHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(srcHost) + " to host "
+ destHost.getName() + " explicitly dedicated to domain " + domainOfDedicatedHost(destHost);
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg);
[07/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: nullpointer dereference guarded(cherry picked from commit
43ba36f97950aa8d09399a28bb50c6a22209f15e)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f6638d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f6638d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f6638d7
Branch: refs/heads/ui-restyle
Commit: 4f6638d7c7436cd638c653d0e08e6fa2023420e8
Parents: 997c0f8
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 13:49:14 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 13:49:14 2014 +0100
----------------------------------------------------------------------
.../impl/UserConcentratedAllocator.java | 47 ++++++++++----------
1 file changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f6638d7/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
index b67eccb..946eee6 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
@@ -243,35 +243,36 @@ public class UserConcentratedAllocator extends AdapterBase implements PodAllocat
// List<VMInstanceVO> vms = _vmInstanceDao.listByLastHostId(hostId);
List<VMInstanceVO> vms = null;
long usedCapacity = 0;
- for (VMInstanceVO vm : vms) {
- if (skipCalculation(vm)) {
- continue;
- }
-
- ServiceOffering so = null;
-
- if (vm.getType() == VirtualMachine.Type.User) {
- UserVmVO userVm = _vmDao.findById(vm.getId());
- if (userVm == null) {
+ if (vms != null) {
+ for (VMInstanceVO vm : vms) {
+ if (skipCalculation(vm)) {
continue;
}
- }
- so = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+ ServiceOffering so = null;
- if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) {
- usedCapacity += so.getRamSize() * 1024L * 1024L;
-
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Counting memory capacity used by vm: " + vm.getId() + ", size: " + so.getRamSize() + "MB, host: " + hostId + ", currently counted: " +
- usedCapacity + " Bytes");
+ if (vm.getType() == VirtualMachine.Type.User) {
+ UserVmVO userVm = _vmDao.findById(vm.getId());
+ if (userVm == null) {
+ continue;
+ }
}
- } else if (capacityType == Capacity.CAPACITY_TYPE_CPU) {
- usedCapacity += so.getCpu() * so.getSpeed();
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Counting cpu capacity used by vm: " + vm.getId() + ", cpu: " + so.getCpu() + ", speed: " + so.getSpeed() + ", currently counted: " +
- usedCapacity + " Bytes");
+ so = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+ if (capacityType == Capacity.CAPACITY_TYPE_MEMORY) {
+ usedCapacity += so.getRamSize() * 1024L * 1024L;
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Counting memory capacity used by vm: " + vm.getId() + ", size: " + so.getRamSize() + "MB, host: " + hostId + ", currently counted: " +
+ usedCapacity + " Bytes");
+ }
+ } else if (capacityType == Capacity.CAPACITY_TYPE_CPU) {
+ usedCapacity += so.getCpu() * so.getSpeed();
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Counting cpu capacity used by vm: " + vm.getId() + ", cpu: " + so.getCpu() + ", speed: " + so.getSpeed() + ", currently counted: " +
+ usedCapacity + " Bytes");
+ }
}
}
}
[37/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Give findbugs some more memory or it will fail with an OOM on awsapi
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c57dd7b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c57dd7b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c57dd7b
Branch: refs/heads/ui-restyle
Commit: 1c57dd7bcd4c21fa9c55b8a488474243c458347d
Parents: 3ac181e
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Jan 29 09:16:23 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Jan 29 09:17:01 2014 +0100
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c57dd7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01ddf11..d8c8851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,6 +871,7 @@
<threshold>High</threshold>
<xmlOutput>true</xmlOutput>
<failOnError>false</failOnError>
+ <maxHeap>1024</maxHeap>
</configuration>
<executions>
<execution>
[06/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5965. VM displayname is not returned by API.
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/95bd04e4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/95bd04e4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/95bd04e4
Branch: refs/heads/ui-restyle
Commit: 95bd04e449c346aec0d9bdc30061ad27ea70d75b
Parents: 997c0f8
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Jan 28 16:01:19 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Jan 28 16:43:12 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95bd04e4/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 07449a2..08478e2 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -99,7 +99,11 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
userVmResponse.setId(userVm.getUuid());
userVmResponse.setName(userVm.getName());
- userVmResponse.setDisplayName(userVm.getDisplayName());
+ if (userVm.getDisplayName() != null) {
+ userVmResponse.setDisplayName(userVm.getDisplayName());
+ } else {
+ userVmResponse.setDisplayName(userVm.getName());
+ }
if (userVm.getAccountType() == Account.ACCOUNT_TYPE_PROJECT) {
userVmResponse.setProjectId(userVm.getProjectUuid());
[33/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
other zones.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a26c8117
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a26c8117
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a26c8117
Branch: refs/heads/ui-restyle
Commit: a26c81178b4db78ad4936fb90a41444fc71eea83
Parents: bd2acd1
Author: Min Chen <mi...@citrix.com>
Authored: Tue Jan 28 13:09:57 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Jan 28 14:49:58 2014 -0800
----------------------------------------------------------------------
.../apache/cloudstack/storage/image/TemplateServiceImpl.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a26c8117/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index 2c82914..a8dec09 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -75,6 +75,7 @@ import com.cloud.dc.dao.DataCenterDao;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
@@ -721,6 +722,13 @@ public class TemplateServiceImpl implements TemplateService {
@Override
public AsyncCallFuture<TemplateApiResult> copyTemplate(TemplateInfo srcTemplate, DataStore destStore) {
+ // for vmware template, we need to check if ova packing is needed, since template created from snapshot does not have .ova file
+ // we invoke createEntityExtractURL to trigger ova packing. Ideally, we can directly use extractURL to pass to following createTemplate.
+ // Need to understand what is the background to use two different urls for copy and extract.
+ if (srcTemplate.getFormat() == ImageFormat.OVA){
+ ImageStoreEntity tmpltStore = (ImageStoreEntity)srcTemplate.getDataStore();
+ tmpltStore.createEntityExtractUrl(srcTemplate.getInstallPath(), srcTemplate.getFormat(), srcTemplate);
+ }
// generate a URL from source template ssvm to download to destination data store
String url = generateCopyUrl(srcTemplate);
if (url == null) {
[21/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: throw exceptions when found(cherry picked from commit
9772693dca9a91a438078de11b1be1e6044aa6f3)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/be21822c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be21822c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be21822c
Branch: refs/heads/ui-restyle
Commit: be21822cbaca8bf0597781018cfe844252e6ed73
Parents: 5d8e8fd
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 17:39:02 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 17:39:02 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/projects/ProjectManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be21822c/server/src/com/cloud/projects/ProjectManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/projects/ProjectManagerImpl.java b/server/src/com/cloud/projects/ProjectManagerImpl.java
index 5e7d9a9..5a0ed1c 100755
--- a/server/src/com/cloud/projects/ProjectManagerImpl.java
+++ b/server/src/com/cloud/projects/ProjectManagerImpl.java
@@ -624,6 +624,7 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
domainUuid = domain.getUuid();
}
ex.addProxyObject(domainUuid, "domainId");
+ throw ex;
}
//verify permissions
[36/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
List view: tests for filter dropdown
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ac181e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ac181e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ac181e3
Branch: refs/heads/ui-restyle
Commit: 3ac181e396c2564df66947184048565d4b199716
Parents: ebcf6a1
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 15:48:33 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 15:48:44 2014 -0800
----------------------------------------------------------------------
ui/tests/test.widget.listView.js | 40 +++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ac181e3/ui/tests/test.widget.listView.js
----------------------------------------------------------------------
diff --git a/ui/tests/test.widget.listView.js b/ui/tests/test.widget.listView.js
index 84f914b..43c42f9 100644
--- a/ui/tests/test.widget.listView.js
+++ b/ui/tests/test.widget.listView.js
@@ -202,4 +202,44 @@
equal($listView.find('table.body tbody tr td').size(), 2, 'Correct number of data body columns present');
ok(!$listView.find('table.body tbody td.fieldHidden').size(), 'Hidden field not present');
});
+
+ test('Filter dropdown', function() {
+ var $listView = listView({
+ listView: {
+ fields: {
+ state: { label: 'State' }
+ },
+ filters: {
+ on: { label: 'FilterOnLabel' },
+ off: { label: 'FilterOffLabel' }
+ },
+ dataProvider: function(args) {
+ var filterBy = args.filterBy.kind;
+ var data = filterBy === 'on' ? [{ state: 'on' }] : [{ state: 'off' }];
+
+ args.response.success({
+ data: data
+ });
+
+ start();
+ }
+ }
+ });
+
+ var $filters = $listView.find('.filters select');
+
+ var testFilterDropdownContent = function() {
+ equal($filters.find('option').size(), 2, 'Correct # of filters present');
+ equal($filters.find('option:first').html(), 'FilterOnLabel', 'Filter on label present');
+ equal($filters.find('option:last').html(), 'FilterOffLabel', 'Filter off label present');
+ };
+
+ testFilterDropdownContent();
+ equal($filters.find('option').val(), 'on', 'Correct default filter active');
+ equal($listView.find('tbody td.state span').html(), 'on', '"on" data item visible');
+ ok($filters.val('off').trigger('change'), 'Change filter to "off"');
+ equal($listView.find('tbody td.state span').html(), 'off', '"off" data item visible');
+ equal($filters.val(), 'off', 'Correct filter active');
+ testFilterDropdownContent();
+ });
}());
[16/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: byte[].toString -> Arrays.toString(byte[])(cherry picked from commit 23a3d99fc0836839a88584d7aa6a978d99c5d126)
Signed-off-by: Daan Hoogland <dh...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a16759a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a16759a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a16759a9
Branch: refs/heads/ui-restyle
Commit: a16759a9b17fb7b2bbdda3595cd11c5bc5b83c79
Parents: 44bc2be
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Jan 26 16:38:53 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 15:51:08 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a16759a9/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 8d76b8a..8138887 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -17,6 +17,7 @@
package com.cloud.consoleproxy;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -483,7 +484,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
byte[] details = proxy.getSessionDetails();
status = gson.fromJson(details != null ? new String(details, Charset.forName("US-ASCII")) : null, ConsoleProxyStatus.class);
} catch (Throwable e) {
- s_logger.warn("Unable to parse proxy session details : " + proxy.getSessionDetails());
+ s_logger.warn("Unable to parse proxy session details : " + Arrays.toString(proxy.getSessionDetails()));
}
if (status != null && status.getConnections() != null) {
[25/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Update socket icon
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c28b663
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c28b663
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c28b663
Branch: refs/heads/ui-restyle
Commit: 0c28b66362f335ae7323f327cb2e175ee47cbb94
Parents: 1530c16
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 10:25:17 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 10:25:57 2014 -0800
----------------------------------------------------------------------
ui/images/infrastructure-icons.png | Bin 62257 -> 62059 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c28b663/ui/images/infrastructure-icons.png
----------------------------------------------------------------------
diff --git a/ui/images/infrastructure-icons.png b/ui/images/infrastructure-icons.png
index 5d35a8e..a589fc4 100644
Binary files a/ui/images/infrastructure-icons.png and b/ui/images/infrastructure-icons.png differ
[11/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: fixes for ApiServer, ApiSerializerHelper and
ApiXmlDocWriter(cherry picked from commit
9aced41d708acd22b43ef0e512fa2cc657a6c0a2)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a71871d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a71871d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a71871d1
Branch: refs/heads/ui-restyle
Commit: a71871d11ce97216d0e50c01bcd84cc59d3d18dc
Parents: 1c73617
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 14:47:06 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 14:47:06 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/api/ApiSerializerHelper.java | 2 +-
server/src/com/cloud/api/ApiServer.java | 29 ++++++++++++++------
server/src/com/cloud/api/ApiServlet.java | 2 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 2 +-
server/src/com/cloud/api/doc/Alert.java | 12 ++++++--
server/src/com/cloud/api/doc/Command.java | 11 ++++++--
.../api/response/ApiResponseSerializer.java | 2 +-
7 files changed, 41 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/ApiSerializerHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiSerializerHelper.java b/server/src/com/cloud/api/ApiSerializerHelper.java
index cd5c7e6..7426d9f 100644
--- a/server/src/com/cloud/api/ApiSerializerHelper.java
+++ b/server/src/com/cloud/api/ApiSerializerHelper.java
@@ -24,7 +24,7 @@ import org.apache.cloudstack.api.ResponseObject;
public class ApiSerializerHelper {
public static final Logger s_logger = Logger.getLogger(ApiSerializerHelper.class.getName());
- public static String token = "/";
+ private static String token = "/";
public static String toSerializedString(Object result) {
if (result != null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 71a1b8d..d715db6 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -159,11 +159,10 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
private static final Logger s_logger = Logger.getLogger(ApiServer.class.getName());
private static final Logger s_accessLogger = Logger.getLogger("apiserver." + ApiServer.class.getName());
- public static boolean encodeApiResponse = false;
- public static String jsonContentType = "text/javascript";
- public static String controlCharacters = "[\000-\011\013-\014\016-\037\177]"; // Non-printable ASCII characters - numbers 0 to 31 and 127 decimal
- @Inject
- ApiDispatcher _dispatcher;
+ private static boolean encodeApiResponse = false;
+ private static String jsonContentType = "text/javascript";
+ private static String controlCharacters = "[\000-\011\013-\014\016-\037\177]"; // Non-printable ASCII characters - numbers 0 to 31 and 127 decimal
+ @Inject ApiDispatcher _dispatcher;
@Inject
private AccountManager _accountMgr;
@@ -241,7 +240,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
s_apiNameCmdClassMap.put(apiName, cmdClass);
}
- encodeApiResponse = Boolean.valueOf(_configDao.getValue(Config.EncodeApiResponse.key()));
+ setEncodeApiResponse(Boolean.valueOf(_configDao.getValue(Config.EncodeApiResponse.key())));
String jsonType = _configDao.getValue(Config.JavaScriptDefaultContentType.key());
if (jsonType != null) {
jsonContentType = jsonType;
@@ -379,7 +378,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
buildAuditTrail(auditTrailSb, command[0], response);
} else {
if (!command[0].equalsIgnoreCase("login") && !command[0].equalsIgnoreCase("logout")) {
- String errorString = "Unknown API command: " + ((command == null) ? "null" : command[0]);
+ String errorString = "Unknown API command: " + command[0];
s_logger.warn(errorString);
auditTrailSb.append(" " + errorString);
throw new ServerApiException(ApiErrorCode.UNSUPPORTED_ACTION_ERROR, errorString);
@@ -1102,7 +1101,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
@Inject
public void setPluggableServices(List<PluggableService> pluggableServices) {
- this._pluggableServices = pluggableServices;
+ _pluggableServices = pluggableServices;
}
public List<APIChecker> getApiAccessCheckers() {
@@ -1111,6 +1110,18 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
@Inject
public void setApiAccessCheckers(List<APIChecker> apiAccessCheckers) {
- this._apiAccessCheckers = apiAccessCheckers;
+ _apiAccessCheckers = apiAccessCheckers;
+ }
+
+ public static boolean isEncodeApiResponse() {
+ return encodeApiResponse;
+ }
+
+ private static void setEncodeApiResponse(boolean encodeApiResponse) {
+ ApiServer.encodeApiResponse = encodeApiResponse;
+ }
+
+ public static String getJsonContentType() {
+ return jsonContentType;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/ApiServlet.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index 6a33c14..46f7eba 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -375,7 +375,7 @@ public class ApiServlet extends HttpServlet {
private void writeResponse(HttpServletResponse resp, String response, int responseCode, String responseType) {
try {
if (BaseCmd.RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
- resp.setContentType(ApiServer.jsonContentType + "; charset=UTF-8");
+ resp.setContentType(ApiServer.getJsonContentType() + "; charset=UTF-8");
} else {
resp.setContentType("text/xml; charset=UTF-8");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/EncodedStringTypeAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/EncodedStringTypeAdapter.java b/server/src/com/cloud/api/EncodedStringTypeAdapter.java
index cde1448..50dbd0d 100644
--- a/server/src/com/cloud/api/EncodedStringTypeAdapter.java
+++ b/server/src/com/cloud/api/EncodedStringTypeAdapter.java
@@ -37,7 +37,7 @@ public class EncodedStringTypeAdapter implements JsonSerializer<String> {
}
private static String encodeString(String value) {
- if (!ApiServer.encodeApiResponse) {
+ if (!ApiServer.isEncodeApiResponse()) {
return value;
}
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/doc/Alert.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/doc/Alert.java b/server/src/com/cloud/api/doc/Alert.java
index e73cb0e..3e61d0b 100644
--- a/server/src/com/cloud/api/doc/Alert.java
+++ b/server/src/com/cloud/api/doc/Alert.java
@@ -16,9 +16,15 @@
// under the License.
package com.cloud.api.doc;
-public class Alert {
- private String type;
- private int value;
+import java.io.Serializable;
+
+public class Alert implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 960408026527837920L;
+ private final String type;
+ private final int value;
public Alert(String type, int value) {
this.type = type;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/doc/Command.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/doc/Command.java b/server/src/com/cloud/api/doc/Command.java
index 998b39f..549ca29 100644
--- a/server/src/com/cloud/api/doc/Command.java
+++ b/server/src/com/cloud/api/doc/Command.java
@@ -16,10 +16,15 @@
// under the License.
package com.cloud.api.doc;
+import java.io.Serializable;
import java.util.ArrayList;
-public class Command {
+public class Command implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4318310162503004975L;
private String name;
private String description;
private String usage;
@@ -85,7 +90,7 @@ public class Command {
}
public Argument getReqArgByName(String name) {
- for (Argument a : this.getRequest()) {
+ for (Argument a : getRequest()) {
if (a.getName().equals(name)) {
return a;
}
@@ -94,7 +99,7 @@ public class Command {
}
public Argument getResArgByName(String name) {
- for (Argument a : this.getResponse()) {
+ for (Argument a : getResponse()) {
if (a.getName().equals(name)) {
return a;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a71871d1/server/src/com/cloud/api/response/ApiResponseSerializer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index d8b728a..f276e89 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -291,7 +291,7 @@ public class ApiResponseSerializer {
}
private static String encodeParam(String value) {
- if (!ApiServer.encodeApiResponse) {
+ if (!ApiServer.isEncodeApiResponse()) {
return value;
}
try {
[40/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: use system account id instead of null (security considerations
to be made here)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee1e8a6c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee1e8a6c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee1e8a6c
Branch: refs/heads/ui-restyle
Commit: ee1e8a6c2a375a1a7232f2c7ca2f95f78b3c3d2f
Parents: fef2daf
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jan 29 12:36:34 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jan 29 12:36:34 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee1e8a6c/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 55582c6..c856379 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -449,7 +449,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
volume.setPoolId(null);
volume.setDataCenterId(zoneId);
volume.setPodId(null);
- volume.setAccountId((owner == null) ? null : owner.getAccountId());
+ // to prevent a nullpointer deref I put the system account id here when no owner is given.
+ // TODO Decide if this is valid or whether throwing a CloudRuntimeException is more appropriate
+ volume.setAccountId((owner == null) ? Account.ACCOUNT_ID_SYSTEM : owner.getAccountId());
volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner.getDomainId());
long diskOfferingId = _diskOfferingDao.findByUniqueName("Cloud.com-Custom").getId();
volume.setDiskOfferingId(diskOfferingId);
[34/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Fix trailing whitespace.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16a9171f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16a9171f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16a9171f
Branch: refs/heads/ui-restyle
Commit: 16a9171f55d729e22240c26d15b73a4295f0e960
Parents: a26c811
Author: Min Chen <mi...@citrix.com>
Authored: Tue Jan 28 14:53:18 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Jan 28 14:53:18 2014 -0800
----------------------------------------------------------------------
.../org/apache/cloudstack/storage/image/TemplateServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16a9171f/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index a8dec09..166b523 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -723,7 +723,7 @@ public class TemplateServiceImpl implements TemplateService {
@Override
public AsyncCallFuture<TemplateApiResult> copyTemplate(TemplateInfo srcTemplate, DataStore destStore) {
// for vmware template, we need to check if ova packing is needed, since template created from snapshot does not have .ova file
- // we invoke createEntityExtractURL to trigger ova packing. Ideally, we can directly use extractURL to pass to following createTemplate.
+ // we invoke createEntityExtractURL to trigger ova packing. Ideally, we can directly use extractURL to pass to following createTemplate.
// Need to understand what is the background to use two different urls for copy and extract.
if (srcTemplate.getFormat() == ImageFormat.OVA){
ImageStoreEntity tmpltStore = (ImageStoreEntity)srcTemplate.getDataStore();
[41/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
findbugs: possible nulpointer derefs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/920163f2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/920163f2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/920163f2
Branch: refs/heads/ui-restyle
Commit: 920163f24f4348309c223a973cf68d7f8352babf
Parents: ee1e8a6
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jan 29 13:09:17 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jan 29 13:09:17 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/upload/UploadMonitorImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/920163f2/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 991f35f..6f1f5e9 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -269,7 +269,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
CreateEntityDownloadURLCommand cmd = new CreateEntityDownloadURLCommand(((ImageStoreEntity)store).getMountPoint(), path, uuid, null);
Answer ans = ep.sendMessage(cmd);
if (ans == null || !ans.getResult()) {
- errorString = "Unable to create a link for " + type + " id:" + template.getId() + "," + ans.getDetails();
+ errorString = "Unable to create a link for " + type + " id:" + template.getId() + "," + (ans == null ? "" : ans.getDetails());
s_logger.error(errorString);
throw new CloudRuntimeException(errorString);
}
@@ -325,7 +325,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
CreateEntityDownloadURLCommand cmd = new CreateEntityDownloadURLCommand(((ImageStoreEntity)secStore).getMountPoint(), path, uuid, null);
Answer ans = ep.sendMessage(cmd);
if (ans == null || !ans.getResult()) {
- errorString = "Unable to create a link for " + type + " id:" + entityId + "," + ans.getDetails();
+ errorString = "Unable to create a link for " + type + " id:" + entityId + "," + (ans == null ? "" : ans.getDetails());
s_logger.warn(errorString);
throw new CloudRuntimeException(errorString);
}
[50/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Merge branch 'master' into ui-restyle
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/dictionary.jsp
ui/scripts/ui-custom/accountsWizard.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/849d601c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/849d601c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/849d601c
Branch: refs/heads/ui-restyle
Commit: 849d601ccfed6ac9753957fda0bc6cbab96bba26
Parents: 326b3a6 b38c033
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jan 30 14:40:22 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jan 30 14:40:22 2014 -0800
----------------------------------------------------------------------
.gitignore | 1 +
LICENSE.header | 16 +
agent/conf/agent.properties | 4 +
agent/pom.xml | 33 -
agent/src/com/cloud/agent/AgentShell.java | 2 +-
.../com/cloud/agent/resource/DummyResource.java | 4 +-
.../cloudstack/api-config/module.properties | 18 +
.../api-config/spring-api-config-context.xml | 32 +
api/src/com/cloud/agent/api/to/IpAddressTO.java | 17 +
api/src/com/cloud/agent/api/to/NfsTO.java | 8 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 6 +-
api/src/com/cloud/alert/Alert.java | 1 +
api/src/com/cloud/deploy/DeployDestination.java | 21 +-
api/src/com/cloud/deploy/DeploymentPlanner.java | 33 +-
api/src/com/cloud/deploy/HAPlanner.java | 21 +
api/src/com/cloud/event/EventTypes.java | 11 +-
api/src/com/cloud/exception/CloudException.java | 5 +-
.../exception/OperationTimedoutException.java | 10 +-
api/src/com/cloud/host/Host.java | 5 +
.../com/cloud/hypervisor/HypervisorGuru.java | 2 +
api/src/com/cloud/network/Network.java | 14 +-
api/src/com/cloud/network/NetworkModel.java | 2 +
api/src/com/cloud/network/NetworkService.java | 8 +-
api/src/com/cloud/network/Networks.java | 19 +-
api/src/com/cloud/network/OvsProvider.java | 4 +-
api/src/com/cloud/network/PhysicalNetwork.java | 2 +-
.../network/VirtualNetworkApplianceService.java | 2 +-
.../com/cloud/network/as/AutoScalePolicy.java | 4 +-
.../com/cloud/network/as/AutoScaleVmGroup.java | 2 +-
api/src/com/cloud/network/as/Counter.java | 2 +-
.../cloud/network/element/NetworkElement.java | 2 -
.../element/UserDataServiceProvider.java | 2 +-
.../element/VirtualRouterElementService.java | 5 +-
.../cloud/network/firewall/FirewallService.java | 2 +-
.../network/lb/LoadBalancingRulesService.java | 4 +-
.../com/cloud/network/rules/FirewallRule.java | 3 +-
.../network/security/SecurityGroupService.java | 2 +-
.../cloud/network/vpc/NetworkACLService.java | 2 +-
api/src/com/cloud/network/vpc/StaticRoute.java | 3 +-
api/src/com/cloud/offering/DiskOffering.java | 2 +-
.../cloud/region/ha/GlobalLoadBalancerRule.java | 4 +-
api/src/com/cloud/server/ResourceTag.java | 14 +-
api/src/com/cloud/storage/DataStoreRole.java | 4 +-
api/src/com/cloud/storage/Storage.java | 2 +
api/src/com/cloud/storage/StorageService.java | 30 +-
api/src/com/cloud/storage/Volume.java | 2 -
api/src/com/cloud/storage/VolumeApiService.java | 8 -
.../storage/snapshot/SnapshotApiService.java | 2 -
.../com/cloud/user/ResourceLimitService.java | 16 +-
api/src/com/cloud/vm/DiskProfile.java | 16 +-
api/src/com/cloud/vm/NicProfile.java | 107 +-
api/src/com/cloud/vm/UserVmService.java | 33 +-
api/src/com/cloud/vm/VirtualMachine.java | 19 +-
api/src/com/cloud/vm/VirtualMachineName.java | 13 +
.../apache/cloudstack/alert/AlertService.java | 18 +-
.../org/apache/cloudstack/api/ApiConstants.java | 15 +-
.../api/BaseAsyncCreateCustomIdCmd.java | 7 +-
.../cloudstack/api/BaseAsyncCustomIdCmd.java | 5 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 22 +-
.../apache/cloudstack/api/BaseCustomIdCmd.java | 4 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 22 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 14 +-
.../BaseUpdateTemplateOrIsoPermissionsCmd.java | 24 +-
.../apache/cloudstack/api/IdentityService.java | 23 -
.../cloudstack/api/ResponseGenerator.java | 4 +-
.../cloudstack/api/ServerApiException.java | 4 +
.../command/admin/alert/GenerateAlertCmd.java | 21 +-
.../api/command/admin/config/ListCfgsByCmd.java | 20 +-
.../api/command/admin/config/UpdateCfgCmd.java | 16 +-
.../admin/host/AddSecondaryStorageCmd.java | 22 +-
.../ListInternalLoadBalancerElementsCmd.java | 4 +-
.../admin/network/CreateNetworkOfferingCmd.java | 8 +-
.../network/ListNetworkServiceProvidersCmd.java | 4 +-
.../network/ListStorageNetworkIpRangeCmd.java | 4 +-
.../ListSupportedNetworkServicesCmd.java | 4 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 4 +-
.../offering/CreateServiceOfferingCmd.java | 4 +-
.../command/admin/resource/ListAlertsCmd.java | 6 +-
.../admin/router/ConfigureOvsElementCmd.java | 176 +-
.../admin/router/ListOvsElementsCmd.java | 106 +-
.../router/ListVirtualRouterElementsCmd.java | 4 +-
.../admin/router/UpgradeRouterTemplateCmd.java | 15 +-
.../command/admin/storage/AddImageStoreCmd.java | 10 +-
.../api/command/admin/storage/AddS3Cmd.java | 108 +-
.../PrepareSecondaryStorageForMigrationCmd.java | 110 -
.../storage/UpdateCloudToUseObjectStoreCmd.java | 142 +
.../api/command/admin/swift/AddSwiftCmd.java | 23 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 39 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 39 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 14 +-
.../usage/ListTrafficTypeImplementorsCmd.java | 4 +-
.../admin/usage/ListTrafficTypesCmd.java | 4 +-
.../admin/vlan/CreateVlanIpRangeCmd.java | 3 +
.../api/command/admin/vm/GetVMUserDataCmd.java | 81 +
.../command/admin/vpc/CreateVPCOfferingCmd.java | 4 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 4 +-
.../affinitygroup/ListAffinityGroupsCmd.java | 7 +-
.../autoscale/ListAutoScaleVmProfilesCmd.java | 11 +-
.../api/command/user/iso/ListIsosCmd.java | 7 +
.../AssignCertToLoadBalancerCmd.java | 3 +-
.../RemoveCertFromLoadBalancerCmd.java | 2 +-
.../command/user/network/DeleteNetworkCmd.java | 10 +-
.../user/network/ListNetworkACLListsCmd.java | 9 +-
.../user/network/ListNetworkACLsCmd.java | 7 +-
.../user/network/ListNetworkOfferingsCmd.java | 4 +-
.../command/user/network/ListNetworksCmd.java | 29 +-
.../command/user/template/CopyTemplateCmd.java | 5 +-
.../command/user/template/ListTemplatesCmd.java | 7 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 64 +-
.../api/command/user/vm/DeployVMCmd.java | 154 +-
.../api/command/user/vm/ListNicsCmd.java | 11 +-
.../api/command/user/vm/ListVMsCmd.java | 2 +-
.../command/user/vm/RemoveIpFromVmNicCmd.java | 2 +-
.../api/command/user/vm/ScaleVMCmd.java | 38 +-
.../api/command/user/vm/UpdateVMCmd.java | 5 +-
.../api/command/user/vm/UpgradeVMCmd.java | 35 +-
.../user/volume/AddResourceDetailCmd.java | 11 +-
.../command/user/volume/CreateVolumeCmd.java | 5 +-
.../command/user/volume/ResizeVolumeCmd.java | 5 +-
.../command/user/volume/UpdateVolumeCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 22 +-
.../command/user/vpc/ListVPCOfferingsCmd.java | 4 +-
.../api/command/user/vpc/RestartVPCCmd.java | 4 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 4 +-
.../cloudstack/api/response/AlertResponse.java | 7 +-
.../api/response/CapabilitiesResponse.java | 6 +-
.../api/response/DiskOfferingResponse.java | 3 +-
.../cloudstack/api/response/NicResponse.java | 11 +-
.../api/response/OvsProviderResponse.java | 108 +-
.../api/response/ProviderResponse.java | 3 +-
.../api/response/ServiceOfferingResponse.java | 6 +-
.../cloudstack/api/response/UserVmResponse.java | 38 +-
.../api/response/VMUserDataResponse.java | 44 +
.../config/ApiServiceConfiguration.java | 40 +
.../apache/cloudstack/context/CallContext.java | 27 +-
.../network/ExternalNetworkDeviceManager.java | 1 +
.../apache/cloudstack/query/QueryService.java | 13 +-
api/test/com/cloud/network/NetworksTest.java | 15 +
.../api/command/test/AddIpToVmNicTest.java | 8 +-
.../test/AddSecondaryStorageCmdTest.java | 12 +-
awsapi/pom.xml | 64 +-
.../ec2/AmazonEC2MessageReceiverInOut.java | 288 +-
awsapi/src/com/amazon/ec2/UserDataType.java | 4 +-
.../com/amazon/ec2/client/AmazonEC2Stub.java | 1444 +--
.../amazon/s3/AmazonS3MessageReceiverInOut.java | 32 +-
awsapi/src/com/amazon/s3/MetadataDirective.java | 2 +-
awsapi/src/com/amazon/s3/MfaDeleteStatus.java | 2 +-
awsapi/src/com/amazon/s3/Payer.java | 2 +-
awsapi/src/com/amazon/s3/Permission.java | 2 +-
awsapi/src/com/amazon/s3/StorageClass.java | 2 +-
awsapi/src/com/amazon/s3/VersioningStatus.java | 2 +-
.../src/com/amazon/s3/client/AmazonS3Stub.java | 166 +-
.../cloud/bridge/service/EC2RestServlet.java | 36 +-
.../service/controller/s3/ServiceProvider.java | 2 +-
.../bridge/service/core/ec2/EC2Engine.java | 64 +-
.../classes/resources/messages.properties | 24 +-
.../classes/resources/messages_es.properties | 66 +-
.../classes/resources/messages_fr_FR.properties | 2 +
.../classes/resources/messages_ja.properties | 1599 ---
.../classes/resources/messages_ja_JP.properties | 1599 +++
.../classes/resources/messages_nl_NL.properties | 1216 +++
.../classes/resources/messages_pl.properties | 469 +
.../classes/resources/messages_pt_BR.properties | 36 +
client/pom.xml | 45 +-
client/tomcatconf/commands.properties.in | 8 +-
core/pom.xml | 5 +
.../core/spring-core-registry-core-context.xml | 5 +
...re-lifecycle-planner-context-inheritable.xml | 5 +
.../cloud/agent/api/AttachVolumeCommand.java | 2 +-
.../cloud/agent/api/ComputeChecksumCommand.java | 4 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 4 +-
.../com/cloud/agent/api/GetVmConfigAnswer.java | 68 +
.../com/cloud/agent/api/GetVmConfigCommand.java | 46 +
.../cloud/agent/api/ManageSnapshotCommand.java | 4 +-
.../agent/api/ModifyVmNicConfigAnswer.java | 36 +
.../agent/api/ModifyVmNicConfigCommand.java | 42 +
.../agent/api/PerformanceMonitorAnswer.java | 12 +-
.../agent/api/PerformanceMonitorCommand.java | 34 +-
.../cloud/agent/api/SecStorageSetupCommand.java | 41 +-
core/src/com/cloud/agent/api/SetupCommand.java | 20 -
core/src/com/cloud/agent/api/StartAnswer.java | 8 +-
core/src/com/cloud/agent/api/StartCommand.java | 10 +
core/src/com/cloud/agent/api/StopAnswer.java | 4 +-
.../agent/api/UpdateHostPasswordCommand.java | 14 +-
.../baremetal/PrepareCreateTemplateCommand.java | 66 +
.../baremetal/prepareCreateTemplateCommand.java | 66 -
.../com/cloud/agent/api/routing/IpAliasTO.java | 8 +-
.../api/routing/LoadBalancerConfigCommand.java | 8 +-
.../api/routing/NetworkElementCommand.java | 13 +-
.../api/storage/AbstractDownloadCommand.java | 2 +-
.../storage/CreatePrivateTemplateAnswer.java | 4 +-
.../agent/api/storage/MigrateVolumeCommand.java | 12 +
.../com/cloud/agent/api/storage/SsCommand.java | 48 +
.../com/cloud/agent/api/storage/ssCommand.java | 48 -
.../virtualnetwork/VirtualRouterDeployer.java | 27 +
.../virtualnetwork/VirtualRoutingResource.java | 1036 +-
core/src/com/cloud/agent/transport/Request.java | 28 +-
core/src/com/cloud/host/HostInfo.java | 3 +-
.../cloud/info/RunningHostInfoAgregator.java | 8 +-
.../cloud/network/LoadBalancerValidator.java | 2 -
.../resource/TrafficSentinelResource.java | 8 +-
.../template/HttpTemplateDownloader.java | 14 +-
.../cloud/storage/template/OVAProcessor.java | 158 +
.../template/TemplateDownloaderBase.java | 6 +-
.../cloud/storage/template/VhdProcessor.java | 22 +-
.../cloud/storage/template/VmdkProcessor.java | 95 +-
.../cloudstack/storage/command/CopyCommand.java | 12 +
.../storage/command/DownloadCommand.java | 4 +-
.../cloudstack/storage/to/SnapshotObjectTO.java | 26 +
.../api/agent/test/CheckOnHostCommandTest.java | 5 +-
debian/control | 6 +-
deps/XenServerJava/pom.xml | 22 +-
.../src/com/xensource/xenapi/APIVersion.java | 44 +-
.../src/com/xensource/xenapi/Auth.java | 26 +-
.../src/com/xensource/xenapi/Blob.java | 139 +-
.../src/com/xensource/xenapi/Bond.java | 181 +-
.../src/com/xensource/xenapi/Connection.java | 66 +-
.../src/com/xensource/xenapi/Console.java | 127 +-
.../src/com/xensource/xenapi/Crashdump.java | 105 +-
.../src/com/xensource/xenapi/DRTask.java | 85 +-
.../src/com/xensource/xenapi/DataSource.java | 11 +-
.../src/com/xensource/xenapi/Event.java | 90 +-
.../src/com/xensource/xenapi/GPUGroup.java | 137 +-
.../src/com/xensource/xenapi/Host.java | 1083 +-
.../src/com/xensource/xenapi/HostCpu.java | 174 +-
.../src/com/xensource/xenapi/HostCrashdump.java | 125 +-
.../src/com/xensource/xenapi/HostMetrics.java | 112 +-
.../src/com/xensource/xenapi/HostPatch.java | 187 +-
.../src/com/xensource/xenapi/Marshalling.java | 18 +-
.../src/com/xensource/xenapi/Message.java | 84 +-
.../src/com/xensource/xenapi/Network.java | 267 +-
.../src/com/xensource/xenapi/PBD.java | 175 +-
.../src/com/xensource/xenapi/PCI.java | 125 +-
.../src/com/xensource/xenapi/PGPU.java | 101 +-
.../src/com/xensource/xenapi/PIF.java | 509 +-
.../src/com/xensource/xenapi/PIFMetrics.java | 165 +-
.../src/com/xensource/xenapi/Pool.java | 854 +-
.../src/com/xensource/xenapi/PoolPatch.java | 229 +-
.../src/com/xensource/xenapi/Role.java | 115 +-
.../src/com/xensource/xenapi/SM.java | 165 +-
.../src/com/xensource/xenapi/SR.java | 739 +-
.../src/com/xensource/xenapi/Secret.java | 117 +-
.../src/com/xensource/xenapi/Session.java | 219 +-
.../src/com/xensource/xenapi/Subject.java | 121 +-
.../src/com/xensource/xenapi/Task.java | 227 +-
.../src/com/xensource/xenapi/Tunnel.java | 157 +-
.../src/com/xensource/xenapi/Types.java | 3213 +++---
.../src/com/xensource/xenapi/User.java | 127 +-
.../src/com/xensource/xenapi/VBD.java | 413 +-
.../src/com/xensource/xenapi/VBDMetrics.java | 101 +-
.../src/com/xensource/xenapi/VDI.java | 824 +-
.../src/com/xensource/xenapi/VGPU.java | 141 +-
.../src/com/xensource/xenapi/VIF.java | 399 +-
.../src/com/xensource/xenapi/VIFMetrics.java | 101 +-
.../src/com/xensource/xenapi/VLAN.java | 127 +-
.../src/com/xensource/xenapi/VM.java | 2103 ++--
.../src/com/xensource/xenapi/VMAppliance.java | 233 +-
.../com/xensource/xenapi/VMGuestMetrics.java | 149 +-
.../src/com/xensource/xenapi/VMMetrics.java | 157 +-
.../src/com/xensource/xenapi/VMPP.java | 399 +-
.../src/com/xensource/xenapi/VTPM.java | 77 +-
.../src/com/cloud/vm/VirtualMachineManager.java | 65 +-
.../service/NetworkOrchestrationService.java | 6 +-
.../service/VolumeOrchestrationService.java | 18 +
.../subsystem/api/storage/DataStoreManager.java | 2 +
.../subsystem/api/storage/EndPointSelector.java | 6 +
.../api/storage/PrimaryDataStoreDriver.java | 10 +
.../api/storage/SnapshotDataFactory.java | 2 +
.../subsystem/api/storage/SnapshotService.java | 2 +
.../subsystem/api/storage/StorageAction.java | 25 +
.../subsystem/api/storage/VolumeInfo.java | 2 +
.../subsystem/api/storage/VolumeService.java | 4 +
.../src/com/cloud/alert/AlertManager.java | 8 +-
.../cloud/deploy/DeploymentPlanningManager.java | 9 +-
.../src/com/cloud/event/UsageEventUtils.java | 40 +-
.../src/com/cloud/network/IpAddressManager.java | 5 +-
.../com/cloud/network/NetworkStateListener.java | 6 +-
.../src/com/cloud/network/vpc/VpcManager.java | 2 +-
.../src/com/cloud/resource/ResourceManager.java | 3 +
.../src/com/cloud/template/TemplateManager.java | 4 +-
.../components-api/src/com/cloud/vm/VmWork.java | 37 +-
.../src/com/cloud/vm/VmWorkConstants.java | 24 +
.../src/com/cloud/vm/VmWorkJobHandler.java | 25 +
.../src/com/cloud/vm/VmWorkJobHandlerProxy.java | 133 +
.../src/com/cloud/vm/VmWorkSerializer.java | 74 +
.../cloud/vm/snapshot/VMSnapshotManager.java | 1 -
...spring-engine-orchestration-core-context.xml | 16 +-
.../cloud/agent/manager/AgentManagerImpl.java | 23 +-
.../manager/ClusteredAgentManagerImpl.java | 78 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 1862 ++--
.../cloud/vm/VirtualMachinePowerStateSync.java | 18 +-
.../vm/VirtualMachinePowerStateSyncImpl.java | 21 +-
.../src/com/cloud/vm/VmWorkAddVmToNetwork.java | 40 +-
.../src/com/cloud/vm/VmWorkJobDispatcher.java | 168 +-
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 147 +
.../src/com/cloud/vm/VmWorkMigrate.java | 11 +-
.../src/com/cloud/vm/VmWorkMigrateForScale.java | 38 +-
.../com/cloud/vm/VmWorkMigrateWithStorage.java | 40 +-
.../src/com/cloud/vm/VmWorkReboot.java | 70 +-
.../src/com/cloud/vm/VmWorkReconfigure.java | 35 +-
.../src/com/cloud/vm/VmWorkRemoveNicFromVm.java | 20 +-
.../com/cloud/vm/VmWorkRemoveVmFromNetwork.java | 38 +-
.../src/com/cloud/vm/VmWorkSerializer.java | 75 -
.../src/com/cloud/vm/VmWorkStart.java | 180 +-
.../src/com/cloud/vm/VmWorkStop.java | 22 +-
.../com/cloud/vm/VmWorkStorageMigration.java | 18 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 2 +-
.../entity/api/VirtualMachineEntityImpl.java | 2 -
.../entity/api/db/dao/EngineHostDaoImpl.java | 4 +-
.../orchestration/NetworkOrchestrator.java | 394 +-
.../orchestration/VolumeOrchestrator.java | 195 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 1 -
.../spring-engine-schema-core-daos-context.xml | 38 +-
engine/schema/src/com/cloud/alert/AlertVO.java | 5 +-
.../src/com/cloud/alert/dao/AlertDao.java | 4 +-
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 8 +-
.../src/com/cloud/capacity/dao/CapacityDao.java | 11 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 59 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 12 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 34 +-
.../cloud/event/dao/UsageEventDetailsDao.java | 1 -
.../event/dao/UsageEventDetailsDaoImpl.java | 47 -
.../src/com/cloud/keystore/KeystoreDao.java | 31 -
.../src/com/cloud/keystore/KeystoreDaoImpl.java | 121 -
.../src/com/cloud/keystore/KeystoreVO.java | 102 -
.../com/cloud/network/as/AutoScalePolicyVO.java | 26 +-
.../cloud/network/as/AutoScaleVmGroupVO.java | 28 +-
.../network/as/AutoScaleVmGroupVmMapVO.java | 46 +-
.../as/dao/AutoScalePolicyConditionMapDao.java | 4 +-
.../dao/AutoScalePolicyConditionMapDaoImpl.java | 16 +-
.../as/dao/AutoScaleVmGroupVmMapDao.java | 6 +-
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 46 +-
.../network/dao/ExternalFirewallDeviceDao.java | 12 +-
.../network/dao/ExternalFirewallDeviceVO.java | 6 +-
.../dao/ExternalLoadBalancerDeviceDao.java | 16 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 8 +-
.../dao/ExternalLoadBalancerDeviceVO.java | 12 +-
.../network/dao/FirewallRulesCidrsDao.java | 3 +
.../network/dao/FirewallRulesCidrsDaoImpl.java | 11 +
.../cloud/network/dao/FirewallRulesCidrsVO.java | 4 +
.../network/dao/LoadBalancerCertMapDaoImpl.java | 4 +-
.../com/cloud/network/dao/NetworkDaoImpl.java | 2 +
.../com/cloud/network/dao/OvsProviderDao.java | 6 +-
.../cloud/network/dao/OvsProviderDaoImpl.java | 68 +-
.../com/cloud/network/dao/SslCertDaoImpl.java | 2 +-
.../cloud/network/element/OvsProviderVO.java | 128 +-
.../security/dao/VmRulesetLogDaoImpl.java | 4 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 4 +-
.../com/cloud/service/ServiceOfferingVO.java | 63 +-
.../cloud/service/dao/ServiceOfferingDao.java | 2 +-
.../service/dao/ServiceOfferingDaoImpl.java | 8 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 2 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 1 -
.../src/com/cloud/storage/dao/SnapshotDao.java | 9 -
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 22 +-
.../cloud/storage/dao/SnapshotDetailsVO.java | 4 +
.../storage/dao/VMTemplateHostDaoImpl.java | 28 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 2 +-
.../cloud/upgrade/DatabaseUpgradeChecker.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade218to22.java | 20 +-
.../cloud/upgrade/dao/Upgrade2213to2214.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 236 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 186 +-
.../com/cloud/upgrade/dao/Upgrade420to421.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade421to430.java | 301 +
.../com/cloud/upgrade/dao/Upgrade430to440.java | 148 +-
.../src/com/cloud/usage/UsageVMInstanceVO.java | 12 +-
.../src/com/cloud/usage/dao/UsageDaoImpl.java | 5 +-
.../com/cloud/usage/dao/UsageStorageDao.java | 2 +-
.../cloud/usage/dao/UsageStorageDaoImpl.java | 4 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
.../src/com/cloud/vm/dao/DomainRouterDao.java | 10 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 38 +-
engine/schema/src/com/cloud/vm/dao/NicDao.java | 2 +-
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 11 +-
.../src/com/cloud/vm/dao/NicIpAliasDao.java | 2 +-
.../src/com/cloud/vm/dao/NicSecondaryIpDao.java | 2 +
.../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 13 +
.../src/com/cloud/vm/dao/NicSecondaryIpVO.java | 46 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 6 +-
.../src/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 119 +-
.../cloud/vm/snapshot/dao/VMSnapshotDao.java | 2 +-
.../vm/snapshot/dao/VMSnapshotDaoImpl.java | 4 +-
.../engine/cloud/entity/api/db/VMEntityVO.java | 17 -
.../AutoScaleVmProfileDetailVO.java | 81 +
.../resourcedetail/DiskOfferingDetailVO.java | 81 +
.../resourcedetail/NetworkACLItemDetailVO.java | 1 -
.../resourcedetail/NetworkACLListDetailVO.java | 1 -
.../Site2SiteCustomerGatewayDetailVO.java | 81 +
.../Site2SiteVpnConnectionDetailVO.java | 81 +
.../Site2SiteVpnGatewayDetailVO.java | 84 +
.../cloudstack/resourcedetail/UserDetailVO.java | 81 +
.../dao/AutoScaleVmProfileDetailsDao.java | 26 +
.../dao/AutoScaleVmProfileDetailsDaoImpl.java | 33 +
.../dao/DiskOfferingDetailsDao.java | 26 +
.../dao/DiskOfferingDetailsDaoImpl.java | 33 +
.../dao/NetworkACLItemDetailsDaoImpl.java | 7 +-
.../dao/NetworkACLListDetailsDaoImpl.java | 9 +-
.../dao/Site2SiteCustomerGatewayDetailsDao.java | 26 +
.../Site2SiteCustomerGatewayDetailsDaoImpl.java | 34 +
.../dao/Site2SiteVpnConnectionDetailsDao.java | 26 +
.../Site2SiteVpnConnectionDetailsDaoImpl.java | 32 +
.../dao/Site2SiteVpnGatewayDetailsDao.java | 27 +
.../dao/Site2SiteVpnGatewayDetailsDaoImpl.java | 34 +
.../resourcedetail/dao/UserDetailsDao.java | 26 +
.../resourcedetail/dao/UserDetailsDaoImpl.java | 33 +
.../resourcedetail/dao/VpcDetailsDaoImpl.java | 7 +-
.../dao/VpcGatewayDetailsDao.java | 1 -
.../dao/VpcGatewayDetailsDaoImpl.java | 7 +-
.../datastore/db/SnapshotDataStoreDao.java | 4 +
.../datastore/db/TemplateDataStoreDao.java | 5 +
.../service/src/main/webapp/WEB-INF/beans.xml | 6 +-
.../motion/AncientDataMotionStrategy.java | 37 +-
.../storage/image/TemplateServiceImpl.java | 47 +-
engine/storage/integration-test/pom.xml | 35 -
.../cloudstack/storage/test/AllTests.java | 2 +-
.../storage/test/ChildTestConfiguration.java | 16 +-
.../storage/test/CloudStackTestNGBase.java | 12 +-
.../storage/test/EndpointSelectorTest.java | 1 -
.../test/FakePrimaryDataStoreDriver.java | 23 +-
.../cloudstack/storage/test/SnapshotTest.java | 3 +-
.../storage/test/SnapshotTestWithFakeData.java | 9 +-
.../storage/test/VolumeServiceTest.java | 470 +
.../cloudstack/storage/test/VolumeTest.java | 2 +-
.../storage/test/VolumeTestVmware.java | 2 +-
.../storage/test/volumeServiceTest.java | 470 -
.../resources/StorageAllocatorTestContext.xml | 36 +-
.../snapshot/SnapshotDataFactoryImpl.java | 12 +
.../storage/snapshot/SnapshotObject.java | 13 +-
.../storage/snapshot/SnapshotServiceImpl.java | 114 +-
.../SnapshotStateMachineManagerImpl.java | 2 +-
.../snapshot/XenserverSnapshotStrategy.java | 27 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 8 +-
.../cloudstack/storage/RemoteHostEndPoint.java | 24 +-
.../ClusterScopeStoragePoolAllocator.java | 8 +
.../allocator/ZoneWideStoragePoolAllocator.java | 6 +
.../storage/datastore/DataStoreManagerImpl.java | 9 +
.../datastore/ObjectInDataStoreManagerImpl.java | 1 +
.../endpoint/DefaultEndPointSelector.java | 98 +-
.../storage/helper/HypervisorHelperImpl.java | 3 +-
.../image/datastore/ImageStoreHelper.java | 9 +-
.../image/db/ImageStoreDetailsDaoImpl.java | 9 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 42 +
.../image/db/TemplateDataStoreDaoImpl.java | 26 +-
.../cloudstack/storage/volume/VolumeObject.java | 15 +-
.../storage/volume/VolumeServiceImpl.java | 39 +-
.../src/com/cloud/cluster/ClusterManager.java | 1 -
.../com/cloud/cluster/ClusterManagerImpl.java | 52 +-
.../dao/ManagementServerHostDaoImpl.java | 204 +-
.../framework/config/ConfigDepot.java | 8 +-
.../framework/config/impl/ConfigDepotImpl.java | 74 +-
.../config/impl/ConfigDepotAdminTest.java | 4 +-
.../db/src/com/cloud/utils/db/GenericDao.java | 6 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 62 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 4 +-
.../db/src/com/cloud/utils/db/SqlGenerator.java | 4 +-
.../com/cloud/utils/db/TransactionLegacy.java | 26 +-
.../com/cloud/utils/db/GenericDaoBaseTest.java | 134 +
.../test/com/cloud/utils/db/GlobalLockTest.java | 6 +-
.../framework/messagebus/MessageDispatcher.java | 62 +-
.../jobs/AsyncJobExecutionContext.java | 197 +-
.../framework/jobs/AsyncJobManager.java | 12 +-
.../framework/jobs/dao/VmWorkJobDao.java | 2 +
.../framework/jobs/dao/VmWorkJobDaoImpl.java | 93 +-
.../jobs/impl/AsyncJobManagerImpl.java | 24 +-
.../framework/jobs/impl/OutcomeImpl.java | 6 +-
.../managed/threadlocal/ManagedThreadLocal.java | 6 +-
framework/pom.xml | 1 +
framework/security/pom.xml | 60 +
.../spring-framework-security-core-context.xml | 32 +
.../framework/security/keys/KeysManager.java | 38 +
.../security/keys/KeysManagerImpl.java | 127 +
.../security/keystore/KeystoreDao.java | 31 +
.../security/keystore/KeystoreDaoImpl.java | 121 +
.../security/keystore/KeystoreManager.java | 64 +
.../security/keystore/KeystoreManagerImpl.java | 154 +
.../framework/security/keystore/KeystoreVO.java | 102 +
.../lifecycle/registry/ExtensionRegistry.java | 3 +-
framework/spring/module/pom.xml | 1 +
packaging/centos63/cloud.spec | 11 +-
parents/checkstyle/pom.xml | 21 -
.../src/main/resources/tooling/checkstyle.xml | 53 -
.../acl/StaticRoleBasedAPIAccessChecker.java | 4 +-
.../discovery/ApiDiscoveryServiceImpl.java | 8 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 26 +-
.../cloudstack/ratelimit/ApiRateLimitTest.java | 74 +-
.../implicitplanner/ImplicitPlannerTest.java | 1 -
plugins/event-bus/inmemory/pom.xml | 40 +
.../mom/inmemory/InMemoryEventBus.java | 163 +
.../mom/rabbitmq/RabbitMQEventBus.java | 64 +-
.../netapp/NetappDefaultAllocatorImpl.java | 15 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 5 -
plugins/ha-planners/skip-heurestics/pom.xml | 29 +
.../skip-heurestics/module.properties | 18 +
.../spring-skip-heurestics-context.xml | 26 +
.../com/cloud/deploy/SkipHeuresticsPlanner.java | 61 +
.../BareMetalPingServiceImpl.java | 4 +-
.../BaremetalKickStartPxeResource.java | 2 +-
.../BaremetalPingPxeResource.java | 10 +-
.../BaremetalUserdataElement.java | 2 +-
.../AgentShell/AgentService.Designer.cs | 2 +-
.../ServerResource/AgentShell/AgentService.cs | 2 +-
.../DotNet/ServerResource/AgentShell/App.config | 9 +-
.../DotNet/ServerResource/AgentShell/Program.cs | 95 +-
.../AgentShell/ProjectInstaller.Designer.cs | 55 +-
.../ServerResource/HypervResource/App.config | 6 +-
.../HypervResource/CloudStackTypes.cs | 184 +-
.../HypervResource/HypervResourceController.cs | 607 +-
.../HypervResource/IWmiCallsV2.cs | 6 +-
.../ServerResource/HypervResource/Utils.cs | 24 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 272 +-
plugins/hypervisors/hyperv/pom.xml | 1 -
.../core/spring-hyperv-core-context.xml | 32 +
.../spring-hyperv-compute-context.xml | 4 +-
.../src/com/cloud/ha/HypervInvestigator.java | 77 +
.../discoverer/HypervServerDiscoverer.java | 215 -
.../hypervisor/hyperv/guru/HypervGuru.java | 113 +
.../hyperv/manager/HypervManager.java | 25 +
.../hyperv/manager/HypervManagerImpl.java | 384 +
.../resource/HypervDirectConnectResource.java | 607 +-
plugins/hypervisors/kvm/pom.xml | 2 -
.../kvm/resource/BridgeVifDriver.java | 5 +-
.../hypervisor/kvm/resource/KVMHABase.java | 2 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 2 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 6 +-
.../kvm/resource/LibvirtCapXMLParser.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 984 +-
.../kvm/resource/LibvirtConnection.java | 16 +-
.../kvm/resource/LibvirtNetworkDef.java | 10 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 47 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 8 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 367 +
.../kvm/storage/IscsiAdmStoragePool.java | 167 +
.../kvm/storage/KVMStoragePoolManager.java | 7 +-
.../kvm/storage/KVMStorageProcessor.java | 115 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 76 +-
.../kvm/storage/iScsiAdmStorageAdaptor.java | 367 -
.../kvm/storage/iScsiAdmStoragePool.java | 167 -
.../apache/cloudstack/utils/qemu/QemuImg.java | 7 +-
.../resource/LibvirtComputingResourceTest.java | 162 +-
.../kvm/resource/LibvirtSecretDefTest.java | 55 +
.../kvm/resource/LibvirtStoragePoolDefTest.java | 84 +
.../kvm/resource/LibvirtVMDefTest.java | 25 +
.../kvm/resource/LibvirtVifDriverTest.java | 26 +-
.../src/com/cloud/ovm/hypervisor/OvmHelper.java | 66 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 46 +-
.../ovm/src/com/cloud/ovm/object/Coder.java | 18 +-
.../ovm/src/com/cloud/ovm/object/OvmBridge.java | 2 +-
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 4 +-
.../agent/manager/MockAgentManagerImpl.java | 7 +
.../com/cloud/resource/AgentResourceBase.java | 4 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 45 +-
.../cloud/hypervisor/vmware/LegacyZoneVO.java | 10 +-
.../hypervisor/vmware/VmwareCleanupMaid.java | 11 -
.../hypervisor/vmware/VmwareDatacenterVO.java | 16 +-
.../vmware/VmwareDatacenterZoneMapVO.java | 2 +
.../vmware/VmwareServerDiscoverer.java | 30 +-
.../vmware/manager/VmwareHostService.java | 9 +-
.../vmware/manager/VmwareManagerImpl.java | 66 +-
.../vmware/manager/VmwareStorageManager.java | 4 +
.../manager/VmwareStorageManagerImpl.java | 401 +-
.../vmware/resource/VmwareContextFactory.java | 2 +-
.../vmware/resource/VmwareResource.java | 2424 ++---
.../cloud/network/CiscoNexusVSMDeviceVO.java | 38 +-
.../network/element/CiscoNexusVSMElement.java | 2 -
.../VmwareSecondaryStorageResourceHandler.java | 73 +-
.../resource/VmwareStorageProcessor.java | 164 +-
.../VmwareStorageSubsystemCommandHandler.java | 3 +
.../motion/VmwareStorageMotionStrategy.java | 6 +-
.../vmware/resource/VmwareResourceTest.java | 2 +-
.../motion/VmwareStorageMotionStrategyTest.java | 15 +-
plugins/hypervisors/xen/pom.xml | 2 -
.../src/com/cloud/hypervisor/XenServerGuru.java | 98 +
.../xen/discoverer/XcpServerDiscoverer.java | 63 +-
.../hypervisor/xen/resource/CitrixHelper.java | 3270 +++---
.../xen/resource/CitrixResourceBase.java | 2484 +----
.../xen/resource/XenServer56Resource.java | 44 +-
.../xen/resource/XenServer56SP2Resource.java | 4 +-
.../xen/resource/XenServerConnectionPool.java | 464 +-
.../xen/resource/XenServerPoolVms.java | 21 +-
.../xen/resource/XenServerStorageProcessor.java | 269 +-
.../xen/resource/Xenserver625Resource.java | 112 +
.../resource/Xenserver625StorageProcessor.java | 822 ++
.../xenserver/XenServerResourceNewBase.java | 320 +
.../motion/XenServerStorageMotionStrategy.java | 8 +-
.../network/bigswitch/BigSwitchVnsApi.java | 22 +-
.../cloud/network/bigswitch/NetworkData.java | 22 +-
.../com/cloud/network/bigswitch/PortData.java | 10 +-
.../network/resource/BigSwitchVnsResource.java | 6 +-
.../api/ConfigureNexusVsmForAsaCommand.java | 24 +-
.../api/CreateLogicalEdgeFirewallCommand.java | 8 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 19 +-
.../cloud/network/element/CiscoVnmcElement.java | 9 +-
.../element/CiscoVnmcElementService.java | 2 +-
.../network/resource/CiscoVnmcResource.java | 4 +-
.../resources/components-example.xml | 1 -
.../lb/ElasticLoadBalancerManagerImpl.java | 17 +-
plugins/network-elements/f5/pom.xml | 5 +
.../element/F5ExternalLoadBalancerElement.java | 4 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 4 +-
.../network-elements/juniper-contrail/pom.xml | 8 +-
.../cloudstack/contrail/module.properties | 18 +
.../contrail/spring-contrail-context.xml | 50 +
.../management/ContrailElementImpl.java | 84 +-
.../contrail/management/ContrailGuru.java | 59 +-
.../contrail/management/ContrailManager.java | 31 +-
.../management/ContrailManagerImpl.java | 270 +-
.../network/contrail/management/EventUtils.java | 7 +-
.../management/ManagementNetworkGuru.java | 26 +-
.../contrail/management/ModelDatabase.java | 24 +-
.../contrail/management/ServerDBSyncImpl.java | 232 +-
.../management/ServerEventHandlerImpl.java | 10 -
.../contrail/management/ServiceManagerImpl.java | 32 +-
.../contrail/model/NetworkPolicyModel.java | 305 +
.../contrail/model/ServiceInstanceModel.java | 128 +-
.../contrail/model/VirtualMachineModel.java | 111 +-
.../contrail/model/VirtualNetworkModel.java | 84 +-
.../IntegrationTestConfiguration.java | 80 +-
.../management/ManagementServerMock.java | 30 +-
.../contrail/management/MockAccountManager.java | 3 -
.../management/NetworkProviderTest.java | 32 +-
.../contrail/management/PublicNetworkTest.java | 28 +-
.../management/VirtualNetworkModelTest.java | 56 -
.../contrail/model/VirtualMachineModelTest.java | 124 +
.../contrail/model/VirtualNetworkModelTest.java | 102 +
.../test/resources/commonContext.xml | 192 +-
.../JuniperSRXExternalFirewallElement.java | 5 +-
.../network/resource/JuniperSrxResource.java | 12 +-
.../commands/AddNetscalerLoadBalancerCmd.java | 6 +-
.../cloud/network/element/NetscalerElement.java | 2 +-
.../network/resource/NetscalerResource.java | 114 +-
plugins/network-elements/nicira-nvp/pom.xml | 80 +-
.../META-INF/cloudstack/nvp/module.properties | 3 +
.../cloudstack/nvp/spring-nvp-context.xml | 30 +-
...ortForwardingRulesOnLogicalRouterAnswer.java | 3 +
...rtForwardingRulesOnLogicalRouterCommand.java | 3 +
...ConfigurePublicIpsOnLogicalRouterAnswer.java | 3 +
...onfigurePublicIpsOnLogicalRouterCommand.java | 3 +
...gureStaticNatRulesOnLogicalRouterAnswer.java | 3 +
...ureStaticNatRulesOnLogicalRouterCommand.java | 3 +
.../agent/api/CreateLogicalRouterAnswer.java | 3 +
.../agent/api/CreateLogicalRouterCommand.java | 3 +
.../agent/api/CreateLogicalSwitchAnswer.java | 3 +
.../agent/api/CreateLogicalSwitchCommand.java | 3 +
.../api/CreateLogicalSwitchPortAnswer.java | 3 +
.../api/CreateLogicalSwitchPortCommand.java | 3 +
.../agent/api/DeleteLogicalRouterAnswer.java | 3 +
.../agent/api/DeleteLogicalRouterCommand.java | 3 +
.../agent/api/DeleteLogicalSwitchAnswer.java | 3 +
.../agent/api/DeleteLogicalSwitchCommand.java | 3 +
.../api/DeleteLogicalSwitchPortAnswer.java | 3 +
.../api/DeleteLogicalSwitchPortCommand.java | 3 +
.../agent/api/FindLogicalSwitchPortAnswer.java | 3 +
.../agent/api/FindLogicalSwitchPortCommand.java | 3 +
.../agent/api/StartupNiciraNvpCommand.java | 3 +
.../api/UpdateLogicalSwitchPortAnswer.java | 3 +
.../api/UpdateLogicalSwitchPortCommand.java | 3 +
.../api/commands/AddNiciraNvpDeviceCmd.java | 3 +
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 3 +
.../ListNiciraNvpDeviceNetworksCmd.java | 3 +
.../api/commands/ListNiciraNvpDevicesCmd.java | 3 +
.../api/response/NiciraNvpDeviceResponse.java | 3 +
.../com/cloud/network/NiciraNvpDeviceVO.java | 3 +
.../cloud/network/NiciraNvpNicMappingVO.java | 3 +
.../cloud/network/NiciraNvpRouterMappingVO.java | 3 +
.../src/com/cloud/network/dao/NiciraNvpDao.java | 3 +
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 3 +
.../network/dao/NiciraNvpNicMappingDao.java | 3 +
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 3 +
.../network/dao/NiciraNvpRouterMappingDao.java | 3 +
.../dao/NiciraNvpRouterMappingDaoImpl.java | 3 +
.../cloud/network/element/NiciraNvpElement.java | 78 +-
.../element/NiciraNvpElementService.java | 3 +
.../network/guru/NiciraNvpGuestNetworkGuru.java | 3 +
.../network/nicira/AccessConfiguration.java | 132 +
.../com/cloud/network/nicira/AccessRule.java | 58 +
.../src/com/cloud/network/nicira/Acl.java | 24 +
.../src/com/cloud/network/nicira/AclRule.java | 209 +
.../com/cloud/network/nicira/Attachment.java | 3 +
.../network/nicira/ControlClusterStatus.java | 3 +
.../network/nicira/DestinationNatRule.java | 3 +
.../network/nicira/L3GatewayAttachment.java | 3 +
.../network/nicira/LogicalRouterConfig.java | 3 +
.../cloud/network/nicira/LogicalRouterPort.java | 3 +
.../com/cloud/network/nicira/LogicalSwitch.java | 3 +
.../cloud/network/nicira/LogicalSwitchPort.java | 3 +
.../src/com/cloud/network/nicira/Match.java | 3 +
.../src/com/cloud/network/nicira/NatRule.java | 3 +
.../com/cloud/network/nicira/NiciraNvpApi.java | 380 +-
.../network/nicira/NiciraNvpApiException.java | 3 +
.../com/cloud/network/nicira/NiciraNvpList.java | 3 +
.../com/cloud/network/nicira/NiciraNvpTag.java | 3 +
.../cloud/network/nicira/PatchAttachment.java | 3 +
.../com/cloud/network/nicira/RouterNextHop.java | 3 +
.../com/cloud/network/nicira/RoutingConfig.java | 3 +
.../cloud/network/nicira/SecurityProfile.java | 24 +
.../com/cloud/network/nicira/SecurityRule.java | 138 +
.../SingleDefaultRouteImplictRoutingConfig.java | 5 +-
.../com/cloud/network/nicira/SourceNatRule.java | 3 +
.../network/nicira/TransportZoneBinding.java | 3 +
.../com/cloud/network/nicira/VifAttachment.java | 3 +
.../network/resource/NiciraNvpResource.java | 3 +
.../network/element/NiciraNvpElementTest.java | 3 +
.../guru/NiciraNvpGuestNetworkGuruTest.java | 3 +
.../com/cloud/network/nicira/NatRuleTest.java | 3 +
.../cloud/network/nicira/NiciraNvpApiIT.java | 166 +
.../cloud/network/nicira/NiciraNvpApiTest.java | 199 +-
.../com/cloud/network/nicira/NiciraTagTest.java | 3 +
.../network/resource/NiciraNvpResourceTest.java | 3 +
.../nicira-nvp/test/resources/config.properties | 23 +
plugins/network-elements/opendaylight/pom.xml | 86 +
.../opendaylight/OpendaylightElement.java | 174 +
.../OpendaylightGuestNetworkGuru.java | 276 +
.../agent/OpenDaylightControllerResource.java | 344 +
.../OpenDaylightControllerResourceManager.java | 42 +
...enDaylightControllerResourceManagerImpl.java | 219 +
.../agent/commands/AddHypervisorCommand.java | 58 +
.../agent/commands/ConfigureNetworkCommand.java | 54 +
.../agent/commands/ConfigurePortCommand.java | 80 +
.../agent/commands/DestroyNetworkCommand.java | 45 +
.../agent/commands/DestroyPortCommand.java | 50 +
.../StartupOpenDaylightControllerCommand.java | 29 +
.../agent/responses/AddHypervisorAnswer.java | 35 +
.../agent/responses/ConfigureNetworkAnswer.java | 43 +
.../agent/responses/ConfigurePortAnswer.java | 35 +
.../agent/responses/DestroyNetworkAnswer.java | 35 +
.../agent/responses/DestroyPortAnswer.java | 35 +
.../api/NeutronInvalidCredentialsException.java | 38 +
.../opendaylight/api/NeutronRestApi.java | 217 +
.../api/NeutronRestApiException.java | 38 +
.../opendaylight/api/NeutronRestFactory.java | 55 +
.../commands/AddOpenDaylightControllerCmd.java | 114 +
.../DeleteOpenDaylightControllerCmd.java | 99 +
.../ListOpenDaylightControllersCmd.java | 104 +
.../api/enums/NeutronNorthboundEnum.java | 44 +
.../opendaylight/api/model/NeutronNetwork.java | 213 +
.../api/model/NeutronNetworkWrapper.java | 70 +
.../api/model/NeutronNetworksList.java | 42 +
.../opendaylight/api/model/NeutronNode.java | 98 +
.../api/model/NeutronNodeWrapper.java | 65 +
.../api/model/NeutronNodesList.java | 42 +
.../opendaylight/api/model/NeutronPort.java | 265 +
.../api/model/NeutronPortWrapper.java | 70 +
.../api/model/NeutronPortsList.java | 42 +
.../opendaylight/api/resources/Action.java | 289 +
.../NeutronNetworksNorthboundAction.java | 113 +
.../resources/NeutronNodesNorthboundAction.java | 89 +
.../resources/NeutronPortsNorthboundAction.java | 111 +
.../OpenDaylightControllerResponse.java | 73 +
.../dao/OpenDaylightControllerMappingDao.java | 28 +
.../OpenDaylightControllerMappingDaoImpl.java | 45 +
.../dao/OpenDaylightControllerVO.java | 100 +
.../cloudstack/opendaylight/module.properties | 21 +
.../spring-opendaylight-context.xml | 42 +
.../opendaylight/api/test/NeutronEnumsTest.java | 85 +
.../api/test/NeutronNetworkAdapterTest.java | 88 +
.../api/test/NeutronNodeAdapterTest.java | 74 +
.../api/test/NeutronPortAdapterTest.java | 95 +
.../opendaylight/api/test/NeutronRestApiIT.java | 95 +
.../api/test/NeutronRestApiTest.java | 254 +
.../agent/api/OvsCreateGreTunnelAnswer.java | 98 +-
.../agent/api/OvsCreateGreTunnelCommand.java | 67 +-
.../cloud/agent/api/OvsCreateTunnelAnswer.java | 104 +-
.../cloud/agent/api/OvsCreateTunnelCommand.java | 77 +-
.../cloud/agent/api/OvsDeleteFlowCommand.java | 23 +-
.../agent/api/OvsDestroyBridgeCommand.java | 33 +-
.../agent/api/OvsDestroyTunnelCommand.java | 55 +-
.../agent/api/OvsFetchInterfaceAnswer.java | 70 +-
.../agent/api/OvsFetchInterfaceCommand.java | 23 +-
.../cloud/agent/api/OvsSetTagAndFlowAnswer.java | 30 +-
.../agent/api/OvsSetTagAndFlowCommand.java | 79 +-
.../cloud/agent/api/OvsSetupBridgeCommand.java | 53 +-
.../com/cloud/agent/api/StartupOvsCommand.java | 7 +-
.../com/cloud/network/element/OvsElement.java | 1014 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 334 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 479 +-
.../PaloAltoExternalFirewallElement.java | 3 -
.../element/PaloAltoFirewallElementService.java | 3 -
.../network/resource/PaloAltoResource.java | 70 +-
.../resource/MockablePaloAltoResource.java | 31 +-
.../network/resource/PaloAltoResourceTest.java | 96 +-
.../network-elements/stratosphere-ssp/pom.xml | 2 +-
.../cloudstack/ssp/spring-ssp-context.xml | 1 -
.../cloudstack/network/element/SspElement.java | 4 +-
plugins/pom.xml | 4 +
.../driver/CloudStackImageStoreDriverImpl.java | 2 +-
.../CloudStackImageStoreLifeCycleImpl.java | 34 +-
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 4 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 4 +-
plugins/storage/volume/nexenta/pom.xml | 47 +
.../module.properties | 18 +
.../spring-storage-volume-nexenta-context.xml | 32 +
.../driver/NexentaPrimaryDataStoreDriver.java | 194 +
.../NexentaPrimaryDataStoreLifeCycle.java | 176 +
.../datastore/provider/NexentaHostListener.java | 35 +
.../NexentaPrimaryDataStoreProvider.java | 81 +
.../datastore/util/NexentaNmsClient.java | 229 +
.../storage/datastore/util/NexentaNmsUrl.java | 85 +
.../datastore/util/NexentaStorAppliance.java | 418 +
.../storage/datastore/util/NexentaUtil.java | 242 +
.../util/NexentaStorApplianceTest.java | 337 +
.../storage/datastore/util/NexentaUtilTest.java | 135 +
.../SamplePrimaryDataStoreDriverImpl.java | 14 +
.../driver/SolidfirePrimaryDataStoreDriver.java | 397 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 10 -
.../storage/datastore/util/SolidFireUtil.java | 559 +-
plugins/user-authenticators/ldap/pom.xml | 35 -
.../cloudstack/api/command/LDAPConfigCmd.java | 277 +
.../cloudstack/api/command/LDAPRemoveCmd.java | 77 +
.../api/command/LdapImportUsersCmd.java | 26 +-
.../api/response/LDAPConfigResponse.java | 115 +
.../api/response/LDAPRemoveResponse.java | 30 +
.../cloudstack/ldap/LdapAuthenticator.java | 15 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 6 +-
.../cloud/server/auth/MD5UserAuthenticator.java | 9 +-
.../server/auth/PlainTextUserAuthenticator.java | 9 +-
.../auth/SHA256SaltedUserAuthenticator.java | 10 +-
.../server/auth/test/AuthenticatorTest.java | 10 +-
pom.xml | 256 +-
scripts/network/domr/bumpUpPriority.sh | 47 -
scripts/network/domr/call_dnsmasq.sh | 27 -
scripts/network/domr/call_firewall.sh | 70 -
scripts/network/domr/call_loadbalancer.sh | 101 -
scripts/network/domr/createipAlias.sh | 26 -
scripts/network/domr/deleteipAlias.sh | 25 -
scripts/network/domr/dhcp_entry.sh | 82 -
scripts/network/domr/s2s_vpn.sh | 29 -
scripts/network/domr/save_password_to_domr.sh | 73 -
scripts/storage/secondary/createtmplt.sh | 4 +-
scripts/storage/secondary/createvolume.sh | 23 +-
scripts/vm/hypervisor/xenserver/cloudlog | 25 +
scripts/vm/hypervisor/xenserver/hostvmstats.py | 19 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 4 +
scripts/vm/hypervisor/xenserver/vhd-util | Bin 318977 -> 0 bytes
scripts/vm/hypervisor/xenserver/vmops | 128 +-
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 17 +-
scripts/vm/hypervisor/xenserver/vmopspremium | 9 +-
.../vm/hypervisor/xenserver/xenserver56/patch | 1 +
.../hypervisor/xenserver/xenserver56fp1/patch | 1 +
.../xenserver/xenserver62/cloud-plugin-storage | 301 +
.../vm/hypervisor/xenserver/xenserver62/patch | 74 +
scripts/vm/network/security_group.py | 2 +-
scripts/vm/network/vnet/ovstunnel.py | 4 +
server/pom.xml | 51 +-
.../spring-server-core-managers-context.xml | 15 +-
server/src/com/cloud/acl/DomainChecker.java | 4 +-
.../allocator/impl/FirstFitAllocator.java | 4 +-
.../impl/UserConcentratedAllocator.java | 47 +-
.../src/com/cloud/alert/AlertManagerImpl.java | 55 +-
.../com/cloud/alert/ClusterAlertAdapter.java | 3 +-
.../cloud/alert/ConsoleProxyAlertAdapter.java | 14 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 14 +-
server/src/com/cloud/api/ApiDBUtils.java | 882 +-
server/src/com/cloud/api/ApiDispatcher.java | 4 +-
server/src/com/cloud/api/ApiResponseHelper.java | 240 +-
.../src/com/cloud/api/ApiSerializerHelper.java | 2 +-
server/src/com/cloud/api/ApiServer.java | 68 +-
server/src/com/cloud/api/ApiServlet.java | 2 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 2 +-
server/src/com/cloud/api/doc/Alert.java | 12 +-
.../src/com/cloud/api/doc/ApiXmlDocWriter.java | 90 +-
server/src/com/cloud/api/doc/Command.java | 11 +-
.../com/cloud/api/query/QueryManagerImpl.java | 96 +-
.../com/cloud/api/query/ViewResponseHelper.java | 3 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 5 +-
.../api/query/dao/ImageStoreJoinDaoImpl.java | 28 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 13 +-
.../cloud/api/query/dao/TemplateJoinDao.java | 7 +-
.../api/query/dao/TemplateJoinDaoImpl.java | 30 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 2 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 30 +-
.../cloud/api/query/dao/VolumeJoinDaoImpl.java | 4 +-
.../api/query/vo/ServiceOfferingJoinVO.java | 8 +-
.../com/cloud/api/query/vo/TemplateJoinVO.java | 7 +
.../com/cloud/api/query/vo/UserVmJoinVO.java | 63 +-
.../api/response/ApiResponseSerializer.java | 12 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 97 +-
.../cloud/capacity/ComputeCapacityListener.java | 6 +-
server/src/com/cloud/configuration/Config.java | 81 +-
.../configuration/ConfigurationManagerImpl.java | 470 +-
.../src/com/cloud/configuration/ZoneConfig.java | 6 +-
.../AgentBasedConsoleProxyManager.java | 14 +-
.../com/cloud/consoleproxy/AgentHookBase.java | 34 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 121 +-
.../consoleproxy/StaticConsoleProxyManager.java | 4 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 15 +-
.../deploy/DeploymentPlanningManagerImpl.java | 86 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 15 +-
.../src/com/cloud/event/ActionEventUtils.java | 37 +-
server/src/com/cloud/event/AlertGenerator.java | 19 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 58 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../kvm/discoverer/LibvirtServerDiscoverer.java | 13 -
.../src/com/cloud/keystore/KeystoreManager.java | 32 -
.../com/cloud/keystore/KeystoreManagerImpl.java | 155 -
.../metadata/ResourceMetaDataManagerImpl.java | 66 +-
.../network/ExternalIpAddressAllocator.java | 9 +-
.../src/com/cloud/network/IpAddrAllocator.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 224 +-
.../src/com/cloud/network/NetworkModelImpl.java | 48 +-
.../com/cloud/network/NetworkServiceImpl.java | 592 +-
.../cloud/network/NetworkUsageManagerImpl.java | 3 +-
.../com/cloud/network/as/AutoScaleManager.java | 4 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 411 +-
.../element/CloudZonesNetworkElement.java | 2 +-
.../network/element/VirtualRouterElement.java | 101 +-
.../element/VpcVirtualRouterElement.java | 16 +-
.../cloud/network/guru/ControlNetworkGuru.java | 14 +-
.../cloud/network/guru/DirectNetworkGuru.java | 6 +-
.../network/guru/ExternalGuestNetworkGuru.java | 33 +-
.../cloud/network/guru/GuestNetworkGuru.java | 6 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 6 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 6 +-
.../cloud/network/guru/PublicNetworkGuru.java | 20 +-
.../cloud/network/guru/StorageNetworkGuru.java | 6 +-
.../lb/LoadBalancingRulesManagerImpl.java | 16 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 132 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 23 +-
.../security/SecurityGroupManagerImpl.java | 100 +-
.../network/vpc/NetworkACLManagerImpl.java | 13 +-
.../network/vpc/NetworkACLServiceImpl.java | 50 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 13 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
.../com/cloud/projects/ProjectManagerImpl.java | 1 +
.../com/cloud/resource/ResourceManagerImpl.java | 55 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 66 +-
.../cloud/server/ConfigurationServerImpl.java | 134 +-
.../src/com/cloud/server/ManagementServer.java | 17 +-
.../com/cloud/server/ManagementServerImpl.java | 310 +-
server/src/com/cloud/server/StatsCollector.java | 739 +-
.../cloud/server/auth/UserAuthenticator.java | 8 +-
.../cloud/servlet/ConsoleProxyClientParam.java | 41 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 94 +-
.../com/cloud/storage/StorageManagerImpl.java | 117 +-
.../storage/StoragePoolAutomationImpl.java | 24 +-
.../com/cloud/storage/VmWorkAttachVolume.java | 40 +
.../com/cloud/storage/VmWorkDetachVolume.java | 34 +
.../com/cloud/storage/VmWorkMigrateVolume.java | 46 +
.../com/cloud/storage/VmWorkResizeVolume.java | 61 +
.../cloud/storage/VmWorkTakeVolumeSnapshot.java | 54 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 844 +-
.../storage/download/DownloadListener.java | 16 +-
.../storage/download/DownloadMonitorImpl.java | 1 -
.../storage/listener/SnapshotStateListener.java | 7 +-
.../storage/listener/StoragePoolMonitor.java | 6 +-
.../storage/listener/VolumeStateListener.java | 7 +-
.../resource/DummySecondaryStorageResource.java | 4 +-
.../secondary/SecondaryStorageManagerImpl.java | 27 +-
.../secondary/SecondaryStorageVmManager.java | 2 +-
.../storage/snapshot/SnapshotManagerImpl.java | 47 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 8 +-
.../cloud/storage/upload/UploadListener.java | 12 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 4 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 259 +-
.../template/HypervisorTemplateAdapter.java | 56 +-
.../com/cloud/template/TemplateAdapterBase.java | 8 +-
.../com/cloud/template/TemplateManagerImpl.java | 97 +-
server/src/com/cloud/test/IPRangeConfig.java | 29 +-
.../src/com/cloud/user/AccountManagerImpl.java | 145 +-
.../src/com/cloud/user/DomainManagerImpl.java | 3 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 44 -
.../src/com/cloud/uuididentity/UUIDManager.java | 1 -
.../com/cloud/uuididentity/UUIDManagerImpl.java | 46 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 38 -
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 241 -
.../com/cloud/uuididentity/dao/IdentityVO.java | 25 -
.../src/com/cloud/vm/SystemVmLoadScanner.java | 18 +-
server/src/com/cloud/vm/UserVmManager.java | 7 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 629 +-
.../src/com/cloud/vm/UserVmStateListener.java | 55 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 597 +-
.../vm/snapshot/VmWorkCreateVMSnapshot.java | 41 +
.../vm/snapshot/VmWorkDeleteAllVMSnapshots.java | 35 +
.../vm/snapshot/VmWorkDeleteVMSnapshot.java | 35 +
.../vm/snapshot/VmWorkRevertToVMSnapshot.java | 35 +
.../cloudstack/network/lb/CertServiceImpl.java | 24 +-
server/test/async-job-component.xml | 371 +-
.../com/cloud/capacity/CapacityManagerTest.java | 28 +-
.../network/DedicateGuestVlanRangesTest.java | 16 +-
.../cloud/network/MockFirewallManagerImpl.java | 2 +-
.../com/cloud/network/MockNetworkModelImpl.java | 9 +
.../network/UpdatePhysicalNetworkTest.java | 6 +-
.../SecurityGroupManagerTestConfiguration.java | 12 +-
.../cloud/resource/MockResourceManagerImpl.java | 9 +
.../snapshot/SnapshotDaoTestConfiguration.java | 2 +-
.../vm/DeploymentPlanningManagerImplTest.java | 6 +-
.../vm/snapshot/VMSnapshotManagerTest.java | 2 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 19 +-
.../com/cloud/vpc/MockNetworkModelImpl.java | 10 +
.../cloud/vpc/MockResourceLimitManagerImpl.java | 1 -
.../MockVpcVirtualNetworkApplianceManager.java | 2 +-
.../com/cloud/vpc/NetworkACLManagerTest.java | 95 +-
.../com/cloud/vpc/NetworkACLServiceTest.java | 14 +-
.../com/cloud/vpc/VpcTestConfiguration.java | 28 +-
.../networkoffering/ChildTestConfiguration.java | 18 +-
.../SecurityGroupManagerTestContext.xml | 20 +-
.../test/resources/SnapshotDaoTestContext.xml | 20 +-
.../resources/StoragePoolDaoTestContext.xml | 20 +-
server/test/resources/network-mgr-component.xml | 1 -
.../console-proxy-rdp/rdpconsole/README.txt | 54 +-
services/console-proxy-rdp/rdpconsole/pom.xml | 8 +-
.../console-proxy-rdp/rdpconsole/rdp-config.bat | 2 +-
.../src/main/java/common/AwtBellAdapter.java | 77 -
.../src/main/java/common/AwtCanvasAdapter.java | 166 -
.../main/java/common/AwtClipboardAdapter.java | 56 -
.../src/main/java/common/AwtKeyEventSource.java | 0
.../main/java/common/AwtMouseEventSource.java | 0
.../src/main/java/common/BitmapOrder.java | 3 +-
.../src/main/java/common/BitmapRectangle.java | 6 +-
.../main/java/common/BufferedImageCanvas.java | 8 +-
.../common/BufferedImageCopyRectAdapter.java | 32 +-
.../java/common/BufferedImagePixelsAdapter.java | 46 +-
.../rdpconsole/src/main/java/common/Client.java | 283 +-
.../src/main/java/common/CopyRectOrder.java | 0
.../src/main/java/common/KeyOrder.java | 0
.../src/main/java/common/MouseOrder.java | 0
.../src/main/java/common/OrderType.java | 0
.../src/main/java/common/ScreenDescription.java | 56 +-
.../main/java/common/SizeChangeListener.java | 0
.../java/common/adapter/AwtBellAdapter.java | 77 +
.../java/common/adapter/AwtCanvasAdapter.java | 173 +
.../common/adapter/AwtClipboardAdapter.java | 57 +
.../src/main/java/common/asn1/Any.java | 78 +
.../main/java/common/asn1/Asn1Constants.java | 83 +
.../src/main/java/common/asn1/Asn1Integer.java | 116 +
.../src/main/java/common/asn1/BerType.java | 40 +
.../src/main/java/common/asn1/BitString.java | 67 +
.../src/main/java/common/asn1/ObjectID.java | 67 +
.../src/main/java/common/asn1/OctetString.java | 80 +
.../src/main/java/common/asn1/Sequence.java | 143 +
.../src/main/java/common/asn1/SequenceOf.java | 82 +
.../src/main/java/common/asn1/Tag.java | 462 +
.../main/java/common/opt/IncrementalOption.java | 28 +
.../src/main/java/common/opt/IntOption.java | 41 +
.../opt/NoArgumentForOptionException.java | 26 +
.../src/main/java/common/opt/Option.java | 102 +
.../src/main/java/common/opt/OptionParser.java | 147 +
.../common/opt/OptionRequiredException.java | 26 +
.../main/java/common/opt/StringArrayOption.java | 38 +
.../common/opt/StringEnumerationOption.java | 72 +
.../src/main/java/common/opt/StringOption.java | 41 +
.../java/common/opt/UnknownOptionException.java | 27 +
.../java/rdpclient/AwtRdpKeyboardAdapter.java | 350 -
.../main/java/rdpclient/AwtRdpMouseAdapter.java | 180 -
.../java/rdpclient/ClientConfirmActivePDU.java | 1129 ---
.../main/java/rdpclient/ClientFastPathPDU.java | 55 -
.../src/main/java/rdpclient/ClientInfoPDU.java | 455 -
.../rdpclient/ClientMCSAttachUserRequest.java | 103 -
...JoinRequest_ServerMCSChannelConfirmPDUs.java | 222 -
.../java/rdpclient/ClientMCSConnectInitial.java | 669 --
.../rdpclient/ClientMCSErectDomainRequest.java | 189 -
.../java/rdpclient/ClientPacketSniffer.java | 49 -
.../java/rdpclient/ClientSynchronizePDU.java | 248 -
.../src/main/java/rdpclient/ClientTpkt.java | 54 -
.../ClientX224ConnectionRequestPDU.java | 156 -
.../main/java/rdpclient/ClientX224DataPdu.java | 52 -
.../src/main/java/rdpclient/HandshakeEnd.java | 27 -
.../src/main/java/rdpclient/MockServer.java | 198 -
.../src/main/java/rdpclient/PacketSniffer.java | 75 -
.../java/rdpclient/RLEBitmapDecompression.java | 985 --
.../src/main/java/rdpclient/RdpClient.java | 312 +-
.../src/main/java/rdpclient/RdpConstants.java | 70 -
.../src/main/java/rdpclient/RdpState.java | 33 -
.../main/java/rdpclient/ServerBitmapUpdate.java | 200 -
.../java/rdpclient/ServerChannel1003Router.java | 533 -
.../rdpclient/ServerControlPDUCooperate.java | 117 -
.../ServerControlPDUGrantedControl.java | 114 -
.../java/rdpclient/ServerDemandActivePDU.java | 660 --
.../src/main/java/rdpclient/ServerFastPath.java | 258 -
.../ServerLicenseErrorPDUValidClient.java | 121 -
.../ServerMCSAttachUserConfirmPDU.java | 134 -
.../ServerMCSChannelJoinConfirmPDU.java | 89 -
.../rdpclient/ServerMCSConnectResponse.java | 283 -
.../src/main/java/rdpclient/ServerMCSPDU.java | 149 -
.../java/rdpclient/ServerPacketSniffer.java | 50 -
.../java/rdpclient/ServerPaletteUpdate.java | 77 -
.../java/rdpclient/ServerSynchronizePDU.java | 115 -
.../src/main/java/rdpclient/ServerTpkt.java | 70 -
.../ServerX224ConnectionConfirmPDU.java | 237 -
.../main/java/rdpclient/ServerX224DataPdu.java | 64 -
.../rdpclient/TrustAllX509TrustManager.java | 40 -
.../main/java/rdpclient/UpgradeSocketToSSL.java | 44 -
.../adapter/AwtRdpKeyboardAdapter.java | 350 +
.../rdpclient/adapter/AwtRdpMouseAdapter.java | 179 +
.../rdpclient/clip/ClipboardDataFormat.java | 143 +
.../java/rdpclient/clip/ClipboardState.java | 70 +
.../clip/ServerClipRdrChannelRouter.java | 193 +
.../clip/ServerClipboardCapabilitiesPDU.java | 180 +
.../clip/ServerFormatDataResponsePDU.java | 97 +
.../rdpclient/clip/ServerFormatListPDU.java | 237 +
.../rdpclient/clip/ServerMonitorReadyPDU.java | 85 +
.../rdpclient/debug/ClientPacketSniffer.java | 51 +
.../java/rdpclient/debug/PacketSniffer.java | 75 +
.../rdpclient/debug/ServerPacketSniffer.java | 49 +
.../hyperv/ClientPreConnectionBlob.java | 121 +
.../ntlmssp/ClientNtlmsspNegotiate.java | 177 +
.../ntlmssp/ClientNtlmsspPubKeyAuth.java | 680 ++
.../ntlmssp/ClientNtlmsspUserCredentials.java | 128 +
.../java/rdpclient/ntlmssp/CryptoAlgos.java | 361 +
.../main/java/rdpclient/ntlmssp/NegoFlags.java | 492 +
.../java/rdpclient/ntlmssp/NtlmCompute.java | 24 +
.../java/rdpclient/ntlmssp/NtlmConstants.java | 157 +
.../main/java/rdpclient/ntlmssp/NtlmState.java | 887 ++
.../main/java/rdpclient/ntlmssp/SecBuffer.java | 21 +
.../ntlmssp/ServerNtlmsspChallenge.java | 293 +
.../ntlmssp/ServerNtlmsspPubKeyPlus1.java | 125 +
.../ntlmssp/asn1/AlgorithmIdentifier.java | 40 +
.../java/rdpclient/ntlmssp/asn1/NegoData.java | 64 +
.../java/rdpclient/ntlmssp/asn1/NegoItem.java | 73 +
.../ntlmssp/asn1/SubjectPublicKeyInfo.java | 35 +
.../rdpclient/ntlmssp/asn1/TSCredentials.java | 62 +
.../rdpclient/ntlmssp/asn1/TSCspDataDetail.java | 98 +
.../rdpclient/ntlmssp/asn1/TSPasswordCreds.java | 76 +
.../java/rdpclient/ntlmssp/asn1/TSRequest.java | 201 +
.../ntlmssp/asn1/TSSmartCardCreds.java | 90 +
.../java/rdpclient/ntlmssp/package-info.java | 71 +
.../rdpclient/rdp/ClientConfirmActivePDU.java | 1131 +++
.../java/rdpclient/rdp/ClientFastPathPDU.java | 55 +
.../main/java/rdpclient/rdp/ClientInfoPDU.java | 456 +
.../rdp/ClientMCSAttachUserRequest.java | 103 +
...lJoinRequestServerMCSChannelConfirmPDUs.java | 223 +
.../rdpclient/rdp/ClientMCSConnectInitial.java | 696 ++
.../rdp/ClientMCSErectDomainRequest.java | 189 +
.../rdpclient/rdp/ClientSynchronizePDU.java | 248 +
.../src/main/java/rdpclient/rdp/ClientTpkt.java | 54 +
.../rdp/ClientX224ConnectionRequestPDU.java | 162 +
.../java/rdpclient/rdp/ClientX224DataPDU.java | 52 +
.../rdpclient/rdp/RLEBitmapDecompression.java | 1014 ++
.../main/java/rdpclient/rdp/RdpConstants.java | 91 +
.../src/main/java/rdpclient/rdp/RdpState.java | 33 +
.../java/rdpclient/rdp/ServerBitmapUpdate.java | 199 +
.../rdp/ServerControlPDUCooperate.java | 117 +
.../rdp/ServerControlPDUGrantedControl.java | 114 +
.../rdpclient/rdp/ServerDemandActivePDU.java | 660 ++
.../main/java/rdpclient/rdp/ServerFastPath.java | 315 +
.../rdpclient/rdp/ServerIOChannelRouter.java | 534 +
.../rdp/ServerLicenseErrorPDUValidClient.java | 121 +
.../rdp/ServerMCSAttachUserConfirmPDU.java | 116 +
.../rdp/ServerMCSChannelJoinConfirmPDU.java | 89 +
.../rdpclient/rdp/ServerMCSConnectResponse.java | 283 +
.../main/java/rdpclient/rdp/ServerMCSPDU.java | 149 +
.../java/rdpclient/rdp/ServerPaletteUpdate.java | 77 +
.../rdpclient/rdp/ServerSynchronizePDU.java | 115 +
.../src/main/java/rdpclient/rdp/ServerTpkt.java | 70 +
.../rdp/ServerX224ConnectionConfirmPDU.java | 234 +
.../java/rdpclient/rdp/ServerX224DataPdu.java | 64 +
.../main/java/streamer/AssertingByteBuffer.java | 107 -
.../src/main/java/streamer/BaseElement.java | 98 +-
.../src/main/java/streamer/BufferPool.java | 0
.../src/main/java/streamer/ByteBuffer.java | 466 +-
.../src/main/java/streamer/DataSink.java | 0
.../src/main/java/streamer/DataSource.java | 0
.../src/main/java/streamer/Direction.java | 0
.../src/main/java/streamer/Element.java | 2 +-
.../src/main/java/streamer/Event.java | 3 +-
.../src/main/java/streamer/FakeSink.java | 69 -
.../src/main/java/streamer/FakeSource.java | 125 -
.../main/java/streamer/InputStreamSource.java | 36 +-
.../rdpconsole/src/main/java/streamer/Link.java | 0
.../src/main/java/streamer/MockSink.java | 113 -
.../src/main/java/streamer/MockSource.java | 89 -
.../src/main/java/streamer/OneTimeSwitch.java | 3 +
.../src/main/java/streamer/Order.java | 0
.../main/java/streamer/OutputStreamSink.java | 42 +-
.../src/main/java/streamer/Pipeline.java | 2 +
.../src/main/java/streamer/PipelineImpl.java | 77 +-
.../src/main/java/streamer/Queue.java | 28 +-
.../src/main/java/streamer/SocketWrapper.java | 216 +-
.../main/java/streamer/SocketWrapperImpl.java | 249 +
.../src/main/java/streamer/SyncLink.java | 123 +-
.../main/java/streamer/apr/AprSocketSink.java | 129 +
.../main/java/streamer/apr/AprSocketSource.java | 171 +
.../java/streamer/apr/AprSocketWrapperImpl.java | 281 +
.../java/streamer/bco/BcoSocketWrapperImpl.java | 119 +
.../streamer/debug/AssertingByteBuffer.java | 109 +
.../src/main/java/streamer/debug/Dumper.java | 28 +
.../src/main/java/streamer/debug/FakeSink.java | 77 +
.../main/java/streamer/debug/FakeSource.java | 138 +
.../main/java/streamer/debug/MockServer.java | 203 +
.../src/main/java/streamer/debug/MockSink.java | 154 +
.../main/java/streamer/debug/MockSource.java | 95 +
.../src/main/java/streamer/ssl/SSLState.java | 26 +
.../streamer/ssl/TrustAllX509TrustManager.java | 52 +
.../java/streamer/ssl/UpgradeSocketToSSL.java | 44 +
.../vncclient/AwtKeyboardEventToVncAdapter.java | 368 -
.../vncclient/AwtMouseEventToVncAdapter.java | 72 -
.../main/java/vncclient/EncodingsMessage.java | 63 -
.../vncclient/FrameBufferUpdateRequest.java | 126 -
.../vncclient/RGB888LE32PixelFormatRequest.java | 89 -
.../src/main/java/vncclient/RfbConstants.java | 85 -
.../src/main/java/vncclient/VncClient.java | 58 +-
.../src/main/java/vncclient/VncInitializer.java | 245 -
.../main/java/vncclient/VncMessageHandler.java | 420 -
.../java/vncclient/Vnc_3_3_Authentication.java | 292 -
.../src/main/java/vncclient/Vnc_3_3_Hello.java | 116 -
.../adapter/AwtVncKeyboardAdapter.java | 369 +
.../vncclient/adapter/AwtVncMouseAdapter.java | 71 +
.../java/vncclient/vnc/EncodingsMessage.java | 63 +
.../vncclient/vnc/FrameBufferUpdateRequest.java | 126 +
.../vnc/RGB888LE32PixelFormatRequest.java | 89 +
.../main/java/vncclient/vnc/RfbConstants.java | 85 +
.../java/vncclient/vnc/Vnc33Authentication.java | 292 +
.../src/main/java/vncclient/vnc/Vnc33Hello.java | 116 +
.../main/java/vncclient/vnc/VncInitializer.java | 245 +
.../java/vncclient/vnc/VncMessageHandler.java | 420 +
.../src/main/resources/jaas_ntlm_config.txt | 21 +
.../rdpconsole/src/test/doc/README.txt | 2 +
.../rdpconsole/src/test/doc/dev-rdp-config.bat | 13 +
.../src/test/doc/freerdp-debug-log.txt | 772 ++
.../rdpconsole/src/test/doc/rdp.pfx | Bin 0 -> 2572 bytes
.../src/test/java/rdpclient/MockServerTest.java | 9 +-
services/console-proxy/server/pom.xml | 5 +
.../com/cloud/consoleproxy/ConsoleProxy.java | 21 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 8 +
.../consoleproxy/ConsoleProxyClientBase.java | 6 +-
.../consoleproxy/ConsoleProxyClientParam.java | 40 +-
.../ConsoleProxyHttpHandlerHelper.java | 37 +-
.../consoleproxy/ConsoleProxyRdpClient.java | 322 +
.../cloud/consoleproxy/rdp/KeysymToKeycode.java | 138 +
.../rdp/RdpBufferedImageCanvas.java | 103 +
.../consoleproxy/vnc/VncScreenDescription.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 46 +-
.../storage/template/DownloadManagerImpl.java | 13 +-
setup/bindir/cloud-setup-databases.in | 7 +-
setup/db/db/schema-410to420.sql | 19 -
setup/db/db/schema-420to421.sql | 25 +-
setup/db/db/schema-421to430.sql | 330 +-
setup/db/db/schema-430to440.sql | 243 +
setup/db/templates.simulator.sql | 8 +-
setup/db/templates.sql | 9 +-
systemvm/js/ajaxviewer.js | 10 +-
.../debian/config/etc/init.d/cloud-early-config | 22 +-
.../config/opt/cloud/bin/bumpup_priority.sh | 19 +
.../config/opt/cloud/bin/createIpAlias.sh | 100 +
.../config/opt/cloud/bin/deleteIpAlias.sh | 60 +
.../debian/config/opt/cloud/bin/dnsmasq.sh | 130 +
.../debian/config/opt/cloud/bin/edithosts.sh | 234 +
.../config/opt/cloud/bin/firewall_egress.sh | 187 +
.../config/opt/cloud/bin/firewall_ingress.sh | 202 +
.../debian/config/opt/cloud/bin/firewall_nat.sh | 358 +
.../debian/config/opt/cloud/bin/ipassoc.sh | 3 +-
.../debian/config/opt/cloud/bin/loadbalancer.sh | 320 +
.../debian/config/root/bumpup_priority.sh | 19 -
.../patches/debian/config/root/createIpAlias.sh | 100 -
.../patches/debian/config/root/deleteIpAlias.sh | 60 -
systemvm/patches/debian/config/root/dnsmasq.sh | 130 -
.../patches/debian/config/root/edithosts.sh | 234 -
systemvm/patches/debian/config/root/firewall.sh | 357 -
.../debian/config/root/firewallRule_egress.sh | 187 -
.../patches/debian/config/root/firewall_rule.sh | 202 -
.../patches/debian/config/root/loadbalancer.sh | 320 -
systemvm/patches/debian/config/root/userdata.py | 92 -
systemvm/patches/debian/config/root/userdata.sh | 165 -
systemvm/pom.xml | 3 -
systemvm/scripts/ssvm-check.sh | 20 +-
.../component/test_add_remove_network.py | 6 +-
.../component/test_advancedsg_networks.py | 3785 +++++--
test/integration/component/test_assign_vm.py | 2 +-
.../component/test_base_image_updation.py | 6 +-
test/integration/component/test_blocker_bugs.py | 4 +-
.../component/test_cpu_domain_limits.py | 2 +-
test/integration/component/test_cpu_limits.py | 2 +-
.../component/test_cpu_max_limits.py | 4 +-
.../component/test_cpu_project_limits.py | 2 +-
.../component/test_egress_fw_rules.py | 203 +-
test/integration/component/test_egress_rules.py | 114 +-
test/integration/component/test_haproxy.py | 6 +-
test/integration/component/test_ldap.py | 9 -
.../integration/component/test_memory_limits.py | 4 +-
.../component/test_mm_domain_limits.py | 2 +-
.../integration/component/test_mm_max_limits.py | 4 +-
.../component/test_mm_project_limits.py | 2 +-
.../component/test_non_contiguous_vlan.py | 199 +-
.../component/test_project_resources.py | 16 +-
.../component/test_reset_ssh_keypair.py | 2 +-
.../component/test_resource_limits.py | 89 +-
test/integration/component/test_routers.py | 25 +-
test/integration/component/test_snapshots.py | 5 +-
.../component/test_snapshots_improvement.py | 7 +-
test/integration/component/test_templates.py | 5 +-
test/integration/component/test_vmware_drs.py | 2 +-
test/integration/component/test_vpc_network.py | 162 +-
.../component/test_vpc_network_lbrules.py | 5 +-
.../component/test_vpc_network_pfrules.py | 33 +-
.../component/test_vpc_network_staticnatrule.py | 35 +-
.../integration/component/test_vpc_offerings.py | 12 +-
.../component/test_vpc_vm_life_cycle.py | 104 +-
test/integration/component/test_vpn_users.py | 4 +-
.../smoke/test_deploy_vm_with_userdata.py | 7 +-
...deploy_vms_with_varied_deploymentplanners.py | 4 +-
test/integration/smoke/test_guest_vlan_range.py | 53 +-
.../integration/smoke/test_service_offerings.py | 19 +-
test/integration/smoke/test_volumes.py | 4 +
.../cloud/test/longrun/BuildGuestNetwork.java | 10 +-
.../com/cloud/test/longrun/GuestNetwork.java | 107 +
.../cloud/test/longrun/PerformanceWithAPI.java | 36 +-
.../com/cloud/test/longrun/guestNetwork.java | 107 -
.../com/cloud/test/regression/ApiCommand.java | 4 +-
.../cloud/test/regression/TestCaseEngine.java | 110 +-
.../test/stress/StressTestDirectAttach.java | 156 +-
.../cloud/test/stress/TestClientWithAPI.java | 362 +-
test/src/com/cloud/test/stress/WgetTest.java | 2 +-
test/src/com/cloud/test/utils/ConsoleProxy.java | 4 +-
tools/apidoc/XmlToHtmlConverter.java | 117 +-
tools/apidoc/gen_toc.py | 2 +-
tools/appliance/build.sh | 14 +-
tools/appliance/convert/Convert.class | Bin 0 -> 984 bytes
tools/appliance/convert/Convert.java | 36 +
tools/appliance/convert_ovf_vbox_to_esx.xslt | 42 +
.../systemvm64template/postinstall.sh | 12 +-
.../definitions/systemvmtemplate/postinstall.sh | 3 +
tools/build/build_asf.sh | 9 +-
tools/checkstyle/pom.xml | 43 +
.../src/main/resources/cloud-style.xml | 55 +
tools/marvin/marvin/cloudstackConnection.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 8 +-
tools/marvin/marvin/config/config.cfg | 159 +
tools/marvin/marvin/configGenerator.py | 5 +-
tools/marvin/marvin/deployDataCenter.py | 4 +-
tools/marvin/marvin/integration/lib/base.py | 2 +
tools/marvin/marvin/integration/lib/common.py | 193 +-
tools/marvin/marvin/integration/lib/utils.py | 56 +-
tools/marvin/marvin/marvinInit.py | 8 +-
tools/marvin/marvin/marvinPlugin.py | 21 +-
tools/marvin/marvin/misc/build/CI.md | 18 +
tools/marvin/marvin/misc/build/README.md | 18 +
tools/marvin/marvin/misc/build/advanced_env.py | 7 +-
tools/marvin/marvin/misc/build/asf_test.cfg | 18 +
tools/marvin/marvin/misc/build/bashUtils.py | 18 +
.../marvin/marvin/misc/build/buildGenerator.py | 18 +
tools/marvin/marvin/misc/build/configure.py | 17 +
tools/marvin/marvin/misc/build/hudson.sh | 17 +
tools/marvin/marvin/misc/build/kvm.cfg | 20 +-
tools/marvin/marvin/misc/build/openport.py | 18 +
tools/marvin/marvin/misc/build/redeploy.sh | 19 +
tools/marvin/marvin/misc/build/restartMgmt.py | 17 +
.../marvin/marvin/misc/build/system.properties | 19 +-
.../marvin/misc/build/testSetupSuccess.py | 17 +
tools/marvin/marvin/misc/build/vm-start.sh | 18 +
tools/marvin/marvin/misc/build/vm-uninstall.sh | 17 +
tools/marvin/marvin/misc/build/xen.cfg | 20 +-
tools/marvin/marvin/misc/build/xunitmp/setup.py | 9 +-
.../misc/build/xunitmp/xunitmultiprocess.py | 16 +
tools/marvin/pom.xml | 14 +-
tools/transifex/.tx/config | 4 +-
tools/transifex/sync-transifex-ui.sh | 2 +-
ui/css/cloudstack3.css | 90 +-
ui/dictionary.jsp | 20 +
ui/images/infrastructure-icons.png | Bin 40266 -> 62059 bytes
ui/index.jsp | 10 +-
ui/scripts/accounts.js | 44 +-
ui/scripts/accountsWizard.js | 2 +-
ui/scripts/affinity.js | 3 +-
ui/scripts/configuration.js | 6 +-
ui/scripts/events.js | 3 +-
ui/scripts/globalSettings.js | 33 +-
ui/scripts/instanceWizard.js | 6 +-
ui/scripts/instances.js | 42 +-
ui/scripts/network.js | 129 +-
ui/scripts/plugins.js | 49 +-
ui/scripts/sharedFunctions.js | 24 +-
ui/scripts/storage.js | 66 +-
ui/scripts/system.js | 9454 +++++++++---------
ui/scripts/templates.js | 56 +-
ui/scripts/ui-custom/accountsWizard.js | 12 +-
ui/scripts/ui-custom/zoneWizard.js | 8 +-
ui/scripts/ui/widgets/cloudBrowser.js | 11 +-
ui/scripts/ui/widgets/detailView.js | 23 +-
ui/scripts/ui/widgets/listView.js | 10 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +
ui/scripts/ui/widgets/tagger.js | 6 +-
ui/scripts/vpc.js | 10 +-
ui/scripts/zoneWizard.js | 8 +-
ui/tests/index.html | 71 +-
ui/tests/test.cloudBrowser.js | 116 -
ui/tests/test.core.js | 79 -
ui/tests/test.detailView.js | 799 --
ui/tests/test.listView.js | 527 -
ui/tests/test.multiEdit.js | 55 -
ui/tests/test.notifications.js | 107 -
ui/tests/test.widget.listView.js | 245 +
usage/pom.xml | 58 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 6 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 490 +-
.../src/com/cloud/usage/UsageSanityChecker.java | 356 +-
.../usage/parser/IPAddressUsageParser.java | 34 +-
.../usage/parser/LoadBalancerUsageParser.java | 12 +-
.../parser/NetworkOfferingUsageParser.java | 20 +-
.../cloud/usage/parser/NetworkUsageParser.java | 14 +-
.../usage/parser/PortForwardingUsageParser.java | 12 +-
.../usage/parser/SecurityGroupUsageParser.java | 12 +-
.../cloud/usage/parser/StorageUsageParser.java | 12 +-
.../usage/parser/VMInstanceUsageParser.java | 12 +-
.../usage/parser/VMSnapshotUsageParser.java | 18 +-
.../cloud/usage/parser/VPNUserUsageParser.java | 12 +-
.../cloud/usage/parser/VmDiskUsageParser.java | 14 +-
.../cloud/usage/parser/VolumeUsageParser.java | 12 +-
.../usage/UsageManagerTestConfiguration.java | 12 +-
.../com/cloud/usage/UsageSanityCheckerIT.java | 159 +
.../com/cloud/usage/UsageSanityCheckerTest.java | 68 +
.../test/resources/UsageManagerTestContext.xml | 20 +-
usage/test/resources/cloud1.xml | 24 +
usage/test/resources/cloud2.xml | 24 +
usage/test/resources/cloud3.xml | 13 +
usage/test/resources/cloud_usage1.xml | 26 +
usage/test/resources/cloud_usage2.xml | 43 +
usage/test/resources/cloud_usage3.xml | 13 +
utils/src/com/cloud/utils/DateUtil.java | 6 +-
utils/src/com/cloud/utils/ExecutionResult.java | 44 +
utils/src/com/cloud/utils/StringUtils.java | 16 +-
utils/src/com/cloud/utils/SwiftUtil.java | 2 +-
utils/src/com/cloud/utils/UriUtils.java | 2 +
utils/src/com/cloud/utils/events/EventArgs.java | 2 +-
.../utils/exception/CloudRuntimeException.java | 49 +-
.../utils/exception/ExceptionProxyObject.java | 14 +-
utils/src/com/cloud/utils/net/NetUtils.java | 65 +-
utils/src/com/cloud/utils/nio/Link.java | 21 +-
.../cloud/utils/script/OutputInterpreter.java | 4 +-
utils/src/com/cloud/utils/script/Script.java | 15 +-
.../cloud/utils/security/CertificateHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 14 +-
utils/src/com/cloud/utils/ssh/SshException.java | 27 +
utils/src/com/cloud/utils/ssh/SshHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/sshException.java | 27 -
.../utils/identity/ManagementServerNode.java | 2 +-
.../test/com/cloud/utils/net/NetUtilsTest.java | 10 +
.../cloud/hypervisor/vmware/mo/ClusterMO.java | 33 +-
.../vmware/mo/CustomFieldsManagerMO.java | 2 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 9 +-
.../vmware/mo/DistributedVirtualSwitchMO.java | 3 +-
.../vmware/mo/HostDatastoreSystemMO.java | 2 +-
.../vmware/mo/HostFirewallSystemMO.java | 1 +
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 62 +-
.../vmware/mo/HostNetworkSystemMO.java | 1 +
.../vmware/mo/HypervisorHostHelper.java | 54 +-
.../vmware/mo/LicenseAssignmentManagerMO.java | 4 +-
.../hypervisor/vmware/mo/LicenseManagerMO.java | 1 +
.../cloud/hypervisor/vmware/mo/NetworkMO.java | 2 +-
.../hypervisor/vmware/mo/PerfManagerMO.java | 6 +-
.../vmware/mo/VirtualDiskManagerMO.java | 3 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 109 +-
.../vmware/mo/VmwareHypervisorHost.java | 2 +
.../hypervisor/vmware/util/VmwareClient.java | 75 +-
.../hypervisor/vmware/util/VmwareContext.java | 48 +-
.../vmware/util/VmwareContextPool.java | 35 -
.../vmware/util/VmwareGuestOsMapper.java | 4 +
.../hypervisor/vmware/util/VmwareHelper.java | 87 +-
1451 files changed, 87702 insertions(+), 55843 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --cc client/WEB-INF/classes/resources/messages.properties
index df09cf2,f1c166b..54721cd
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@@ -14,13 -14,24 +14,28 @@@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+message.select.compute.offering=Please select a compute offering to associate with this instance.
+message.select.disk.offering=(Optional) Select an additional disk offering to attach to this instance.
+label.home=Home
+label.use.default.language=Use default language
+ label.port=Port
+ label.remove.ldap=Remove LDAP
+ message.remove.ldap=Are you sure you want to delete the LDAP configuration?
+ label.configure.ldap=Configure LDAP
+ message.configure.ldap=Please confirm you would like to configure LDAP.
+ label.ldap.configuration=LDAP Configuration
+ label.ldap.port=LDAP port
+ label.create.nfs.secondary.staging.store=Create NFS secondary staging store
+ label.volatile=Volatile
+ label.planner.mode=Planner mode
+ label.deployment.planner=Deployment planner
+ label.quiesce.vm=Quiesce VM
+ label.smb.username=SMB Username
+ label.smb.password=SMB Password
+ label.smb.domain=SMB Domain
label.hypervisors=Hypervisors
label.home=Home
- label.sockets=Sockets
+ label.sockets=CPU Sockets
label.root.disk.size=Root disk size
label.s3.nfs.server=S3 NFS Server
label.s3.nfs.path=S3 NFS Path
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849d601c/ui/dictionary.jsp
----------------------------------------------------------------------
diff --cc ui/dictionary.jsp
index 501bb71,16ecbab..33f0fd7
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@@ -25,10 -25,21 +25,25 @@@ under the License
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
dictionary = {
+'message.select.compute.offering': '<fmt:message key="message.select.compute.offering" />',
+'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
+'label.home': '<fmt:message key="label.home" />',
+'label.use.default.language': '<fmt:message key="label.use.default.language" />',
+ 'label.port': '<fmt:message key="label.port" />',
+ 'label.remove.ldap': '<fmt:message key="label.remove.ldap" />',
+ 'message.remove.ldap': '<fmt:message key="message.remove.ldap" />',
+ 'message.configure.ldap': '<fmt:message key="message.configure.ldap" />',
+ 'label.configure.ldap': '<fmt:message key="label.configure.ldap" />',
+ 'label.ldap.port': '<fmt:message key="label.ldap.port" />',
+ 'label.ldap.configuration': '<fmt:message key="label.ldap.configuration" />',
+ 'label.create.nfs.secondary.staging.store': '<fmt:message key="label.create.nfs.secondary.staging.store" />',
+ 'label.volatile': '<fmt:message key="label.volatile" />',
+ 'label.planner.mode': '<fmt:message key="label.planner.mode" />',
+ 'label.deployment.planner': '<fmt:message key="label.deployment.planner" />',
+ 'label.quiesce.vm': '<fmt:message key="label.quiesce.vm" />',
+ 'label.smb.username': '<fmt:message key="label.smb.username" />',
+ 'label.smb.password': '<fmt:message key="label.smb.password" />',
+ 'label.smb.domain': '<fmt:message key="label.smb.domain" />',
'label.hypervisors': '<fmt:message key="label.hypervisors" />',
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',
[04/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Findbugs finding : Incorrect use of equality
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bd38eb1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bd38eb1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bd38eb1
Branch: refs/heads/ui-restyle
Commit: 3bd38eb17e4b51bd57e3db2d204105387bfdc7a8
Parents: cc98125
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jan 24 11:58:53 2014 +0000
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jan 28 08:58:28 2014 +0000
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bd38eb1/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 3cd7a9f..e6ecbc9 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -166,7 +166,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer
_clusterDetailsDao.persist(clusterId, clusterDetails);
}
String updatedInventoryPath = validateCluster(url, vmwareDc);
- if (url.getPath() != updatedInventoryPath) {
+ if (!url.getPath().equals(updatedInventoryPath)) {
// If url from API doesn't specify DC then update url in database with DC associated with this zone.
clusterDetails.put("url", url.getScheme() + "://" + url.getHost() + updatedInventoryPath);
_clusterDetailsDao.persist(clusterId, clusterDetails);
[45/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Resource metadata support for autoscaleVmProfile CS object
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fdb25d6f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fdb25d6f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fdb25d6f
Branch: refs/heads/ui-restyle
Commit: fdb25d6f5bbd36051b54ce866d8710456a93c1a1
Parents: 3b781d1
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Jan 29 13:11:29 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Jan 29 14:57:00 2014 -0800
----------------------------------------------------------------------
api/src/com/cloud/server/ResourceTag.java | 3 +-
.../autoscale/ListAutoScaleVmProfilesCmd.java | 11 ++-
.../spring-engine-schema-core-daos-context.xml | 29 +++----
.../AutoScaleVmProfileDetailVO.java | 81 ++++++++++++++++++++
.../dao/AutoScaleVmProfileDetailsDao.java | 26 +++++++
.../dao/AutoScaleVmProfileDetailsDaoImpl.java | 33 ++++++++
.../cloud/network/as/AutoScaleManagerImpl.java | 7 ++
.../cloud/tags/TaggedResourceManagerImpl.java | 5 +-
setup/db/db/schema-430to440.sql | 10 +++
9 files changed, 186 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index 41931f0..a08c3e4 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -51,7 +51,8 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
CustomerGateway(false, true),
VpnConnection(false, true),
User(true, true),
- DiskOffering(false, true);
+ DiskOffering(false, true),
+ AutoScaleVmProfile(false, true);
ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {
this.resourceTagsSupport = resourceTagsSupport;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
index 651f987..34c2543 100644
--- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
@@ -19,15 +19,15 @@ package org.apache.cloudstack.api.command.user.autoscale;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
+import org.apache.log4j.Logger;
import com.cloud.network.as.AutoScaleVmProfile;
@@ -47,6 +47,9 @@ public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourc
@Parameter(name = ApiConstants.TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "the templateid of the autoscale vm profile")
private Long templateId;
+ @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class, description = "list profiles by service offering id")
+ private Long serviceOffId;
+
@Parameter(name = ApiConstants.OTHER_DEPLOY_PARAMS, type = CommandType.STRING, description = "the otherdeployparameters of the autoscale vm profile")
private String otherDeployParams;
@@ -66,6 +69,10 @@ public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourc
return otherDeployParams;
}
+ public Long getServiceOfferingId() {
+ return serviceOffId;
+ }
+
// ///////////////////////////////////////////////////
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
----------------------------------------------------------------------
diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 1a400e0..d1a68ed 100644
--- a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -36,7 +36,7 @@
<entry key="cache.size" value="50" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="diskOfferingDaoImpl" class="com.cloud.storage.dao.DiskOfferingDaoImpl">
@@ -45,7 +45,7 @@
<entry key="cache.size" value="50" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="dataCenterDaoImpl" class="com.cloud.dc.dao.DataCenterDaoImpl">
@@ -54,7 +54,7 @@
<entry key="cache.size" value="50" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="hostPodDaoImpl" class="com.cloud.dc.dao.HostPodDaoImpl">
@@ -63,7 +63,7 @@
<entry key="cache.size" value="50" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="vlanDaoImpl" class="com.cloud.dc.dao.VlanDaoImpl">
@@ -72,7 +72,7 @@
<entry key="cache.size" value="30" />
<entry key="cache.time.to.live" value="3600" />
</map>
- </property>
+ </property>
</bean>
<bean id="userDaoImpl" class="com.cloud.user.dao.UserDaoImpl">
@@ -81,7 +81,7 @@
<entry key="cache.size" value="5000" />
<entry key="cache.time.to.live" value="300" />
</map>
- </property>
+ </property>
</bean>
<bean id="VMTemplateDaoImpl" class="com.cloud.storage.dao.VMTemplateDaoImpl">
@@ -90,7 +90,7 @@
<entry key="cache.size" value="100" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="hypervisorCapabilitiesDaoImpl" class="com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl">
@@ -99,7 +99,7 @@
<entry key="cache.size" value="100" />
<entry key="cache.time.to.live" value="600" />
</map>
- </property>
+ </property>
</bean>
<bean id="dedicatedResourceDaoImpl" class="com.cloud.dc.dao.DedicatedResourceDaoImpl">
<property name="configParams">
@@ -109,7 +109,7 @@
</map>
</property>
</bean>
-
+
<!--
DAOs with default configuration
-->
@@ -172,12 +172,12 @@
<bean id="hostTransferMapDaoImpl" class="com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl" />
<bean id="iPAddressDaoImpl" class="com.cloud.network.dao.IPAddressDaoImpl" />
<bean id="imageStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl" />
- <bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.image.db.ImageStoreDetailsDaoImpl" />
- <bean id="imageStoreJoinDaoImpl" class="com.cloud.api.query.dao.ImageStoreJoinDaoImpl" />
- <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.SnapshotDataStoreDaoImpl" />
- <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
+ <bean id="imageStoreDetailsDaoImpl" class="org.apache.cloudstack.storage.image.db.ImageStoreDetailsDaoImpl" />
+ <bean id="imageStoreJoinDaoImpl" class="com.cloud.api.query.dao.ImageStoreJoinDaoImpl" />
+ <bean id="snapshotDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.SnapshotDataStoreDaoImpl" />
+ <bean id="templateDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.TemplateDataStoreDaoImpl" />
<bean id="templateJoinDaoImpl" class="com.cloud.api.query.dao.TemplateJoinDaoImpl" />
- <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />
+ <bean id="volumeDataStoreDaoImpl" class="org.apache.cloudstack.storage.image.db.VolumeDataStoreDaoImpl" />
<bean id="inlineLoadBalancerNicMapDaoImpl" class="com.cloud.network.dao.InlineLoadBalancerNicMapDaoImpl" />
<bean id="instanceGroupDaoImpl" class="com.cloud.vm.dao.InstanceGroupDaoImpl" />
<bean id="instanceGroupJoinDaoImpl" class="com.cloud.api.query.dao.InstanceGroupJoinDaoImpl" />
@@ -331,6 +331,7 @@
<bean id="Site2SiteVpnConnectionDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.Site2SiteVpnConnectionDetailsDaoImpl" />
<bean id="DiskOfferingDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDaoImpl" />
<bean id="UserDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.UserDetailsDaoImpl" />
+ <bean id="AutoScaleVmProfileDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.AutoScaleVmProfileDetailsDaoImpl" />
<bean id="databaseIntegrityChecker" class="com.cloud.upgrade.DatabaseIntegrityChecker" />
</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java
new file mode 100644
index 0000000..06d7296
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/AutoScaleVmProfileDetailVO.java
@@ -0,0 +1,81 @@
+// 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 org.apache.cloudstack.resourcedetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+@Entity
+@Table(name = "autoscale_vmprofile_details")
+public class AutoScaleVmProfileDetailVO implements ResourceDetail {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "autoscale_vmprofile_id")
+ private long resourceId;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "value", length = 1024)
+ private String value;
+
+ @Column(name = "display")
+ private boolean display;
+
+ public AutoScaleVmProfileDetailVO() {
+ }
+
+ public AutoScaleVmProfileDetailVO(long id, String name, String value) {
+ this.resourceId = id;
+ this.name = name;
+ this.value = value;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ @Override
+ public long getResourceId() {
+ return resourceId;
+ }
+
+ @Override
+ public boolean isDisplay() {
+ return display;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java
new file mode 100644
index 0000000..9da313a
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDao.java
@@ -0,0 +1,26 @@
+// 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 org.apache.cloudstack.resourcedetail.dao;
+
+import org.apache.cloudstack.resourcedetail.AutoScaleVmProfileDetailVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface AutoScaleVmProfileDetailsDao extends GenericDao<AutoScaleVmProfileDetailVO, Long>, ResourceDetailsDao<AutoScaleVmProfileDetailVO> {
+
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java
new file mode 100644
index 0000000..17e0316
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/AutoScaleVmProfileDetailsDaoImpl.java
@@ -0,0 +1,33 @@
+// 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 org.apache.cloudstack.resourcedetail.dao;
+
+import javax.ejb.Local;
+
+import org.apache.cloudstack.resourcedetail.AutoScaleVmProfileDetailVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+import org.springframework.stereotype.Component;
+
+@Component
+@Local(value = {AutoScaleVmProfileDetailsDao.class})
+public class AutoScaleVmProfileDetailsDaoImpl extends ResourceDetailsDaoBase<AutoScaleVmProfileDetailVO> implements AutoScaleVmProfileDetailsDao {
+
+ @Override
+ public void addDetail(long resourceId, String key, String value) {
+ super.addDetail(new AutoScaleVmProfileDetailVO(resourceId, key, value));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 0751b69..321c29f 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -437,12 +437,14 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScale
Long id = cmd.getId();
Long templateId = cmd.getTemplateId();
String otherDeployParams = cmd.getOtherDeployParams();
+ Long serviceOffId = cmd.getServiceOfferingId();
SearchWrapper<AutoScaleVmProfileVO> searchWrapper = new SearchWrapper<AutoScaleVmProfileVO>(_autoScaleVmProfileDao, AutoScaleVmProfileVO.class, cmd, cmd.getId());
SearchBuilder<AutoScaleVmProfileVO> sb = searchWrapper.getSearchBuilder();
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("templateId", sb.entity().getTemplateId(), SearchCriteria.Op.EQ);
+ sb.and("serviceOfferingId", sb.entity().getServiceOfferingId(), SearchCriteria.Op.EQ);
sb.and("otherDeployParams", sb.entity().getOtherDeployParams(), SearchCriteria.Op.LIKE);
SearchCriteria<AutoScaleVmProfileVO> sc = searchWrapper.buildSearchCriteria();
@@ -455,6 +457,11 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScale
if (otherDeployParams != null) {
sc.addAnd("otherDeployParams", SearchCriteria.Op.LIKE, "%" + otherDeployParams + "%");
}
+
+ if (serviceOffId != null) {
+ sc.setParameters("serviceOfferingId", serviceOffId);
+ }
+
return searchWrapper.search();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index be896f0..555a845 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -25,12 +25,11 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.log4j.Logger;
import com.cloud.api.query.dao.ResourceTagJoinDao;
import com.cloud.dc.DataCenterVO;
@@ -40,6 +39,7 @@ import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
+import com.cloud.network.as.AutoScaleVmProfileVO;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.LoadBalancerVO;
import com.cloud.network.dao.NetworkVO;
@@ -116,6 +116,7 @@ public class TaggedResourceManagerImpl extends ManagerBase implements TaggedReso
s_typeMap.put(ResourceObjectType.VpnConnection, Site2SiteVpnConnectionVO.class);
s_typeMap.put(ResourceObjectType.User, UserVO.class);
s_typeMap.put(ResourceObjectType.DiskOffering, DiskOfferingVO.class);
+ s_typeMap.put(ResourceObjectType.AutoScaleVmProfile, AutoScaleVmProfileVO.class);
}
@Inject
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fdb25d6f/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 3fa3402..8c45295 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -447,3 +447,13 @@ CREATE VIEW `cloud`.`user_vm_view` AS
`cloud`.`user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`) and (`custom_ram_size`.`name` = 'memory')));
INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'vm.network.nic.max.secondary.ipaddresses', NULL, 'Specify the number of secondary ip addresses per nic per vm', '256') ON DUPLICATE KEY UPDATE category='NetworkManager';
+
+CREATE TABLE `cloud`.`autoscale_vmprofile_details` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `autoscale_vmprofile_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id',
+ `name` varchar(255) NOT NULL,
+ `value` varchar(1024) NOT NULL,
+ `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed to the end autoscale_vmprofile',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_autoscale_vmprofile_details__autoscale_vmprofile_id` FOREIGN KEY `fk_autoscale_vmprofile_details__autoscale_vmprofile_id`(`autoscale_vmprofile_id`) REFERENCES `autoscale_vmprofiles`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
[18/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
Findbugs: different issues solved(cherry picked from commit
0b13f8e59db1e681e1dff0baa828bb0711842e9f)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fae05560
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fae05560
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fae05560
Branch: refs/heads/ui-restyle
Commit: fae05560218ef3bcb962bd424ae5dbf5cb8ede68
Parents: 0daca84
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jan 28 16:30:04 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Tue Jan 28 16:30:04 2014 +0100
----------------------------------------------------------------------
.../com/cloud/api/query/vo/UserVmJoinVO.java | 23 ++++----
.../com/cloud/consoleproxy/AgentHookBase.java | 5 +-
.../src/com/cloud/dc/DedicatedResourceVO.java | 15 +++--
.../com/cloud/network/IpAddressManagerImpl.java | 60 +++++++++++---------
.../src/com/cloud/network/NetworkModelImpl.java | 7 ++-
.../cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../com/cloud/network/vpc/VpcManagerImpl.java | 4 +-
.../com/cloud/template/TemplateManagerImpl.java | 4 +-
8 files changed, 70 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index 2df49ec..9e4fc21 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -35,6 +35,7 @@ import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.Volume;
import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
@@ -47,10 +48,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private long id;
@Column(name = "name", updatable = false, nullable = false, length = 255)
- private String name = null;
+ private final String name = null;
@Column(name = "display_name", updatable = false, nullable = false, length = 255)
- private String displayName = null;
+ private final String displayName = null;
@Column(name = "account_id")
private long accountId;
@@ -59,7 +60,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String accountUuid;
@Column(name = "account_name")
- private String accountName = null;
+ private final String accountName = null;
@Column(name = "account_type")
private short accountType;
@@ -71,10 +72,10 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String domainUuid;
@Column(name = "domain_name")
- private String domainName = null;
+ private final String domainName = null;
@Column(name = "domain_path")
- private String domainPath = null;
+ private final String domainPath = null;
@Column(name = "instance_group_id")
private long instanceGroupId;
@@ -96,7 +97,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
*/
@Enumerated(value = EnumType.STRING)
@Column(name = "state", updatable = true, nullable = false, length = 32)
- private State state = null;
+ private final State state = null;
@Column(name = GenericDao.CREATED_COLUMN)
private Date created;
@@ -148,7 +149,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String dataCenterUuid;
@Column(name = "data_center_name")
- private String dataCenterName = null;
+ private final String dataCenterName = null;
@Column(name = "security_group_enabled")
private boolean securityGroupEnabled;
@@ -233,7 +234,7 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
private String volumeUuid;
@Column(name = "volume_device_id")
- private Long volumeDeviceId = null;
+ private final Long volumeDeviceId = null;
@Column(name = "volume_type")
@Enumerated(EnumType.STRING)
@@ -745,9 +746,11 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
}
public String getDetail(String name) {
- assert (details != null) : "Did you forget to load the details?";
+ if (details == null) {
+ throw new CloudRuntimeException("No details to get. Did you forget to load the details?");
+ }
- return details != null ? details.get(name) : null;
+ return details.get(name);
}
public String getUserData() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/consoleproxy/AgentHookBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 9dfffd4..2e0bada 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -49,6 +49,7 @@ import com.cloud.host.dao.HostDao;
import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor;
import com.cloud.servlet.ConsoleProxyServlet;
import com.cloud.utils.Ternary;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.VMInstanceDao;
@@ -192,7 +193,9 @@ public abstract class AgentHookBase implements AgentHook {
assert (ksBits != null);
if (ksBits == null) {
- s_logger.error("Could not find and construct a valid SSL certificate");
+ String msg = "Could not find and construct a valid SSL certificate";
+ s_logger.error(msg);
+ throw new CloudRuntimeException(msg);
}
cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
cmd.setEncryptorPassword(getEncryptorPassword());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/dc/DedicatedResourceVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/dc/DedicatedResourceVO.java b/server/src/com/cloud/dc/DedicatedResourceVO.java
index 9948f50..41bdfec 100644
--- a/server/src/com/cloud/dc/DedicatedResourceVO.java
+++ b/server/src/com/cloud/dc/DedicatedResourceVO.java
@@ -29,6 +29,11 @@ import javax.persistence.Table;
@Table(name = "dedicated_resources")
public class DedicatedResourceVO implements DedicatedResources {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6659510127145101917L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -59,7 +64,7 @@ public class DedicatedResourceVO implements DedicatedResources {
private long affinityGroupId;
public DedicatedResourceVO() {
- this.uuid = UUID.randomUUID().toString();
+ uuid = UUID.randomUUID().toString();
}
public DedicatedResourceVO(Long dataCenterId, Long podId, Long clusterId, Long hostId, Long domainId, Long accountId, long affinityGroupId) {
@@ -69,7 +74,7 @@ public class DedicatedResourceVO implements DedicatedResources {
this.hostId = hostId;
this.domainId = domainId;
this.accountId = accountId;
- this.uuid = UUID.randomUUID().toString();
+ uuid = UUID.randomUUID().toString();
this.affinityGroupId = affinityGroupId;
}
@@ -115,7 +120,7 @@ public class DedicatedResourceVO implements DedicatedResources {
}
public DedicatedResourceVO(long dedicatedResourceId) {
- this.id = dedicatedResourceId;
+ id = dedicatedResourceId;
}
@Override
@@ -138,7 +143,7 @@ public class DedicatedResourceVO implements DedicatedResources {
@Override
public String getUuid() {
- return this.uuid;
+ return uuid;
}
public void setUuid(String uuid) {
@@ -153,7 +158,7 @@ public class DedicatedResourceVO implements DedicatedResources {
@Override
public boolean equals(Object obj) {
if (obj instanceof DedicatedResourceVO) {
- return ((DedicatedResourceVO)obj).getId() == this.getId();
+ return ((DedicatedResourceVO)obj).getId() == getId();
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 6596074..09f73a4 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -17,6 +17,7 @@
package com.cloud.network;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,6 +29,8 @@ import java.util.UUID;
import javax.inject.Inject;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.context.CallContext;
@@ -39,7 +42,6 @@ import org.apache.cloudstack.region.PortableIp;
import org.apache.cloudstack.region.PortableIpDao;
import org.apache.cloudstack.region.PortableIpVO;
import org.apache.cloudstack.region.Region;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.alert.AlertManager;
@@ -570,8 +572,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
IPAddressVO ip = markIpAsUnavailable(addrId);
- assert (ip != null) : "Unable to mark the ip address id=" + addrId + " as unavailable.";
if (ip == null) {
+ String msg = "Unable to mark the ip address id=" + addrId + " as unavailable.";
+ s_logger.error(msg);
return true;
}
@@ -684,10 +687,10 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) {
fetchFromDedicatedRange = true;
sc.setParameters("vlanId", dedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + dedicatedVlanDbIds.toArray());
+ errorMessage.append(", vlanId id=" + Arrays.toString(dedicatedVlanDbIds.toArray()));
} else if (nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
+ errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
} else {
if (podId != null) {
InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Insufficient address capacity", Pod.class, podId);
@@ -727,7 +730,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (useSystemIps && nonDedicatedVlanDbIds != null && !nonDedicatedVlanDbIds.isEmpty()) {
fetchFromDedicatedRange = false;
sc.setParameters("vlanId", nonDedicatedVlanDbIds.toArray());
- errorMessage.append(", vlanId id=" + nonDedicatedVlanDbIds.toArray());
+ errorMessage.append(", vlanId id=" + Arrays.toString(nonDedicatedVlanDbIds.toArray()));
addrs = _ipAddressDao.lockRows(sc, filter, true);
}
}
@@ -852,6 +855,11 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
public PublicIp assignDedicateIpAddress(Account owner, final Long guestNtwkId, final Long vpcId, final long dcId, final boolean isSourceNat)
throws ConcurrentOperationException, InsufficientAddressCapacityException {
+ if (owner == null) {
+ s_logger.error("No account to assign an ip to.");
+ return null;
+ }
+
final long ownerId = owner.getId();
PublicIp ip = null;
@@ -883,13 +891,11 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
return ip;
} finally {
- if (owner != null) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Releasing lock account " + ownerId);
- }
-
- _accountDao.releaseFromLockTable(ownerId);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Releasing lock account " + ownerId);
}
+ _accountDao.releaseFromLockTable(ownerId);
+
if (ip == null) {
s_logger.error("Unable to get source nat ip address for account " + ownerId);
}
@@ -1218,7 +1224,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
s_logger.debug("Associating ip " + ipToAssoc + " to network " + network);
- IPAddressVO ip = _ipAddressDao.findById(ipId);
+ IPAddressVO ip = ipToAssoc; //_ipAddressDao.findById(ipId);
//update ip address with networkId
ip.setAssociatedWithNetworkId(networkId);
ip.setSourceNat(isSourceNat);
@@ -1235,18 +1241,16 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
return ip;
} finally {
if (!success && releaseOnFailure) {
- if (ip != null) {
- try {
- s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
- _ipAddressDao.markAsUnavailable(ip.getId());
- if (!applyIpAssociations(network, true)) {
- // if fail to apply ip assciations again, unassign ip address without updating resource
- // count and generating usage event as there is no need to keep it in the db
- _ipAddressDao.unassignIpAddress(ip.getId());
- }
- } catch (Exception e) {
- s_logger.warn("Unable to disassociate ip address for recovery", e);
+ try {
+ s_logger.warn("Failed to associate ip address, so releasing ip from the database " + ip);
+ _ipAddressDao.markAsUnavailable(ip.getId());
+ if (!applyIpAssociations(network, true)) {
+ // if fail to apply ip assciations again, unassign ip address without updating resource
+ // count and generating usage event as there is no need to keep it in the db
+ _ipAddressDao.unassignIpAddress(ip.getId());
}
+ } catch (Exception e) {
+ s_logger.warn("Unable to disassociate ip address for recovery", e);
}
}
}
@@ -1327,7 +1331,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ipToAssoc, _vlanDao.findById(ipToAssoc.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null & !ipToServices.isEmpty()) {
+ if (ipToServices != null && !ipToServices.isEmpty()) {
Set<Service> services = ipToServices.get(publicIp);
if (services != null && !services.isEmpty()) {
throw new InvalidParameterValueException("IP " + ipToAssoc + " has services and rules associated in the network " + networkId);
@@ -1368,7 +1372,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
PublicIp publicIp = PublicIp.createFromAddrAndVlan(ip, _vlanDao.findById(ip.getVlanId()));
ipList.add(publicIp);
Map<PublicIpAddress, Set<Service>> ipToServices = _networkModel.getIpToServices(ipList, false, true);
- if (ipToServices != null & !ipToServices.isEmpty()) {
+ if (ipToServices != null && !ipToServices.isEmpty()) {
Set<Service> ipServices = ipToServices.get(publicIp);
if (ipServices != null && !ipServices.isEmpty()) {
return false;
@@ -1671,14 +1675,14 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
@Override
public boolean applyStaticNats(List<? extends StaticNat> staticNats, boolean continueOnError, boolean forRevoke) throws ResourceUnavailableException {
- Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
- boolean success = true;
-
if (staticNats == null || staticNats.size() == 0) {
s_logger.debug("There are no static nat rules for the network elements");
return true;
}
+ Network network = _networksDao.findById(staticNats.get(0).getNetworkId());
+ boolean success = true;
+
// get the list of public ip's owned by the network
List<IPAddressVO> userIps = _ipAddressDao.listByAssociatedNetwork(network.getId(), null);
List<PublicIp> publicIps = new ArrayList<PublicIp>();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 52a08e1..68807d3 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1017,14 +1017,14 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
List<NetworkOfferingServiceMapVO> map = _ntwkOfferingSrvcDao.listByNetworkOfferingId(networkOfferingId);
for (NetworkOfferingServiceMapVO instance : map) {
- String service = instance.getService();
+ Service service = Network.Service.getService(instance.getService());
Set<Provider> providers;
providers = serviceProviderMap.get(service);
if (providers == null) {
providers = new HashSet<Provider>();
}
providers.add(Provider.getProvider(instance.getProvider()));
- serviceProviderMap.put(Service.getService(service), providers);
+ serviceProviderMap.put(service, providers);
}
return serviceProviderMap;
@@ -1533,6 +1533,9 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Override
public void checkNetworkPermissions(Account owner, Network network) {
+ if (network == null) {
+ throw new CloudRuntimeException("no network to check permissions for.");
+ }
// Perform account permission check
if (network.getGuestType() != Network.GuestType.Shared || (network.getGuestType() == Network.GuestType.Shared && network.getAclType() == ACLType.Account)) {
AccountVO networkOwner = _accountDao.findById(network.getAccountId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index a6e2180..13ff385 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -224,12 +224,12 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
Map<String, String> dbParams = _configDao.getConfiguration(params);
- _cidr = dbParams.get(Config.ControlCidr);
+ _cidr = dbParams.get(Config.ControlCidr.toString());
if (_cidr == null) {
_cidr = "169.254.0.0/16";
}
- _gateway = dbParams.get(Config.ControlGateway);
+ _gateway = dbParams.get(Config.ControlGateway.toString());
if (_gateway == null) {
_gateway = NetUtils.getLinkLocalGateway();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 2face90..51e476f 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -424,14 +424,14 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
List<VpcOfferingServiceMapVO> map = _vpcOffSvcMapDao.listByVpcOffId(vpcOffId);
for (VpcOfferingServiceMapVO instance : map) {
- String service = instance.getService();
+ Service service = Service.getService(instance.getService());
Set<Provider> providers;
providers = serviceProviderMap.get(service);
if (providers == null) {
providers = new HashSet<Provider>();
}
providers.add(Provider.getProvider(instance.getProvider()));
- serviceProviderMap.put(Service.getService(service), providers);
+ serviceProviderMap.put(service, providers);
}
return serviceProviderMap;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae05560/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 ac641a2..56232d2 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -425,7 +425,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
if (isISO) {
desc = Upload.Type.ISO.toString();
}
- eventId = eventId == null ? 0 : eventId;
+ eventId = (eventId == null ? 0 : eventId);
if (!_accountMgr.isRootAdmin(caller.getType()) && _disableExtraction) {
throw new PermissionDeniedException("Extraction has been disabled by admin");
@@ -1785,7 +1785,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
// Don't allow to modify system template
- if (id == Long.valueOf(1)) {
+ if (Long.valueOf(1).equals(id)) {
InvalidParameterValueException ex = new InvalidParameterValueException("Unable to update template/iso of specified id");
ex.addProxyObject(String.valueOf(id), "templateId");
throw ex;
[28/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
Posted by bf...@apache.org.
VM snapshots: If quiescevm is supported, make checkbox checked
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/18a3d3c3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18a3d3c3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18a3d3c3
Branch: refs/heads/ui-restyle
Commit: 18a3d3c3b85fd8dd44106bdfeffca231d87f2be1
Parents: 08d124d
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 11:33:03 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 11:33:03 2014 -0800
----------------------------------------------------------------------
ui/scripts/instances.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/18a3d3c3/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 989d9a8..3b1931b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -47,7 +47,13 @@
isBoolean: true,
isChecked: false,
isHidden: function(args) {
- return args.context.instances[0].hypervisor !== 'VMware';
+ if (args.context.instances[0].hypervisor !== 'VMware') {
+ return true;
+ }
+
+ args.form.fields.quiescevm.isChecked = true;
+
+ return false;
}
}
}