date:20131111

git commit: CLOUDSTACK-5003

2013-11-11 Thread radhika

Updated Branches:
  refs/heads/master 30dfc6d9d -> a25187df4


CLOUDSTACK-5003


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/a25187df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/a25187df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/a25187df

Branch: refs/heads/master
Commit: a25187df4e16b3730b5363c8ee51e681503dc5f6
Parents: 30dfc6d
Author: Radhika PC 
Authored: Mon Nov 11 13:33:27 2013 +0530
Committer: Radhika PC 
Committed: Mon Nov 11 13:33:27 2013 +0530

--
 en-US/change-sysmvmtemplate.xml  | 82 +++
 en-US/working-with-system-vm.xml | 56 +++-
 2 files changed, 107 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/a25187df/en-US/change-sysmvmtemplate.xml
--
diff --git a/en-US/change-sysmvmtemplate.xml b/en-US/change-sysmvmtemplate.xml
new file mode 100644
index 000..b41460c
--- /dev/null
+++ b/en-US/change-sysmvmtemplate.xml
@@ -0,0 +1,82 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+  Changing the Default System VM Template
+  &PRODUCT; allows you to change the default 32-bit System VM template 
to 64-bit one. Using
+the 64-bit template, upgrade the virtual router to manage larger number of 
connection in your
+network.
+  
+
+  Based on the hypervisor you use, download the 64-bit template from 
the following
+location:
+  
+
+  
+  
+  
+
+  Hypervisor
+  Download Location
+
+  
+  
+
+  XenServer
+  
+
http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2
+
+
+  KVM
+  
+
http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2
+
+
+  
+
+  
+
+
+  As an administrator, log in to the &PRODUCT; UI
+
+
+  Register the 64 bit template. 
+  For example: KVM64bitTemplate
+
+
+  While registering the template, select Routing.
+
+
+  Navigate to Infrastructure > Zone > Settings. 
+
+
+  Set the name of the 64-bit template, KVM64bitTemplate, in the
+  router.template.kvm global parameter.
+  If you are using a XenServer 64-bit template, set the name in the
+  router.template.xen global parameter.
+  Any new virtual router created in this Zone automatically picks up 
this template.
+
+
+  Restart the Management Server.
+
+  
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/a25187df/en-US/working-with-system-vm.xml
--
diff --git a/en-US/working-with-system-vm.xml b/en-US/working-with-system-vm.xml
index 073d077..f24c668 100644
--- a/en-US/working-with-system-vm.xml
+++ b/en-US/working-with-system-vm.xml
@@ -3,38 +3,32 @@
 
 %BOOK_ENTITIES;
 ]>
+
 
+
 
-  Working with System Virtual Machines
-  &PRODUCT; uses several types of system virtual machines to perform 
tasks in the cloud. In
-general &PRODUCT; manages these system VMs and creates, starts, and stops 
them as needed based
-on scale and immediate needs. However, the administrator should be aware 
of them and their roles
-to assist in debugging issues.
-  
-You can configure the system.vm.random.password parameter to create 
a random system VM
-  password to ensure higher security. If you reset the value for 
system.vm.random.password to
-  true and restart the Management Server, a random password is generated 
and stored encrypted in
-  the database. You can view the decrypted password under the 
system.vm.password global
-  parameter on the &PRODUCT; UI or by calling the listConfigurations 
API.
-  
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
+Working with System Virtual Machines
+&PRODUCT; uses several types of system virtual machines to perform 
tasks in the cloud. In general &PRODUCT; manages these system VMs and creates, 
starts, and stops them as needed based on scale and immediate needs. However, 
the administrator should be aware of them and their roles to assist in 
debugging issues.
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://ww

[1/2] git commit: updated refs/heads/master to 951336c

2013-11-11 Thread tsp

Updated Branches:
  refs/heads/master 53b0bf673 -> 951336c3e


CLOUDSTACK-5080: Hypervisor Capabilities table missing entry for Simulator

Signed-off-by: Prasanna Santhanam 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfb81ac1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfb81ac1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfb81ac1

Branch: refs/heads/master
Commit: dfb81ac1274d8ebe4a47223d10f3de44aa9091bf
Parents: 53b0bf6
Author: David Grizzanti 
Authored: Thu Nov 7 15:27:59 2013 -0500
Committer: Prasanna Santhanam 
Committed: Mon Nov 11 12:11:28 2013 +0530

--
 developer/pom.xml  |  1 +
 setup/db/hypervisor_capabilities.simulator.sql | 19 +++
 2 files changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfb81ac1/developer/pom.xml
--
diff --git a/developer/pom.xml b/developer/pom.xml
index 0eb18bf..8ea0492 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -201,6 +201,7 @@
 
 
${basedir}/target/db/create-schema-simulator.sql
 
${basedir}/target/db/templates.simulator.sql
+
${basedir}/target/db/hypervisor_capabilities.simulator.sql
 
 com.cloud.upgrade.DatabaseUpgradeChecker
 --database=simulator

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfb81ac1/setup/db/hypervisor_capabilities.simulator.sql
--
diff --git a/setup/db/hypervisor_capabilities.simulator.sql 
b/setup/db/hypervisor_capabilities.simulator.sql
new file mode 100755
index 000..32f9aaa
--- /dev/null
+++ b/setup/db/hypervisor_capabilities.simulator.sql
@@ -0,0 +1,19 @@
+-- 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.
+
+
+INSERT INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, 
hypervisor_version, max_guests_limit, security_group_enabled, 
max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, 
vm_snapshot_enabled) values (UUID(), 'Simulator', 'default', 50, 1, 6, NULL, 0, 
1);

[2/2] git commit: updated refs/heads/master to 951336c

2013-11-11 Thread tsp

CLOUDSTACK-5124: Adopt GetDomRVersionAnswer to VR upgradability

While VRs upgrade, cloudstack should still be able to work with older
/newer version of the scripts within VRs. To allow this, the simulator
needs to send the version strings for the domr version response or the
VR start is interrupted.

Signed-off-by: Prasanna Santhanam 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/951336c3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/951336c3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/951336c3

Branch: refs/heads/master
Commit: 951336c3e4510ddfecfe0678be7716e4eade1e98
Parents: dfb81ac
Author: Prasanna Santhanam 
Authored: Mon Nov 11 13:49:55 2013 +0530
Committer: Prasanna Santhanam 
Committed: Mon Nov 11 13:49:55 2013 +0530

--
 .../simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/951336c3/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
--
diff --git 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
index 28e235e..b4758a5 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -84,6 +84,7 @@ import javax.naming.ConfigurationException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
@@ -567,7 +568,7 @@ public class MockVmManagerImpl extends ManagerBase 
implements MockVmManager {
 
 @Override
 public GetDomRVersionAnswer getDomRVersion(GetDomRVersionCmd cmd) {
-return new GetDomRVersionAnswer(cmd, null, null, null);
+return new GetDomRVersionAnswer(cmd, null, "CloudStack Release 4.2.0", 
UUID.randomUUID().toString());
 }
 
 @Override

git commit: updated refs/heads/4.2 to 8f53bb2

2013-11-11 Thread sateesh

Updated Branches:
  refs/heads/4.2 6a92f7546 -> 8f53bb273


CLOUDSTACK-4993 [VMware] When issuing detach ISO to Vcenter, MS should prevent 
Vcenter from posting Virtual Machine question dialog waiting for user response

During ISO detach operation, answer question from vCenter by pragrmatically 
answering for VM question in detaching process.

Signed-off-by: Sateesh Chodapuneedi 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8f53bb27
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8f53bb27
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8f53bb27

Branch: refs/heads/4.2
Commit: 8f53bb2731c04487a6c0c0cd5062eb957f0636f4
Parents: 6a92f75
Author: Sateesh Chodapuneedi 
Authored: Mon Nov 11 08:48:12 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Nov 11 08:48:12 2013 +0530

--
 .../hypervisor/vmware/mo/VirtualMachineMO.java  | 194 +--
 1 file changed, 179 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f53bb27/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
--
diff --git 
a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 55cc8de..126b67d 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -29,14 +29,19 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import org.apache.log4j.Logger;
 
 import com.google.gson.Gson;
 import com.vmware.vim25.ArrayOfManagedObjectReference;
+import com.vmware.vim25.ChoiceOption;
 import com.vmware.vim25.CustomFieldStringValue;
 import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
 import com.vmware.vim25.DynamicProperty;
+import com.vmware.vim25.ElementDescription;
 import com.vmware.vim25.GuestInfo;
 import com.vmware.vim25.GuestOsDescriptor;
 import com.vmware.vim25.HttpNfcLeaseDeviceUrl;
@@ -80,8 +85,10 @@ import com.vmware.vim25.VirtualMachineConfigOption;
 import com.vmware.vim25.VirtualMachineConfigSpec;
 import com.vmware.vim25.VirtualMachineConfigSummary;
 import com.vmware.vim25.VirtualMachineFileInfo;
+import com.vmware.vim25.VirtualMachineMessage;
 import com.vmware.vim25.VirtualMachineMovePriority;
 import com.vmware.vim25.VirtualMachinePowerState;
+import com.vmware.vim25.VirtualMachineQuestionInfo;
 import com.vmware.vim25.VirtualMachineRelocateDiskMoveOptions;
 import com.vmware.vim25.VirtualMachineRelocateSpec;
 import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator;
@@ -98,12 +105,14 @@ import com.cloud.hypervisor.vmware.util.VmwareHelper;
 import com.cloud.utils.ActionDelegate;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.script.Script;
 
 import edu.emory.mathcs.backport.java.util.Arrays;
 
 public class VirtualMachineMO extends BaseMO {
 private static final Logger s_logger = 
Logger.getLogger(VirtualMachineMO.class);
+private static final ExecutorService _monitorServiceExecutor = 
Executors.newCachedThreadPool(new NamedThreadFactory("VM-Question-Monitor"));
 private ManagedObjectReference _vmEnvironmentBrowser = null;
 
public VirtualMachineMO(VmwareContext context, ManagedObjectReference 
morVm) {
@@ -170,6 +179,10 @@ public class VirtualMachineMO extends BaseMO {
return 
(GuestInfo)getContext().getVimClient().getDynamicProperty(_mor, "guest");
}
 
+public void answerVM(String questionId, String choice) throws Exception {
+getContext().getService().answerVM(_mor, questionId, choice);
+}
+
public boolean isVMwareToolsRunning() throws Exception {
GuestInfo guestInfo = getVmGuestInfo();
if(guestInfo != null) {
@@ -1157,7 +1170,7 @@ public class VirtualMachineMO extends BaseMO {
boolean connect, boolean connectAtBoot) throws Exception {
 
if(s_logger.isTraceEnabled())
-   s_logger.trace("vCenter API trace - detachIso(). target 
MOR: " + _mor.getValue() + ", isoDatastorePath: "
+s_logger.trace("vCenter API trace - attachIso(). target MOR: " + 
_mor.getValue() + ", isoDatastorePath: "
+ isoDatastorePath + ", datastore: " + 
morDs.getValue() + ", connect: " + connect + ", connectAtBoot: " + 
connectAtBoot);
 
assert(isoDatastorePath != null);
@@ -1240,18 +12

git commit: updated refs/heads/master to a70bbdb

2013-11-11 Thread sateesh

Updated Branches:
  refs/heads/master 951336c3e -> a70bbdb13


CLOUDSTACK-4993 [VMware] When issuing detach ISO to Vcenter, MS should prevent 
Vcenter from posting Virtual Machine question dialog waiting for user response

During ISO detach operation, answer question from vCenter by programmatically 
answering for VM question in detaching process.

Signed-off-by: Sateesh Chodapuneedi 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a70bbdb1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a70bbdb1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a70bbdb1

Branch: refs/heads/master
Commit: a70bbdb139b4b1b1c8dd8f9a258b4b37b5698290
Parents: 951336c
Author: Sateesh Chodapuneedi 
Authored: Mon Nov 11 08:48:12 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Nov 11 09:11:54 2013 +0530

--
 .../hypervisor/vmware/mo/VirtualMachineMO.java  | 194 +--
 1 file changed, 179 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a70bbdb1/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
--
diff --git 
a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 784c031..a4469f0 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -29,14 +29,19 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import org.apache.log4j.Logger;
 
 import com.google.gson.Gson;
 import com.vmware.vim25.ArrayOfManagedObjectReference;
+import com.vmware.vim25.ChoiceOption;
 import com.vmware.vim25.CustomFieldStringValue;
 import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
 import com.vmware.vim25.DynamicProperty;
+import com.vmware.vim25.ElementDescription;
 import com.vmware.vim25.GuestInfo;
 import com.vmware.vim25.GuestOsDescriptor;
 import com.vmware.vim25.HttpNfcLeaseDeviceUrl;
@@ -80,8 +85,10 @@ import com.vmware.vim25.VirtualMachineConfigOption;
 import com.vmware.vim25.VirtualMachineConfigSpec;
 import com.vmware.vim25.VirtualMachineConfigSummary;
 import com.vmware.vim25.VirtualMachineFileInfo;
+import com.vmware.vim25.VirtualMachineMessage;
 import com.vmware.vim25.VirtualMachineMovePriority;
 import com.vmware.vim25.VirtualMachinePowerState;
+import com.vmware.vim25.VirtualMachineQuestionInfo;
 import com.vmware.vim25.VirtualMachineRelocateDiskMoveOptions;
 import com.vmware.vim25.VirtualMachineRelocateSpec;
 import com.vmware.vim25.VirtualMachineRelocateSpecDiskLocator;
@@ -98,12 +105,14 @@ import com.cloud.hypervisor.vmware.util.VmwareHelper;
 import com.cloud.utils.ActionDelegate;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
+import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.script.Script;
 
 import java.util.Arrays;
 
 public class VirtualMachineMO extends BaseMO {
 private static final Logger s_logger = 
Logger.getLogger(VirtualMachineMO.class);
+private static final ExecutorService _monitorServiceExecutor = 
Executors.newCachedThreadPool(new NamedThreadFactory("VM-Question-Monitor"));
 private ManagedObjectReference _vmEnvironmentBrowser = null;
 
public VirtualMachineMO(VmwareContext context, ManagedObjectReference 
morVm) {
@@ -170,6 +179,10 @@ public class VirtualMachineMO extends BaseMO {
return 
(GuestInfo)getContext().getVimClient().getDynamicProperty(_mor, "guest");
}
 
+public void answerVM(String questionId, String choice) throws Exception {
+getContext().getService().answerVM(_mor, questionId, choice);
+}
+
public boolean isVMwareToolsRunning() throws Exception {
GuestInfo guestInfo = getVmGuestInfo();
if(guestInfo != null) {
@@ -1157,7 +1170,7 @@ public class VirtualMachineMO extends BaseMO {
boolean connect, boolean connectAtBoot) throws Exception {
 
if(s_logger.isTraceEnabled())
-   s_logger.trace("vCenter API trace - detachIso(). target 
MOR: " + _mor.getValue() + ", isoDatastorePath: "
+s_logger.trace("vCenter API trace - attachIso(). target MOR: " + 
_mor.getValue() + ", isoDatastorePath: "
+ isoDatastorePath + ", datastore: " + 
morDs.getValue() + ", connect: " + connect + ", connectAtBoot: " + 
connectAtBoot);
 
assert(isoDatastorePath != null);
@@ -1240,18 +1253,90 @@ public cl

git commit: updated refs/heads/master to fb8c58a

2013-11-11 Thread dahn

Updated Branches:
  refs/heads/master a70bbdb13 -> fb8c58a3c


retrieving network might fail if it exists in a different datacentre

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fb8c58a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fb8c58a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fb8c58a3

Branch: refs/heads/master
Commit: fb8c58a3cf09919b89544a774463d694ffd9e9fd
Parents: a70bbdb
Author: Daan Hoogland 
Authored: Mon Nov 11 10:32:06 2013 +0100
Committer: Daan Hoogland 
Committed: Mon Nov 11 10:32:06 2013 +0100

--
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fb8c58a3/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 017d38d..2e0737d 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1420,10 +1420,9 @@ public class VpcManagerImpl extends ManagerBase 
implements VpcManager, VpcProvis
 Network privateNtwk = null;
 if 
(BroadcastDomainType.getSchemeValue(BroadcastDomainType.fromString(broadcastUri))
 == BroadcastDomainType.Lswitch) {
 String cidr = NetUtils.ipAndNetMaskToCidr(gateway, 
netmask);
-
 privateNtwk = _ntwkDao.getPrivateNetwork(broadcastUri, 
cidr,
 gatewayOwnerId, dcId, networkOfferingId);
-s_logger.info("found and using existing network for 
vpc " + vpc + ": " + broadcastUri);
+// if the dcid is different we get no network so next 
we try to create it
 }
 if (privateNtwk == null) {
 s_logger.info("creating new network for vpc " + vpc + 
" using broadcast uri: " + broadcastUri);
@@ -1431,6 +1430,7 @@ public class VpcManagerImpl extends ManagerBase 
implements VpcManager, VpcProvis
 privateNtwk = 
_ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal,
 broadcastUri, ipAddress, null, gateway, 
netmask, gatewayOwnerId, vpcId, isSourceNat, networkOfferingId);
 } else { // create the nic/ip as createPrivateNetwork 
doesn''t do that work for us now
+s_logger.info("found and using existing network for 
vpc " + vpc + ": " + broadcastUri);
 DataCenterVO dc = 
_dcDao.lockRow(physNetFinal.getDataCenterId(), true);
 
 //add entry to private_ip_address table

git commit: updated refs/heads/4.2 to cff7e39

2013-11-11 Thread girish

Updated Branches:
  refs/heads/4.2 8f53bb273 -> cff7e3933


Fixed few hunks which were incorrect.

While adding certain marvin related fixes from master to 4.2 branch
incorrect hunks were added. Fixed them.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cff7e393
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cff7e393
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cff7e393

Branch: refs/heads/4.2
Commit: cff7e39339cc8735e3dc930bd1ce6761d502e307
Parents: 8f53bb2
Author: Girish Shilamkar 
Authored: Mon Nov 11 15:10:29 2013 +0530
Committer: Girish Shilamkar 
Committed: Mon Nov 11 15:10:29 2013 +0530

--
 tools/marvin/marvin/cloudstackConnection.py | 27 ++--
 1 file changed, 7 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cff7e393/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index 64a43f8..644cf3a 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -32,6 +32,7 @@ from requests import RequestException
 
 
 class cloudConnection(object):
+
 """ Connections to make API calls to the cloudstack management server
 """
 def __init__(self, mgmtDet, asyncTimeout=3600, logging=None,
@@ -56,7 +57,7 @@ class cloudConnection(object):
(self.apiKey is None and self.securityKey is None):
 self.auth = False
 if mgmtDet.useHttps == "True":
-   self.protocol = "https"
+self.protocol = "https"
 self.baseurl = "%s://%s:%d/%s"\
% (self.protocol, self.mgtSvr, self.port, self.path)
 
@@ -157,12 +158,12 @@ class cloudConnection(object):
 
 #Verify whether protocol is "http", then call the request over http
 if self.protocol == "http":
-   if method == 'POST':
-   response = requests.post(self.baseurl, params=payload,
+if method == 'POST':
+response = requests.post(self.baseurl, params=payload,
+ verify=https_flag)
+else:
+response = requests.get(self.baseurl, params=payload,
 verify=https_flag)
-   else:
-   response = requests.get(self.baseurl, params=payload,
-   verify=https_flag)
 else:
 '''
 If protocol is https, then create the  connection url with \
@@ -170,20 +171,6 @@ class cloudConnection(object):
 provided as part of cert
 '''
 try:
-   if method == 'POST':
-   response = requests.post(self.baseurl, params=payload,
-cert=cert_path, 
verify=https_flag)
-   else:
-   response = requests.get(self.baseurl, params=payload,
-   cert=cert_path, 
verify=https_flag)
-except Exception,e:
-'''
-If an exception occurs with current CA certs,\
- then try with default certs path, we dont need \
-to mention here the cert path
-'''
-self.logging.debug( "Creating CS connection over https \
-didnt worked with user provided certs 
%s"%e )
 if method == 'POST':
 response = requests.post(self.baseurl,
  params=payload,

git commit: CLOUDSTACK-5003

2013-11-11 Thread radhika

Updated Branches:
  refs/heads/4.2 95e49e980 -> f0803f384


CLOUDSTACK-5003


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/f0803f38
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/f0803f38
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/f0803f38

Branch: refs/heads/4.2
Commit: f0803f38413b5e94a3684c45202cff42ad5de0d6
Parents: 95e49e9
Author: Radhika PC 
Authored: Mon Nov 11 13:33:27 2013 +0530
Committer: Radhika PC 
Committed: Mon Nov 11 15:42:38 2013 +0530

--
 en-US/change-sysmvmtemplate.xml  | 82 +++
 en-US/working-with-system-vm.xml | 56 +++-
 2 files changed, 107 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f0803f38/en-US/change-sysmvmtemplate.xml
--
diff --git a/en-US/change-sysmvmtemplate.xml b/en-US/change-sysmvmtemplate.xml
new file mode 100644
index 000..b41460c
--- /dev/null
+++ b/en-US/change-sysmvmtemplate.xml
@@ -0,0 +1,82 @@
+
+
+%BOOK_ENTITIES;
+]>
+
+
+  Changing the Default System VM Template
+  &PRODUCT; allows you to change the default 32-bit System VM template 
to 64-bit one. Using
+the 64-bit template, upgrade the virtual router to manage larger number of 
connection in your
+network.
+  
+
+  Based on the hypervisor you use, download the 64-bit template from 
the following
+location:
+  
+
+  
+  
+  
+
+  Hypervisor
+  Download Location
+
+  
+  
+
+  XenServer
+  
+
http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2
+
+
+  KVM
+  
+
http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2
+
+
+  
+
+  
+
+
+  As an administrator, log in to the &PRODUCT; UI
+
+
+  Register the 64 bit template. 
+  For example: KVM64bitTemplate
+
+
+  While registering the template, select Routing.
+
+
+  Navigate to Infrastructure > Zone > Settings. 
+
+
+  Set the name of the 64-bit template, KVM64bitTemplate, in the
+  router.template.kvm global parameter.
+  If you are using a XenServer 64-bit template, set the name in the
+  router.template.xen global parameter.
+  Any new virtual router created in this Zone automatically picks up 
this template.
+
+
+  Restart the Management Server.
+
+  
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/f0803f38/en-US/working-with-system-vm.xml
--
diff --git a/en-US/working-with-system-vm.xml b/en-US/working-with-system-vm.xml
index 073d077..f24c668 100644
--- a/en-US/working-with-system-vm.xml
+++ b/en-US/working-with-system-vm.xml
@@ -3,38 +3,32 @@
 
 %BOOK_ENTITIES;
 ]>
+
 
+
 
-  Working with System Virtual Machines
-  &PRODUCT; uses several types of system virtual machines to perform 
tasks in the cloud. In
-general &PRODUCT; manages these system VMs and creates, starts, and stops 
them as needed based
-on scale and immediate needs. However, the administrator should be aware 
of them and their roles
-to assist in debugging issues.
-  
-You can configure the system.vm.random.password parameter to create 
a random system VM
-  password to ensure higher security. If you reset the value for 
system.vm.random.password to
-  true and restart the Management Server, a random password is generated 
and stored encrypted in
-  the database. You can view the decrypted password under the 
system.vm.password global
-  parameter on the &PRODUCT; UI or by calling the listConfigurations 
API.
-  
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
-  http://www.w3.org/2001/XInclude"/>
+Working with System Virtual Machines
+&PRODUCT; uses several types of system virtual machines to perform 
tasks in the cloud. In general &PRODUCT; manages these system VMs and creates, 
starts, and stops them as needed based on scale and immediate needs. However, 
the administrator should be aware of them and their roles to assist in 
debugging issues.
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.org/2001/XInclude"; />
+http://www.w3.o

git commit: updated refs/heads/4.2 to 3e3b1c8

2013-11-11 Thread talluri

Updated Branches:
  refs/heads/4.2 cff7e3933 -> 3e3b1c86e


Fixed missing checkin while merging from master
Signed-off-by: SrikanteswaraRao Talluri 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e3b1c86
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e3b1c86
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e3b1c86

Branch: refs/heads/4.2
Commit: 3e3b1c86e1bd9c7f0385b49980141d0de0af18d2
Parents: cff7e39
Author: SrikanteswaraRao Talluri 
Authored: Mon Nov 11 15:47:56 2013 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Mon Nov 11 15:47:56 2013 +0530

--
 tools/marvin/marvin/marvinPlugin.py | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e3b1c86/tools/marvin/marvin/marvinPlugin.py
--
diff --git a/tools/marvin/marvin/marvinPlugin.py 
b/tools/marvin/marvin/marvinPlugin.py
index 2a749f0..48d5154 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -33,6 +33,17 @@ class MarvinPlugin(Plugin):
 name = "marvin"
 
 def configure(self, options, config):
+"""enable the marvin plugin when the --with-marvin directive is given
+to nose. The enableOpt value is set from the command line directive and
+self.enabled (True|False) determines whether marvin's tests will run.
+By default non-default plugins like marvin will be disabled
+"""
+if hasattr(options, self.enableOpt):
+if not getattr(options, self.enableOpt):
+self.enabled = False
+return
+else:
+self.enabled = True
 self.logformat = logging.Formatter("%(asctime)s - %(levelname)s - " +
"%(name)s - %(message)s")

git commit: updated refs/heads/4.3 to 61386f4

2013-11-11 Thread devdeep

Updated Branches:
  refs/heads/4.3 6a8ec786a -> 61386f406


Fix the console proxy rdp client build breaking with java 6 and make it part of 
regular build.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61386f40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61386f40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61386f40

Branch: refs/heads/4.3
Commit: 61386f4068bde47fdb38887a7d7e62cba5f3ccf2
Parents: 6a8ec78
Author: Devdeep Singh 
Authored: Mon Nov 11 16:16:34 2013 +0530
Committer: Devdeep Singh 
Committed: Mon Nov 11 16:16:34 2013 +0530

--
 .../rdpconsole/src/main/java/streamer/SocketWrapper.java   | 2 +-
 .../rdpconsole/src/test/java/rdpclient/MockServerTest.java | 2 +-
 services/pom.xml   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
index 2ddf0b6..c23edd8 100644
--- 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
+++ 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
@@ -133,7 +133,7 @@ public class SocketWrapper extends PipelineImpl {
   sslContext.init(null, new TrustManager[] { new 
TrustAllX509TrustManager() }, null);
 
   SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-  sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, 
address.getHostString(), address.getPort(), true);
+  sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, 
address.getHostName(), address.getPort(), true);
   sslSocket.startHandshake();
 
   InputStream sis = sslSocket.getInputStream();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
 
b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
index cba01fd..89eed8a 100644
--- 
a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
+++ 
b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
@@ -154,7 +154,7 @@ public class MockServerTest extends TestCase {
//System.setProperty("javax.net.debug", "ssl");
 
final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) 
SSLSocketFactory.getDefault();
-   SSLSocket sslSocket = (SSLSocket) 
sslSocketFactory.createSocket(socket, address.getHostString(), 
address.getPort(), true);
+   SSLSocket sslSocket = (SSLSocket) 
sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), 
true);

sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
sslSocket.startHandshake();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/pom.xml
--
diff --git a/services/pom.xml b/services/pom.xml
index c2f7f88..5d1403b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -32,6 +32,7 @@
   
   
 console-proxy
+console-proxy-rdp/rdpconsole
 secondary-storage

git commit: updated refs/heads/master to 1b2f1d7

2013-11-11 Thread devdeep

Updated Branches:
  refs/heads/master fb8c58a3c -> 1b2f1d745


Fix the console proxy rdp client build breaking with java 6 and make it part of 
regular build.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b2f1d74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b2f1d74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b2f1d74

Branch: refs/heads/master
Commit: 1b2f1d74547ba57eafa577e237774ce1aa9f630e
Parents: fb8c58a
Author: Devdeep Singh 
Authored: Mon Nov 11 16:16:34 2013 +0530
Committer: Devdeep Singh 
Committed: Mon Nov 11 16:19:08 2013 +0530

--
 .../rdpconsole/src/main/java/streamer/SocketWrapper.java   | 2 +-
 .../rdpconsole/src/test/java/rdpclient/MockServerTest.java | 2 +-
 services/pom.xml   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b2f1d74/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
index 2ddf0b6..c23edd8 100644
--- 
a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
+++ 
b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
@@ -133,7 +133,7 @@ public class SocketWrapper extends PipelineImpl {
   sslContext.init(null, new TrustManager[] { new 
TrustAllX509TrustManager() }, null);
 
   SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-  sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, 
address.getHostString(), address.getPort(), true);
+  sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, 
address.getHostName(), address.getPort(), true);
   sslSocket.startHandshake();
 
   InputStream sis = sslSocket.getInputStream();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b2f1d74/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
--
diff --git 
a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
 
b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
index cba01fd..89eed8a 100644
--- 
a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
+++ 
b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
@@ -154,7 +154,7 @@ public class MockServerTest extends TestCase {
//System.setProperty("javax.net.debug", "ssl");
 
final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) 
SSLSocketFactory.getDefault();
-   SSLSocket sslSocket = (SSLSocket) 
sslSocketFactory.createSocket(socket, address.getHostString(), 
address.getPort(), true);
+   SSLSocket sslSocket = (SSLSocket) 
sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), 
true);

sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
sslSocket.startHandshake();
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b2f1d74/services/pom.xml
--
diff --git a/services/pom.xml b/services/pom.xml
index c2f7f88..5d1403b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -32,6 +32,7 @@
   
   
 console-proxy
+console-proxy-rdp/rdpconsole
 secondary-storage

git commit: updated refs/heads/master to aebbb15

2013-11-11 Thread girish

Updated Branches:
  refs/heads/master 1b2f1d745 -> aebbb15a6


Fixed a connection issue under asyncmgr.

Fixed a connection issue under asyncmgr.
Added __init__.py files to directory to make it
a package.This file was missing under few directories and
so not appearing as packages while refactoring.
Adding one None Check


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aebbb15a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aebbb15a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aebbb15a

Branch: refs/heads/master
Commit: aebbb15a64b3f2b96fc7b89be229f82116bd710d
Parents: 1b2f1d7
Author: Santhosh Edukulla 
Authored: Mon Nov 11 16:55:09 2013 +0530
Committer: Girish Shilamkar 
Committed: Mon Nov 11 16:55:09 2013 +0530

--
 tools/marvin/marvin/asyncJobMgr.py|  2 +-
 tools/marvin/marvin/cloudstackConnection.py   |  2 ++
 tools/marvin/marvin/sandbox/demo/__init__.py  | 17 +
 tools/marvin/marvin/sandbox/demo/live/__init__.py | 17 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aebbb15a/tools/marvin/marvin/asyncJobMgr.py
--
diff --git a/tools/marvin/marvin/asyncJobMgr.py 
b/tools/marvin/marvin/asyncJobMgr.py
index 0d7939c..e24170e 100644
--- a/tools/marvin/marvin/asyncJobMgr.py
+++ b/tools/marvin/marvin/asyncJobMgr.py
@@ -88,7 +88,7 @@ class workThread(threading.Thread):
 time.mktime(jobstatus.endTime.timetuple()) - time.mktime(
 jobstatus.startTime.timetuple())
 else:
-result = self.connection.marvin_request(cmd)
+result = self.connection.marvinRequest(cmd)
 if result is None:
 jobstatus.status = False
 else:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aebbb15a/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index 644cf3a..23f81fb 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -271,6 +271,8 @@ class cloudConnection(object):
 self.auth,
 payload=payload,
 method=method)
+if response is None:
+return None
 self.logging.debug("Request: %s Response: %s" %
(response.url, response.text))
 try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aebbb15a/tools/marvin/marvin/sandbox/demo/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py 
b/tools/marvin/marvin/sandbox/demo/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/__init__.py
@@ -0,0 +1,17 @@
+# 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.
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aebbb15a/tools/marvin/marvin/sandbox/demo/live/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/live/__init__.py 
b/tools/marvin/marvin/sandbox/demo/live/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/live/__init__.py
@@ -0,0 +1,17 @@
+# 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/li

git commit: updated refs/heads/4.3 to aeb5ec0

2013-11-11 Thread girish

Updated Branches:
  refs/heads/4.3 61386f406 -> aeb5ec07c


Fixed a connection issue under asyncmgr.

Fixed a connection issue under asyncmgr.
Added __init__.py files to directory to make it
a package.This file was missing under few directories and
so not appearing as packages while refactoring.
Adding one None Check


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aeb5ec07
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aeb5ec07
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aeb5ec07

Branch: refs/heads/4.3
Commit: aeb5ec07c68a4f1116496ffd54e993e48b5c9f0d
Parents: 61386f4
Author: Santhosh Edukulla 
Authored: Mon Nov 11 16:55:09 2013 +0530
Committer: Girish Shilamkar 
Committed: Mon Nov 11 16:59:59 2013 +0530

--
 tools/marvin/marvin/asyncJobMgr.py|  2 +-
 tools/marvin/marvin/cloudstackConnection.py   |  2 ++
 tools/marvin/marvin/sandbox/demo/__init__.py  | 17 +
 tools/marvin/marvin/sandbox/demo/live/__init__.py | 17 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/asyncJobMgr.py
--
diff --git a/tools/marvin/marvin/asyncJobMgr.py 
b/tools/marvin/marvin/asyncJobMgr.py
index 0d7939c..e24170e 100644
--- a/tools/marvin/marvin/asyncJobMgr.py
+++ b/tools/marvin/marvin/asyncJobMgr.py
@@ -88,7 +88,7 @@ class workThread(threading.Thread):
 time.mktime(jobstatus.endTime.timetuple()) - time.mktime(
 jobstatus.startTime.timetuple())
 else:
-result = self.connection.marvin_request(cmd)
+result = self.connection.marvinRequest(cmd)
 if result is None:
 jobstatus.status = False
 else:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index 2c027c3..75af874 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -272,6 +272,8 @@ class cloudConnection(object):
 self.auth,
 payload=payload,
 method=method)
+if response is None:
+return None
 self.logging.debug("Request: %s Response: %s" %
(response.url, response.text))
 try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/sandbox/demo/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py 
b/tools/marvin/marvin/sandbox/demo/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/__init__.py
@@ -0,0 +1,17 @@
+# 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.
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aeb5ec07/tools/marvin/marvin/sandbox/demo/live/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/live/__init__.py 
b/tools/marvin/marvin/sandbox/demo/live/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/live/__init__.py
@@ -0,0 +1,17 @@
+# 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

git commit: updated refs/heads/4.2 to 7d02c71

2013-11-11 Thread girish

Updated Branches:
  refs/heads/4.2 3e3b1c86e -> 7d02c71ff


Fixed a connection issue under asyncmgr.

Fixed a connection issue under asyncmgr.
Added __init__.py files to directory to make it
a package.This file was missing under few directories and
so not appearing as packages while refactoring.
Adding one None Check

Conflicts:
tools/marvin/marvin/asyncJobMgr.py

Signed-off-by: Girish Shilamkar 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d02c71f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d02c71f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d02c71f

Branch: refs/heads/4.2
Commit: 7d02c71ff7ddfb231d722c9ad83d9ac27261d7fb
Parents: 3e3b1c8
Author: Santhosh Edukulla 
Authored: Mon Nov 11 16:55:09 2013 +0530
Committer: Girish Shilamkar 
Committed: Mon Nov 11 16:58:44 2013 +0530

--
 tools/marvin/marvin/asyncJobMgr.py|  2 +-
 tools/marvin/marvin/cloudstackConnection.py   |  2 ++
 tools/marvin/marvin/sandbox/demo/__init__.py  | 17 +
 tools/marvin/marvin/sandbox/demo/live/__init__.py | 17 +
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d02c71f/tools/marvin/marvin/asyncJobMgr.py
--
diff --git a/tools/marvin/marvin/asyncJobMgr.py 
b/tools/marvin/marvin/asyncJobMgr.py
index 25818a6..cab1406 100644
--- a/tools/marvin/marvin/asyncJobMgr.py
+++ b/tools/marvin/marvin/asyncJobMgr.py
@@ -88,7 +88,7 @@ class workThread(threading.Thread):
 time.mktime(jobstatus.endTime.timetuple()) - time.mktime(
 jobstatus.startTime.timetuple())
 else:
-result = self.connection.make_request(cmd, None, True)
+result = self.connection.marvinRequest(cmd)
 if result is None:
 jobstatus.status = False
 else:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d02c71f/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index 644cf3a..23f81fb 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -271,6 +271,8 @@ class cloudConnection(object):
 self.auth,
 payload=payload,
 method=method)
+if response is None:
+return None
 self.logging.debug("Request: %s Response: %s" %
(response.url, response.text))
 try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d02c71f/tools/marvin/marvin/sandbox/demo/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py 
b/tools/marvin/marvin/sandbox/demo/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/__init__.py
@@ -0,0 +1,17 @@
+# 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.
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d02c71f/tools/marvin/marvin/sandbox/demo/live/__init__.py
--
diff --git a/tools/marvin/marvin/sandbox/demo/live/__init__.py 
b/tools/marvin/marvin/sandbox/demo/live/__init__.py
new file mode 100644
index 000..00ae6c0
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/demo/live/__init__.py
@@ -0,0 +1,17 @@
+# 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
+#

git commit: CLOUDSTACK-5127

2013-11-11 Thread radhika

Updated Branches:
  refs/heads/4.2 f0803f384 -> 843101963


CLOUDSTACK-5127


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/84310196
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/84310196
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/84310196

Branch: refs/heads/4.2
Commit: 8431019639e692dbc5ce690ba5c0a9a905cd94ce
Parents: f0803f3
Author: Radhika PC 
Authored: Mon Nov 11 17:30:42 2013 +0530
Committer: Radhika PC 
Committed: Mon Nov 11 17:30:42 2013 +0530

--
 en-US/vm-snapshots.xml | 172 ++--
 1 file changed, 101 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/84310196/en-US/vm-snapshots.xml
--
diff --git a/en-US/vm-snapshots.xml b/en-US/vm-snapshots.xml
index 3e72fe4..66d1823 100644
--- a/en-US/vm-snapshots.xml
+++ b/en-US/vm-snapshots.xml
@@ -1,5 +1,5 @@
 
-http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 
 %BOOK_ENTITIES;
 ]>
@@ -23,58 +23,63 @@
 -->
 
   Virtual Machine Snapshots for VMware
-  (VMware hosts only)
-In addition to the existing &PRODUCT; ability to snapshot individual VM 
volumes,
-you can now take a VM snapshot to preserve all the VM's data volumes as 
well as (optionally) its CPU/memory state.
-This is useful for quick restore of a VM.
-For example, you can snapshot a VM, then make changes such as software 
upgrades.
-If anything goes wrong, simply restore the VM to its previous state using 
the previously saved VM snapshot.
-  
-  The snapshot is created using the VMware native snapshot facility. The 
VM snapshot
-includes not only the data volumes, but optionally also whether the VM is 
running or
-turned off (CPU state) and the memory contents. The snapshot is stored in 
&PRODUCT;'s
-primary storage.  
-  VM snapshots can have a parent/child relationship.
-Each successive snapshot of the same VM is the child of the snapshot that 
came before it.
-Each time you take an additional snapshot of the same VM, it saves only 
the differences
-between the current state of the VM and the state stored in the most 
recent previous snapshot.
-The previous snapshot becomes a parent, and the new snapshot is its child.
-It is possible to create a long chain of these parent/child snapshots,
-which amount to a "redo" record leading from the current state of the VM 
back to the 
+  In addition to the existing &PRODUCT; ability to snapshot individual VM
+volumes, you can now take a VM snapshot to preserve all the VM's data 
volumes as well as
+(optionally) its CPU/memory state. This is useful for quick restore of a 
VM. For example, you
+can snapshot a VM, then make changes such as software upgrades. If 
anything goes wrong, simply
+restore the VM to its previous state using the previously saved VM 
snapshot. 
+  The snapshot is created using the VMware native snapshot facility. The 
VM snapshot includes
+not only the data volumes, but optionally also whether the VM is running 
or turned off (CPU
+state) and the memory contents. The snapshot is stored in &PRODUCT;'s 
primary storage.
+  VM snapshots can have a parent/child relationship. Each successive 
snapshot of the same VM
+is the child of the snapshot that came before it. Each time you take an 
additional snapshot of
+the same VM, it saves only the differences between the current state of 
the VM and the state
+stored in the most recent previous snapshot. The previous snapshot becomes 
a parent, and the new
+snapshot is its child. It is possible to create a long chain of these 
parent/child snapshots,
+which amount to a "redo" record leading from the current state of the VM 
back to the
 original.
-  If you need more information about VM snapshots, check out the VMware 
documentation
-and the VMware Knowledge Base, especially
-http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180";>Understanding
 virtual machine snapshots.
+  This feature is supported on VMware and XenServer hypervisors.
+  If you need more information about VM snapshots, check out the VMware 
documentation and the
+VMware Knowledge Base, especially http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180";
+  >Understanding virtual machine snapshots.
   
 Limitations on VM Snapshots
 
-  If a VM has some stored snapshots, you can't attach new 
volume to the VM
-or delete any existing volumes.
-If you change the volumes on the VM, it would become impossible to 
restore the VM snapshot

git commit: CLOUDSTACK-5127

2013-11-11 Thread radhika

Updated Branches:
  refs/heads/master a25187df4 -> 6d37ecd94


CLOUDSTACK-5127


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/commit/6d37ecd9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/tree/6d37ecd9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs/diff/6d37ecd9

Branch: refs/heads/master
Commit: 6d37ecd949107f371b4ce158f8947273c1e3e484
Parents: a25187d
Author: Radhika PC 
Authored: Mon Nov 11 17:30:42 2013 +0530
Committer: Radhika PC 
Committed: Mon Nov 11 17:33:25 2013 +0530

--
 en-US/vm-snapshots.xml | 172 ++--
 1 file changed, 101 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6d37ecd9/en-US/vm-snapshots.xml
--
diff --git a/en-US/vm-snapshots.xml b/en-US/vm-snapshots.xml
index 3e72fe4..66d1823 100644
--- a/en-US/vm-snapshots.xml
+++ b/en-US/vm-snapshots.xml
@@ -1,5 +1,5 @@
 
-http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
 
 %BOOK_ENTITIES;
 ]>
@@ -23,58 +23,63 @@
 -->
 
   Virtual Machine Snapshots for VMware
-  (VMware hosts only)
-In addition to the existing &PRODUCT; ability to snapshot individual VM 
volumes,
-you can now take a VM snapshot to preserve all the VM's data volumes as 
well as (optionally) its CPU/memory state.
-This is useful for quick restore of a VM.
-For example, you can snapshot a VM, then make changes such as software 
upgrades.
-If anything goes wrong, simply restore the VM to its previous state using 
the previously saved VM snapshot.
-  
-  The snapshot is created using the VMware native snapshot facility. The 
VM snapshot
-includes not only the data volumes, but optionally also whether the VM is 
running or
-turned off (CPU state) and the memory contents. The snapshot is stored in 
&PRODUCT;'s
-primary storage.  
-  VM snapshots can have a parent/child relationship.
-Each successive snapshot of the same VM is the child of the snapshot that 
came before it.
-Each time you take an additional snapshot of the same VM, it saves only 
the differences
-between the current state of the VM and the state stored in the most 
recent previous snapshot.
-The previous snapshot becomes a parent, and the new snapshot is its child.
-It is possible to create a long chain of these parent/child snapshots,
-which amount to a "redo" record leading from the current state of the VM 
back to the 
+  In addition to the existing &PRODUCT; ability to snapshot individual VM
+volumes, you can now take a VM snapshot to preserve all the VM's data 
volumes as well as
+(optionally) its CPU/memory state. This is useful for quick restore of a 
VM. For example, you
+can snapshot a VM, then make changes such as software upgrades. If 
anything goes wrong, simply
+restore the VM to its previous state using the previously saved VM 
snapshot. 
+  The snapshot is created using the VMware native snapshot facility. The 
VM snapshot includes
+not only the data volumes, but optionally also whether the VM is running 
or turned off (CPU
+state) and the memory contents. The snapshot is stored in &PRODUCT;'s 
primary storage.
+  VM snapshots can have a parent/child relationship. Each successive 
snapshot of the same VM
+is the child of the snapshot that came before it. Each time you take an 
additional snapshot of
+the same VM, it saves only the differences between the current state of 
the VM and the state
+stored in the most recent previous snapshot. The previous snapshot becomes 
a parent, and the new
+snapshot is its child. It is possible to create a long chain of these 
parent/child snapshots,
+which amount to a "redo" record leading from the current state of the VM 
back to the
 original.
-  If you need more information about VM snapshots, check out the VMware 
documentation
-and the VMware Knowledge Base, especially
-http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180";>Understanding
 virtual machine snapshots.
+  This feature is supported on VMware and XenServer hypervisors.
+  If you need more information about VM snapshots, check out the VMware 
documentation and the
+VMware Knowledge Base, especially http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1015180";
+  >Understanding virtual machine snapshots.
   
 Limitations on VM Snapshots
 
-  If a VM has some stored snapshots, you can't attach new 
volume to the VM
-or delete any existing volumes.
-If you change the volumes on the VM, it would become impossible to 
restore the VM sn

Build failed in Jenkins: cloudstack-rat-master #3564

2013-11-11 Thread Apache Jenkins Server

See 

Changes:

[tsp] CLOUDSTACK-5121: There was one wrong initialization of 
cloudstackConnection.

[girish] Fixed few indentation errors and removed unwanted imports

[koushik] Template/ISO download fails cause the object to disappear from UI in 
4.2

[tsp] CLOUDSTACK-5080: Hypervisor Capabilities table missing entry for Simulator

[tsp] CLOUDSTACK-5124: Adopt GetDomRVersionAnswer to VR upgradability

[sateesh] CLOUDSTACK-4993 [VMware] When issuing detach ISO to Vcenter, MS 
should prevent Vcenter from posting Virtual Machine question dialog waiting for 
user response

[dhoogland] retrieving network might fail if it exists in a different datacentre

[devdeep] Fix the console proxy rdp client build breaking with java 6 and make 
it part of regular build.

[girish] Fixed a connection issue under asyncmgr.

--
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Building remotely on ubuntu2 in workspace 

Fetching changes from the remote Git repository
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
Checking out Revision aebbb15a64b3f2b96fc7b89be229f82116bd710d (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson5566474929316023901.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: service

[2/5] git commit: updated refs/heads/4.2 to 1c3b9b5

2013-11-11 Thread ahuang

Changed vm stats to be collected through the xs http connection


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e82e142b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e82e142b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e82e142b

Branch: refs/heads/4.2
Commit: e82e142b14bd8d806c70bca4ffc0a3e220795dd9
Parents: 5e44df6
Author: Alex Huang 
Authored: Mon Nov 11 02:24:35 2013 -0800
Committer: Alex Huang 
Committed: Mon Nov 11 08:24:03 2013 -0800

--
 .../xen/resource/CitrixResourceBase.java| 72 +++-
 1 file changed, 25 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e82e142b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 6c75835..e3dbdd8 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -25,7 +25,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -49,6 +48,7 @@ import java.util.UUID;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
@@ -57,6 +57,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import com.google.gson.Gson;
 import com.trilead.ssh2.SCPClient;
@@ -2803,41 +2804,16 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 /*
  * Note: 1 => called from host, hence host stats 2 => called from vm, 
hence vm stats
  */
-String stats = "";
+Document doc = null;
 
 try {
-if (flag == 1) {
-stats = getHostStatsRawXML(conn);
-}
-if (flag == 2) {
-stats = getVmStatsRawXML(conn);
-}
+doc = getStatsRawXML(conn, flag == 1 ? true : false);
 } catch (Exception e1) {
 s_logger.warn("Error whilst collecting raw stats from plugin: ", 
e1);
 return null;
 }
 
-// s_logger.debug("The raw xml stream is:"+stats);
-// s_logger.debug("Length of raw xml is:"+stats.length());
-
-//stats are null when the host plugin call fails (host down state)
-if(stats == null) {
-return null;
-}
-
-StringReader statsReader = new StringReader(stats);
-InputSource statsSource = new InputSource(statsReader);
-
-Document doc = null;
-try {
-doc = 
DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(statsSource);
-} catch (Exception e) {
-s_logger.warn("Exception caught whilst processing the document via 
document factory:", e);
-return null;
-}
-
-if(doc==null){
-s_logger.warn("Null document found after tryinh to parse the stats 
source");
+if (doc == null) { //stats are null when the host plugin call 
fails (host down state)
 return null;
 }
 
@@ -2908,45 +2884,47 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 
 }
 
-protected String getHostStatsRawXML(Connection conn) {
+protected Document getStatsRawXML(Connection conn, boolean host) {
 Date currentDate = new Date();
 String urlStr = "http://"; + _host.ip + "/rrd_updates?";
 urlStr += "session_id=" + conn.getSessionReference();
-urlStr += "&host=" + "true";
+urlStr += "&host=" + (host ? "true" : "false");
 urlStr += "&cf=" + _consolidationFunction;
 urlStr += "&interval=" + _pollingIntervalInSeconds;
 urlStr += "&start=" + (currentDate.getTime() / 1000 - 1000 - 100);
 
 URL url;
+BufferedReader in = null;
 try {
 url = new URL(urlStr);
 url.openConnection();
 URLConnection uc = url.openConnection();
-BufferedReader in = new BufferedReader(new 
InputStreamReader(uc.getInputStream()));
-StringBuilder buff = new Str

[5/5] git commit: updated refs/heads/4.2 to 1c3b9b5

2013-11-11 Thread ahuang

Accidentally checked in the wrong file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c3b9b53
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c3b9b53
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c3b9b53

Branch: refs/heads/4.2
Commit: 1c3b9b53fe0c1455b783e1cdd21768a0a9b734cb
Parents: c0602d6
Author: Alex Huang 
Authored: Mon Nov 11 05:48:01 2013 -0800
Committer: Alex Huang 
Committed: Mon Nov 11 08:24:05 2013 -0800

--
 .../hypervisor/xenserver/xenserver60/NFSSR.py   | 64 +++-
 1 file changed, 35 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c3b9b53/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py
--
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py 
b/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py
index d0c98a1..0d6badb 100755
--- a/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py
@@ -1,16 +1,21 @@
 #!/usr/bin/python
-# Copyright (C) 2006-2007 XenSource Ltd.
-# Copyright (C) 2008-2009 Citrix Ltd.
-#
-# This program is free software; you can redistribute it and/or modify 
-# it under the terms of the GNU Lesser General Public License as published 
-# by the Free Software Foundation; version 2.1 only.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-# GNU Lesser General Public License for more details.
-#
+# 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.
+
 # FileSR: local-file storage repository
 
 import SR, VDI, SRCommand, FileSR, util
@@ -37,8 +42,8 @@ CONFIGURATION = [ [ 'server', 'hostname or IP address of NFS 
server (required)'
 DRIVER_INFO = {
 'name': 'NFS VHD',
 'description': 'SR plugin which stores disks as VHD files on a remote NFS 
filesystem',
-'vendor': 'Citrix Systems Inc',
-'copyright': '(C) 2008 Citrix Systems Inc',
+'vendor': 'The Apache Software Foundation',
+'copyright': 'Copyright (c) 2012 The Apache Software Foundation',
 'driver_version': '1.0',
 'required_api_version': '1.0',
 'capabilities': CAPABILITIES,
@@ -107,7 +112,8 @@ class NFSSR(FileSR.FileSR):
 
 def attach(self, sr_uuid):
 self.validate_remotepath(False)
-self.remotepath = os.path.join(self.dconf['serverpath'], sr_uuid)
+#self.remotepath = os.path.join(self.dconf['serverpath'], sr_uuid)
+self.remotepath = self.dconf['serverpath']
 util._testHost(self.dconf['server'], NFSPORT, 'NFSTarget')
 self.mount_remotepath(sr_uuid)
 
@@ -175,20 +181,20 @@ class NFSSR(FileSR.FileSR):
 pass
 raise exn
 
-newpath = os.path.join(self.path, sr_uuid)
-if util.ioretry(lambda: util.pathexists(newpath)):
-if len(util.ioretry(lambda: util.listdir(newpath))) != 0:
-self.detach(sr_uuid)
-raise xs_errors.XenError('SRExists')
-else:
-try:
-util.ioretry(lambda: util.makedirs(newpath))
-except util.CommandException, inst:
-if inst.code != errno.EEXIST:
-self.detach(sr_uuid)
-raise xs_errors.XenError('NFSCreate', 
-opterr='remote directory creation error is %d' 
-% inst.code)
+#newpath = os.path.join(self.path, sr_uuid)
+#if util.ioretry(lambda: util.pathexists(newpath)):
+#if len(util.ioretry(lambda: util.listdir(newpath))) != 0:
+#self.detach(sr_uuid)
+#raise xs_errors.XenError('SRExists')
+#else:
+#try:
+#util.ioretry(lambda: util.makedirs(newpath))
+#except util.CommandException, inst:
+#if inst.code != errno.EEXIST:
+#self.detac

[4/5] git commit: updated refs/heads/4.2 to 1c3b9b5

2013-11-11 Thread ahuang

Removed the hostvmstats method call from the xs plugin vmops in xcposs


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0602d66
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0602d66
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0602d66

Branch: refs/heads/4.2
Commit: c0602d661a53d751056e6ebf4d6cc5a61918bf00
Parents: eb19545
Author: Alex Huang 
Authored: Mon Nov 11 02:28:22 2013 -0800
Committer: Alex Huang 
Committed: Mon Nov 11 08:24:04 2013 -0800

--
 scripts/vm/hypervisor/xenserver/xcposs/vmops | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0602d66/scripts/vm/hypervisor/xenserver/xcposs/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops 
b/scripts/vm/hypervisor/xenserver/xcposs/vmops
index c5a9f94..2f6441a 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/vmops
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops
@@ -24,7 +24,6 @@ import os, sys, time
 import XenAPIPlugin
 sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
 import base64
-import hostvmstats
 import socket
 import stat
 import tempfile
@@ -43,15 +42,6 @@ def echo(fn):
 return wrapped
 
 @echo
-def gethostvmstats(session, args):
-collect_host_stats = args['collectHostStats']
-consolidation_function = args['consolidationFunction']
-interval = args['interval']
-start_time = args['startTime']
-result = hostvmstats.get_stats(session, collect_host_stats, 
consolidation_function, interval, start_time)
-return result
-
-@echo
 def setup_iscsi(session, args):
uuid=args['uuid']
try:
@@ -1470,7 +1460,7 @@ def getDomRVersion(session, args):
 return txt
 
 if __name__ == "__main__":
- XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, 
"gethostvmstats": gethostvmstats, 
+ XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi,  
 "getgateway": getgateway, "preparemigration": 
preparemigration, 
 "setIptables": setIptables, "pingdomr": pingdomr, 
"pingxenserver": pingxenserver,  
 "ipassoc": ipassoc, "savePassword": savePassword,

[3/5] git commit: updated refs/heads/4.2 to 1c3b9b5

2013-11-11 Thread ahuang

Removed the hostvmstats.py file from the scripts and from all of patch files 
and from vmops


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb19545d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb19545d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb19545d

Branch: refs/heads/4.2
Commit: eb19545dc0f601cd87e68698e8dc71f31080696c
Parents: e82e142
Author: Alex Huang 
Authored: Mon Nov 11 02:27:13 2013 -0800
Committer: Alex Huang 
Committed: Mon Nov 11 08:24:04 2013 -0800

--
 scripts/vm/hypervisor/xenserver/hostvmstats.py  | 52 
 scripts/vm/hypervisor/xenserver/vmops   | 12 +
 .../vm/hypervisor/xenserver/xenserver56/patch   |  1 -
 .../hypervisor/xenserver/xenserver56fp1/patch   |  1 -
 .../vm/hypervisor/xenserver/xenserver60/patch   |  1 -
 5 files changed, 1 insertion(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/hostvmstats.py
--
diff --git a/scripts/vm/hypervisor/xenserver/hostvmstats.py 
b/scripts/vm/hypervisor/xenserver/hostvmstats.py
deleted file mode 100644
index 38609b1..000
--- a/scripts/vm/hypervisor/xenserver/hostvmstats.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-# 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.
-# $Id: hostvmstats.py 10054 2010-06-29 22:09:31Z abhishek $ $HeadURL: 
svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/hypervisor/xenserver/hostvmstats.py
 $
-
-import XenAPI
-import urllib
-import time
-import logging
-logging.basicConfig(filename='/tmp/xapilog',level=logging.DEBUG)
-  
-def get_stats(session, collect_host_stats, consolidation_function, interval, 
start_time):
-  try:
-
-if collect_host_stats == "true" :
-   url = "http://localhost/rrd_updates?";
-   url += "session_id=" + session._session
-   url += "&host=" + collect_host_stats
-   url += "&cf=" + consolidation_function
-   url += "&interval=" + str(interval)
-   url += "&start=" + str(int(time.time())-100)
-else :
-   url = "http://localhost/rrd_updates?";
-   url += "session_id=" + session._session
-   url += "&host=" + collect_host_stats
-   url += "&cf=" + consolidation_function
-   url += "&interval=" + str(interval)
-   url += "&start=" + str(int(time.time())-100)
-
-logging.debug("Calling URL: %s",url)
-sock = urllib.URLopener().open(url)
-xml = sock.read()
-sock.close()
-logging.debug("Size of returned XML: %s",len(xml))
-return xml
-  except Exception,e:
-logging.exception("get_stats() failed")
-raise

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index 3f11960..48ca422 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -24,7 +24,6 @@ import os, sys, time
 import XenAPIPlugin
 sys.path.extend(["/opt/xensource/sm/", "/usr/local/sbin/", "/sbin/"])
 import base64
-import hostvmstats
 import socket
 import stat
 import tempfile
@@ -55,15 +54,6 @@ def add_to_VCPUs_params_live(session, args):
 return 'true'
 
 @echo
-def gethostvmstats(session, args):
-collect_host_stats = args['collectHostStats']
-consolidation_function = args['consolidationFunction']
-interval = args['interval']
-start_time = args['startTime']
-result = hostvmstats.get_stats(session, collect_host_stats, 
consolidation_function, interval, start_time)
-return result
-
-@echo
 def setup_iscsi(session, args):
uuid=args['uuid']
try:
@@ -1629,7 +1619,7 @@ def bumpUpPriority(session, args):
 
 
 if __name__ == "__main__":
- XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, 
"gethostvmstats": gethostvmstats, 
+ XenAPIPlugin.dispatch({"pingte

[1/5] git commit: updated refs/heads/4.2 to 1c3b9b5

2013-11-11 Thread ahuang

Updated Branches:
  refs/heads/4.2 7d02c71ff -> 1c3b9b53f


Changed host stats to be collected through the http connection


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e44df6d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e44df6d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e44df6d

Branch: refs/heads/4.2
Commit: 5e44df6de55fdee6302bc567339cb1e5bbdd5254
Parents: 7d02c71
Author: Alex Huang 
Authored: Mon Nov 11 01:57:15 2013 -0800
Committer: Alex Huang 
Committed: Mon Nov 11 08:24:02 2013 -0800

--
 .../xen/resource/CitrixResourceBase.java| 249 ++-
 .../hypervisor/xenserver/xenserver60/NFSSR.py   |  64 +++--
 2 files changed, 167 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e44df6d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index bd04e02..6c75835 100644
--- 
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -11,11 +11,93 @@
 // 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 
+// KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
 package com.cloud.hypervisor.xen.resource;
 
+import static com.cloud.utils.ReflectUtil.flattenProperties;
+import static com.google.common.collect.Lists.newArrayList;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.ejb.Local;
+import javax.naming.ConfigurationException;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+import org.apache.xmlrpc.XmlRpcException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import com.google.gson.Gson;
+import com.trilead.ssh2.SCPClient;
+import com.xensource.xenapi.Bond;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Console;
+import com.xensource.xenapi.Host;
+import com.xensource.xenapi.HostCpu;
+import com.xensource.xenapi.HostMetrics;
+import com.xensource.xenapi.Network;
+import com.xensource.xenapi.PBD;
+import com.xensource.xenapi.PIF;
+import com.xensource.xenapi.PIF.Record;
+import com.xensource.xenapi.Pool;
+import com.xensource.xenapi.SR;
+import com.xensource.xenapi.Session;
+import com.xensource.xenapi.Task;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.Types.BadAsyncResult;
+import com.xensource.xenapi.Types.BadServerResponse;
+import com.xensource.xenapi.Types.ConsoleProtocol;
+import com.xensource.xenapi.Types.IpConfigurationMode;
+import com.xensource.xenapi.Types.OperationNotAllowed;
+import com.xensource.xenapi.Types.SrFull;
+import com.xensource.xenapi.Types.VbdType;
+import com.xensource.xenapi.Types.VmBadPowerState;
+import com.xensource.xenapi.Types.VmPowerState;
+import com.xensource.xenapi.Types.XenAPIException;
+import com.xensource.xenapi.VBD;
+import com.xensource.xenapi.VBDMetrics;
+import com.xensource.xenapi.VDI;
+import com.xensource.xenapi.VIF;
+import com.xensource.xenapi.VLAN;
+import com.xensource.xenapi.VM;
+import com.xensource.xenapi.VMGuestMetrics;
+import com.xensource.xenapi.XenAPIObject;
+
+import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
+import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+
 import com.cloud.agent.IAgentControl;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.AttachIsoComma

git commit: updated refs/heads/4.2 to 3855922

2013-11-11 Thread weizhou

Updated Branches:
  refs/heads/4.2 1c3b9b53f -> 385592237


Remove cloudmanagementserver.keystore from installation


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38559223
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38559223
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38559223

Branch: refs/heads/4.2
Commit: 38559223780fa0471f9b497102c3c727ae47382f
Parents: 1c3b9b5
Author: Wei Zhou 
Authored: Mon Nov 11 18:10:06 2013 +0100
Committer: Wei Zhou 
Committed: Mon Nov 11 18:10:06 2013 +0100

--
 debian/cloudstack-management.install | 1 -
 packaging/centos63/cloud.spec| 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38559223/debian/cloudstack-management.install
--
diff --git a/debian/cloudstack-management.install 
b/debian/cloudstack-management.install
index a1325cd..ff461c6 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -17,7 +17,6 @@
 
 /etc/cloudstack/management/catalina.policy
 /etc/cloudstack/management/catalina.properties
-/etc/cloudstack/management/cloudmanagementserver.keystore
 /etc/cloudstack/management/logging.properties
 /etc/cloudstack/management/commands.properties
 /etc/cloudstack/management/ehcache.xml

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38559223/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 8f47ebb..cef197e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -266,7 +266,7 @@ rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
 for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf 
server-ssl.xml server-nonssl.xml \
-catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties cloudmanagementserver.keystore 
; do
+catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties ; do
   mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -465,7 +465,6 @@ else
 fi
 
 if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then
-mv %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore.rpmnew
 cp -p %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 # make sure we only do this on the first install of this RPM, don't want 
to overwrite on a reinstall
 mv %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore.rpmsave
@@ -561,7 +560,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
-%config(noreplace) 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 %attr(0755,root,root) %{_initrddir}/%{name}-management
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses

git commit: updated refs/heads/master to eb4c52e

2013-11-11 Thread weizhou

Updated Branches:
  refs/heads/master aebbb15a6 -> eb4c52ebc


Remove cloudmanagementserver.keystore from installation
(cherry picked from commit 38559223780fa0471f9b497102c3c727ae47382f)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb4c52eb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb4c52eb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb4c52eb

Branch: refs/heads/master
Commit: eb4c52ebca6d142a27e0b8eff5cf1c09ddf52bf9
Parents: aebbb15
Author: Wei Zhou 
Authored: Mon Nov 11 18:10:06 2013 +0100
Committer: Wei Zhou 
Committed: Mon Nov 11 18:11:06 2013 +0100

--
 debian/cloudstack-management.install | 1 -
 packaging/centos63/cloud.spec| 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb4c52eb/debian/cloudstack-management.install
--
diff --git a/debian/cloudstack-management.install 
b/debian/cloudstack-management.install
index f06ab86..ea3f93b 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -17,7 +17,6 @@
 
 /etc/cloudstack/management/catalina.policy
 /etc/cloudstack/management/catalina.properties
-/etc/cloudstack/management/cloudmanagementserver.keystore
 /etc/cloudstack/management/logging.properties
 /etc/cloudstack/management/commands.properties
 /etc/cloudstack/management/ehcache.xml

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb4c52eb/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index cd6ff4b..893628d 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -252,7 +252,7 @@ rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
 for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf 
server-ssl.xml server-nonssl.xml \
-catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties cloudmanagementserver.keystore 
; do
+catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties ; do
   mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -451,7 +451,6 @@ else
 fi
 
 if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then
-mv %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore.rpmnew
 cp -p %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 # make sure we only do this on the first install of this RPM, don't want 
to overwrite on a reinstall
 mv %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore.rpmsave
@@ -546,7 +545,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
-%config(noreplace) 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 %attr(0755,root,root) %{_initrddir}/%{name}-management
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses

git commit: updated refs/heads/4.3 to b1c02b4

2013-11-11 Thread weizhou

Updated Branches:
  refs/heads/4.3 aeb5ec07c -> b1c02b475


Remove cloudmanagementserver.keystore from installation
(cherry picked from commit 38559223780fa0471f9b497102c3c727ae47382f)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b1c02b47
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1c02b47
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1c02b47

Branch: refs/heads/4.3
Commit: b1c02b4755b9b463516149bf2aa188a759704fd2
Parents: aeb5ec0
Author: Wei Zhou 
Authored: Mon Nov 11 18:10:06 2013 +0100
Committer: Wei Zhou 
Committed: Mon Nov 11 18:12:28 2013 +0100

--
 debian/cloudstack-management.install | 1 -
 packaging/centos63/cloud.spec| 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1c02b47/debian/cloudstack-management.install
--
diff --git a/debian/cloudstack-management.install 
b/debian/cloudstack-management.install
index f06ab86..ea3f93b 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -17,7 +17,6 @@
 
 /etc/cloudstack/management/catalina.policy
 /etc/cloudstack/management/catalina.properties
-/etc/cloudstack/management/cloudmanagementserver.keystore
 /etc/cloudstack/management/logging.properties
 /etc/cloudstack/management/commands.properties
 /etc/cloudstack/management/ehcache.xml

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1c02b47/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index cd6ff4b..893628d 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -252,7 +252,7 @@ rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 rm -rf 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
 
 for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf 
server-ssl.xml server-nonssl.xml \
-catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties cloudmanagementserver.keystore 
; do
+catalina.policy catalina.properties classpath.conf 
tomcat-users.xml web.xml environment.properties ; do
   mv 
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 \
 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -451,7 +451,6 @@ else
 fi
 
 if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then
-mv %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore.rpmnew
 cp -p %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 # make sure we only do this on the first install of this RPM, don't want 
to overwrite on a reinstall
 mv %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore 
%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore.rpmsave
@@ -546,7 +545,6 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
-%config(noreplace) 
%{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
 %attr(0755,root,root) %{_initrddir}/%{name}-management
 %attr(0755,root,root) %{_bindir}/%{name}-setup-management
 %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses

git commit: updated refs/heads/master to 4f0dbaa

2013-11-11 Thread alena1108

Updated Branches:
  refs/heads/master eb4c52ebc -> 4f0dbaa44


Added log directory to .gitignore


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f0dbaa4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f0dbaa4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f0dbaa4

Branch: refs/heads/master
Commit: 4f0dbaa44a085a0a515735cdd0c9c2b02ee16737
Parents: eb4c52e
Author: Alena Prokharchyk 
Authored: Mon Nov 11 09:15:53 2013 -0800
Committer: Alena Prokharchyk 
Committed: Mon Nov 11 09:15:53 2013 -0800

--
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f0dbaa4/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 5efa7bb..8e3b052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+G# 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
@@ -83,3 +83,5 @@ build-indep-stamp
 configure-stamp
 *_flymake.js
 engine/storage/integration-test/test-output
+tools/apidoc/log/
+log/

git commit: updated refs/heads/4.2 to 53eb469

2013-11-11 Thread edison

Updated Branches:
  refs/heads/4.2 385592237 -> 53eb46990


CLOUDSTACK-4907: handle create snapshot, when primary storage is not in up state


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53eb4699
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53eb4699
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53eb4699

Branch: refs/heads/4.2
Commit: 53eb469901ee742aabc8264009fb0061d38eaead
Parents: 3855922
Author: Edison Su 
Authored: Mon Nov 11 13:08:25 2013 -0800
Committer: Edison Su 
Committed: Mon Nov 11 13:08:25 2013 -0800

--
 .../command/user/snapshot/CreateSnapshotCmd.java|  1 +
 .../snapshot/SnapshotStateMachineManagerImpl.java   |  1 +
 .../storage/snapshot/XenserverSnapshotStrategy.java | 10 ++
 .../storage/volume/VolumeServiceImpl.java   |  4 
 .../cloud/storage/snapshot/SnapshotManagerImpl.java | 16 ++--
 5 files changed, 10 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53eb4699/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
index 73a7fc4..32f99a4 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
@@ -176,6 +176,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, 
"Failed to create snapshot due to an internal error creating snapshot for 
volume " + volumeId);
 }
 } catch (Exception e) {
+s_logger.debug("Failed to create snapshot", e);
 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed 
to create snapshot due to an internal error creating snapshot for volume " + 
volumeId);
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53eb4699/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
--
diff --git 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
index 555dcb8..32656bd 100644
--- 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
+++ 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
@@ -51,6 +51,7 @@ public class SnapshotStateMachineManagerImpl implements 
SnapshotStateMachineMana
 stateMachine.addTransition(Snapshot.State.Copying, 
Event.OperationFailed, Snapshot.State.BackedUp);
 stateMachine.addTransition(Snapshot.State.Destroying, 
Event.OperationSucceeded, Snapshot.State.Destroyed);
 stateMachine.addTransition(Snapshot.State.Destroying, 
Event.OperationFailed, State.BackedUp);
+stateMachine.addTransition(Snapshot.State.Allocated, 
Event.OperationFailed, State.Error);
 
 stateMachine.registerListener(new SnapshotStateListener());
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53eb4699/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
--
diff --git 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
index a58abab..3d004fe 100644
--- 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
+++ 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
@@ -18,7 +18,7 @@ package org.apache.cloudstack.storage.snapshot;
 
 import javax.inject.Inject;
 
-import com.cloud.storage.Volume;
+import com.cloud.storage.*;
 import com.cloud.utils.db.DB;
 import org.apache.cloudstack.engine.subsystem.api.storage.*;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
@@ -32,9 +32,6 @@ import org.springframework.stereotype.Component;
 
 import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.storage.DataStoreRole;
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.dao.Snap

git commit: updated refs/heads/4.3 to a888a69

2013-11-11 Thread mchen

Updated Branches:
  refs/heads/4.3 b1c02b475 -> a888a6950


Delay in displaying VM migrate dialog due to get vm snapshot size for a
storage pool.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a888a695
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a888a695
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a888a695

Branch: refs/heads/4.3
Commit: a888a6950a771eb4b593f0f7136dc14451335007
Parents: b1c02b4
Author: Min Chen 
Authored: Mon Nov 11 14:29:24 2013 -0800
Committer: Min Chen 
Committed: Mon Nov 11 14:29:24 2013 -0800

--
 .../src/com/cloud/storage/dao/VolumeDao.java|  2 ++
 .../com/cloud/storage/dao/VolumeDaoImpl.java| 24 
 .../com/cloud/capacity/CapacityManagerImpl.java | 17 ++
 3 files changed, 28 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a888a695/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java 
b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
index 1f5083a..24ade51 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
@@ -37,6 +37,8 @@ public interface VolumeDao extends GenericDao, StateDao getNonDestroyedCountAndTotalByPool(long poolId);
 
+long getVMSnapshotSizeByPool(long poolId);
+
 List findByInstance(long id);
 
 List findByInstanceAndType(long id, Volume.Type vType);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a888a695/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java 
b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 54b6465..2fb9dba 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -59,6 +59,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol
 protected final SearchBuilder DetachedAccountIdSearch;
 protected final SearchBuilder TemplateZoneSearch;
 protected final GenericSearchBuilder 
TotalSizeByPoolSearch;
+protected final GenericSearchBuilder 
TotalVMSnapshotSizeByPoolSearch;
 protected final GenericSearchBuilder ActiveTemplateSearch;
 protected final SearchBuilder InstanceStatesSearch;
 protected final SearchBuilder AllFieldsSearch;
@@ -316,6 +317,15 @@ public class VolumeDaoImpl extends 
GenericDaoBase implements Vol
 TotalSizeByPoolSearch.and("state", 
TotalSizeByPoolSearch.entity().getState(), Op.NEQ);
 TotalSizeByPoolSearch.done();
 
+TotalVMSnapshotSizeByPoolSearch = createSearchBuilder(SumCount.class);
+TotalVMSnapshotSizeByPoolSearch.select("sum", Func.SUM, 
TotalVMSnapshotSizeByPoolSearch.entity().getVmSnapshotChainSize());
+TotalVMSnapshotSizeByPoolSearch.and("poolId", 
TotalVMSnapshotSizeByPoolSearch.entity().getPoolId(), Op.EQ);
+TotalVMSnapshotSizeByPoolSearch.and("removed", 
TotalVMSnapshotSizeByPoolSearch.entity().getRemoved(), Op.NULL);
+TotalVMSnapshotSizeByPoolSearch.and("state", 
TotalVMSnapshotSizeByPoolSearch.entity().getState(), Op.NEQ);
+TotalVMSnapshotSizeByPoolSearch.and("vType", 
TotalVMSnapshotSizeByPoolSearch.entity().getVolumeType(), Op.EQ);
+TotalVMSnapshotSizeByPoolSearch.and("instanceId", 
TotalVMSnapshotSizeByPoolSearch.entity().getInstanceId(), Op.NNULL);
+TotalVMSnapshotSizeByPoolSearch.done();
+
 ActiveTemplateSearch = createSearchBuilder(Long.class);
 ActiveTemplateSearch.and("pool", 
ActiveTemplateSearch.entity().getPoolId(), Op.EQ);
 ActiveTemplateSearch.and("template", 
ActiveTemplateSearch.entity().getTemplateId(), Op.EQ);
@@ -517,6 +527,20 @@ public class VolumeDaoImpl extends 
GenericDaoBase implements Vol
 }
 
 @Override
+public long getVMSnapshotSizeByPool(long poolId) {
+SearchCriteria sc = TotalVMSnapshotSizeByPoolSearch.create();
+sc.setParameters("poolId", poolId);
+sc.setParameters("state", State.Destroy);
+sc.setParameters("vType", Volume.Type.ROOT.toString());
+List results = customSearch(sc, null);
+if (results != null) {
+return results.get(0).sum;
+} else {
+return 0;
+}
+}
+
+@Override
 @DB
 public boolean remove(Long id) {
 TransactionLegacy txn = TransactionLegacy.currentTxn();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a888a695/server/src/com/cloud/capacity/CapacityManagerImpl.java

git commit: updated refs/heads/master to 8b7b7a0

2013-11-11 Thread mchen

Updated Branches:
  refs/heads/master 4f0dbaa44 -> 8b7b7a041


Delay in displaying VM migrate dialog due to get vm snapshot size for a
storage pool.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b7b7a04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b7b7a04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b7b7a04

Branch: refs/heads/master
Commit: 8b7b7a041dc4022972d02f796ae070b99bbf63dc
Parents: 4f0dbaa
Author: Min Chen 
Authored: Mon Nov 11 14:29:24 2013 -0800
Committer: Min Chen 
Committed: Mon Nov 11 14:40:16 2013 -0800

--
 .../src/com/cloud/storage/dao/VolumeDao.java|  2 ++
 .../com/cloud/storage/dao/VolumeDaoImpl.java| 24 
 .../com/cloud/capacity/CapacityManagerImpl.java | 17 ++
 3 files changed, 28 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b7b7a04/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java 
b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
index 1f5083a..24ade51 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
@@ -37,6 +37,8 @@ public interface VolumeDao extends GenericDao, StateDao getNonDestroyedCountAndTotalByPool(long poolId);
 
+long getVMSnapshotSizeByPool(long poolId);
+
 List findByInstance(long id);
 
 List findByInstanceAndType(long id, Volume.Type vType);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b7b7a04/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java 
b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 54b6465..2fb9dba 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -59,6 +59,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol
 protected final SearchBuilder DetachedAccountIdSearch;
 protected final SearchBuilder TemplateZoneSearch;
 protected final GenericSearchBuilder 
TotalSizeByPoolSearch;
+protected final GenericSearchBuilder 
TotalVMSnapshotSizeByPoolSearch;
 protected final GenericSearchBuilder ActiveTemplateSearch;
 protected final SearchBuilder InstanceStatesSearch;
 protected final SearchBuilder AllFieldsSearch;
@@ -316,6 +317,15 @@ public class VolumeDaoImpl extends 
GenericDaoBase implements Vol
 TotalSizeByPoolSearch.and("state", 
TotalSizeByPoolSearch.entity().getState(), Op.NEQ);
 TotalSizeByPoolSearch.done();
 
+TotalVMSnapshotSizeByPoolSearch = createSearchBuilder(SumCount.class);
+TotalVMSnapshotSizeByPoolSearch.select("sum", Func.SUM, 
TotalVMSnapshotSizeByPoolSearch.entity().getVmSnapshotChainSize());
+TotalVMSnapshotSizeByPoolSearch.and("poolId", 
TotalVMSnapshotSizeByPoolSearch.entity().getPoolId(), Op.EQ);
+TotalVMSnapshotSizeByPoolSearch.and("removed", 
TotalVMSnapshotSizeByPoolSearch.entity().getRemoved(), Op.NULL);
+TotalVMSnapshotSizeByPoolSearch.and("state", 
TotalVMSnapshotSizeByPoolSearch.entity().getState(), Op.NEQ);
+TotalVMSnapshotSizeByPoolSearch.and("vType", 
TotalVMSnapshotSizeByPoolSearch.entity().getVolumeType(), Op.EQ);
+TotalVMSnapshotSizeByPoolSearch.and("instanceId", 
TotalVMSnapshotSizeByPoolSearch.entity().getInstanceId(), Op.NNULL);
+TotalVMSnapshotSizeByPoolSearch.done();
+
 ActiveTemplateSearch = createSearchBuilder(Long.class);
 ActiveTemplateSearch.and("pool", 
ActiveTemplateSearch.entity().getPoolId(), Op.EQ);
 ActiveTemplateSearch.and("template", 
ActiveTemplateSearch.entity().getTemplateId(), Op.EQ);
@@ -517,6 +527,20 @@ public class VolumeDaoImpl extends 
GenericDaoBase implements Vol
 }
 
 @Override
+public long getVMSnapshotSizeByPool(long poolId) {
+SearchCriteria sc = TotalVMSnapshotSizeByPoolSearch.create();
+sc.setParameters("poolId", poolId);
+sc.setParameters("state", State.Destroy);
+sc.setParameters("vType", Volume.Type.ROOT.toString());
+List results = customSearch(sc, null);
+if (results != null) {
+return results.get(0).sum;
+} else {
+return 0;
+}
+}
+
+@Override
 @DB
 public boolean remove(Long id) {
 TransactionLegacy txn = TransactionLegacy.currentTxn();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b7b7a04/server/src/com/cloud/capacity/CapacityManagerImpl.java
-

git commit: updated refs/heads/4.2 to 2814d23

2013-11-11 Thread alena1108

Updated Branches:
  refs/heads/4.2 53eb46990 -> 2814d2360


CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 
4.2-4.2.1 upgrade path


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2814d236
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2814d236
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2814d236

Branch: refs/heads/4.2
Commit: 2814d2360e13bb907bc21776094a5be5655c0aec
Parents: 53eb469
Author: Alena Prokharchyk 
Authored: Mon Nov 11 16:29:22 2013 -0800
Committer: Alena Prokharchyk 
Committed: Mon Nov 11 16:29:22 2013 -0800

--
 setup/db/db/schema-420to421.sql | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2814d236/setup/db/db/schema-420to421.sql
--
diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql
index baadbda..1d28485 100644
--- a/setup/db/db/schema-420to421.sql
+++ b/setup/db/db/schema-420to421.sql
@@ -223,3 +223,4 @@ update  `cloud`.`volumes` v,  `cloud`.`volume_host_ref` vhr 
 set v.format=vhr.fo
 
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option 
specified in -I option of impitool. candidates are: 
open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default 
valule "default" means using default option of ipmitool');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface 
will be temporary out of order after power opertions(e.g. cycle, on), it leads 
following commands fail immediately. The value specifies retry times before 
accounting it as real failure");
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout 
in seconds');

git commit: updated refs/heads/4.3 to 9e92206

2013-11-11 Thread alena1108

Updated Branches:
  refs/heads/4.3 a888a6950 -> 9e92206e6


CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 
4.2-4.2.1 upgrade path

Conflicts:
setup/db/db/schema-420to421.sql


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e92206e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e92206e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e92206e

Branch: refs/heads/4.3
Commit: 9e92206e640faf067647a74e55cdbe9707140d71
Parents: a888a69
Author: Alena Prokharchyk 
Authored: Mon Nov 11 16:29:22 2013 -0800
Committer: Alena Prokharchyk 
Committed: Mon Nov 11 16:30:58 2013 -0800

--
 setup/db/db/schema-420to421.sql | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e92206e/setup/db/db/schema-420to421.sql
--
diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql
index d429b30..1d28485 100644
--- a/setup/db/db/schema-420to421.sql
+++ b/setup/db/db/schema-420to421.sql
@@ -221,3 +221,6 @@ CREATE VIEW `cloud`.`user_vm_view` AS
 update  `cloud`.`volumes` v,  `cloud`.`volume_host_ref` vhr  set 
v.format=vhr.format where v.id=vhr.volume_id and v.format is null;
 
 
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option 
specified in -I option of impitool. candidates are: 
open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default 
valule "default" means using default option of ipmitool');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface 
will be temporary out of order after power opertions(e.g. cycle, on), it leads 
following commands fail immediately. The value specifies retry times before 
accounting it as real failure");
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout 
in seconds');

[1/2] git commit: updated refs/heads/master to 04884b8

2013-11-11 Thread alena1108

Updated Branches:
  refs/heads/master 8b7b7a041 -> 04884b8f0


ListPortFowardingRules: added networkId to the list of optional parameters to 
list by


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/268c27b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/268c27b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/268c27b4

Branch: refs/heads/master
Commit: 268c27b4f22b3818a54271a4484f47cfa1f8075d
Parents: 8b7b7a0
Author: Alena Prokharchyk 
Authored: Mon Nov 11 10:11:13 2013 -0800
Committer: Alena Prokharchyk 
Committed: Mon Nov 11 16:17:43 2013 -0800

--
 .../user/firewall/ListPortForwardingRulesCmd.java   |  9 +
 .../cloudstack/api/response/FirewallRuleResponse.java   |  7 +++
 server/src/com/cloud/api/ApiResponseHelper.java |  3 +++
 .../src/com/cloud/network/rules/RulesManagerImpl.java   | 12 +---
 4 files changed, 28 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/268c27b4/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
index 9fd4e45..7e96e0b 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
@@ -26,6 +26,7 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.FirewallRuleResponse;
 import org.apache.cloudstack.api.response.IPAddressResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.log4j.Logger;
 
 import com.cloud.network.rules.PortForwardingRule;
@@ -48,6 +49,10 @@ public class ListPortForwardingRulesCmd extends 
BaseListTaggedResourcesCmd {
 @Parameter(name=ApiConstants.IP_ADDRESS_ID, type=CommandType.UUID, 
entityType = IPAddressResponse.class,
 description="the id of IP address of the port forwarding services")
 private Long ipAddressId;
+
+@Parameter(name=ApiConstants.NETWORK_ID, type=CommandType.UUID, entityType 
= NetworkResponse.class,
+description="list port forwarding rules for ceratin network", 
since="4.3")
+private Long networkId;
 
 /
 /// Accessors ///
@@ -60,6 +65,10 @@ public class ListPortForwardingRulesCmd extends 
BaseListTaggedResourcesCmd {
 public Long getId() {
 return id;
 }
+
+public Long getNetworkId() {
+return networkId;
+}
 
 /
 /// API Implementation///

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/268c27b4/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java 
b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
index 787410a..20ea407 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java
@@ -73,6 +73,9 @@ public class FirewallRuleResponse extends BaseResponse {
 
 @SerializedName(ApiConstants.VM_GUEST_IP) @Param(description="the vm ip 
address for the port forwarding rule")
 private String destNatVmIp;
+
+@SerializedName(ApiConstants.NETWORK_ID) @Param(description="the id of the 
guest network the port forwarding rule belongs to")
+private String networkId;
 
 
 public String getDestNatVmIp() {
@@ -196,4 +199,8 @@ public class FirewallRuleResponse extends BaseResponse {
 public void setTags(List tags) {
 this.tags = tags;
 }
+
+public void setNetworkId(String networkId) {
+this.networkId = networkId;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/268c27b4/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 f70af5f..89c951c 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1023,6 +1023,9 @@ public class ApiResponseHelper implements 
ResponseGenerator {
 response.setPublicEndPort(Integer.toString(fwRule.getSour

[2/2] git commit: updated refs/heads/master to 04884b8

2013-11-11 Thread alena1108

CLOUDSTACK-5084: added missing global config vmware.hung.wokervm.timeout to the 
4.2-4.2.1 upgrade path

Conflicts:
setup/db/db/schema-420to421.sql


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04884b8f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04884b8f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04884b8f

Branch: refs/heads/master
Commit: 04884b8f047d7dd6a6a881209b4d0af4e2279e3e
Parents: 268c27b
Author: Alena Prokharchyk 
Authored: Mon Nov 11 16:29:22 2013 -0800
Committer: Alena Prokharchyk 
Committed: Mon Nov 11 16:32:48 2013 -0800

--
 setup/db/db/schema-420to421.sql | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04884b8f/setup/db/db/schema-420to421.sql
--
diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql
index d429b30..1d28485 100644
--- a/setup/db/db/schema-420to421.sql
+++ b/setup/db/db/schema-420to421.sql
@@ -221,3 +221,6 @@ CREATE VIEW `cloud`.`user_vm_view` AS
 update  `cloud`.`volumes` v,  `cloud`.`volume_host_ref` vhr  set 
v.format=vhr.format where v.id=vhr.volume_id and v.format is null;
 
 
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option 
specified in -I option of impitool. candidates are: 
open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default 
valule "default" means using default option of ipmitool');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface 
will be temporary out of order after power opertions(e.g. cycle, on), it leads 
following commands fail immediately. The value specifies retry times before 
accounting it as real failure");
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout 
in seconds');

git commit: updated refs/heads/4.2 to 7ba48e7

2013-11-11 Thread prachidamle

Updated Branches:
  refs/heads/4.2 2814d2360 -> 7ba48e7c6


CS-18506: stopped vm cant start after disable threshold has been reached

Changes:
- Do not do the stoarge capacity check for a VM having READY Volumes that are 
already present on the storagepool.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ba48e7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ba48e7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ba48e7c

Branch: refs/heads/4.2
Commit: 7ba48e7c65a64497ed236d3985b4a04bd16dc2d2
Parents: 2814d23
Author: Prachi Damle 
Authored: Mon Nov 11 17:59:49 2013 -0800
Committer: Prachi Damle 
Committed: Mon Nov 11 18:00:18 2013 -0800

--
 .../deploy/DeploymentPlanningManagerImpl.java | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ba48e7c/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 52abe83..efcc12a 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -310,7 +310,8 @@ public class DeploymentPlanningManagerImpl extends 
ManagerBase implements Deploy
 List suitableHosts = new ArrayList();
 suitableHosts.add(host);
 Pair> potentialResources = 
findPotentialDeploymentResources(
-suitableHosts, suitableVolumeStoragePools, avoids, 
getPlannerUsage(planner,vmProfile, plan ,avoids));
+suitableHosts, suitableVolumeStoragePools, avoids,
+getPlannerUsage(planner, vmProfile, plan, avoids), 
readyAndReusedVolumes);
 if (potentialResources != null) {
 Pod pod = _podDao.findById(host.getPodId());
 Cluster cluster = 
_clusterDao.findById(host.getClusterId());
@@ -370,7 +371,8 @@ public class DeploymentPlanningManagerImpl extends 
ManagerBase implements Deploy
 List suitableHosts = new ArrayList();
 suitableHosts.add(host);
 Pair> 
potentialResources = findPotentialDeploymentResources(
-suitableHosts, suitableVolumeStoragePools, 
avoids, getPlannerUsage(planner,vmProfile, plan ,avoids));
+suitableHosts, suitableVolumeStoragePools, 
avoids,
+getPlannerUsage(planner, vmProfile, plan, 
avoids), readyAndReusedVolumes);
 if (potentialResources != null) {
 Pod pod = _podDao.findById(host.getPodId());
 Cluster cluster = 
_clusterDao.findById(host.getClusterId());
@@ -888,7 +890,8 @@ public class DeploymentPlanningManagerImpl extends 
ManagerBase implements Deploy
 // choose the potential host and pool for the VM
 if (!suitableVolumeStoragePools.isEmpty()) {
 Pair> potentialResources = 
findPotentialDeploymentResources(
-suitableHosts, suitableVolumeStoragePools, avoid, 
resourceUsageRequired);
+suitableHosts, suitableVolumeStoragePools, avoid, 
resourceUsageRequired,
+readyAndReusedVolumes);
 
 if (potentialResources != null) {
 Pod pod = _podDao.findById(clusterVO.getPodId());
@@ -1016,11 +1019,16 @@ public class DeploymentPlanningManagerImpl extends 
ManagerBase implements Deploy
 }
 protected Pair> 
findPotentialDeploymentResources(List suitableHosts,
 Map> suitableVolumeStoragePools, 
ExcludeList avoid,
-DeploymentPlanner.PlannerResourceUsage resourceUsageRequired) {
+DeploymentPlanner.PlannerResourceUsage resourceUsageRequired, 
List readyAndReusedVolumes) {
 s_logger.debug("Trying to find a potenial host and associated storage 
pools from the suitable host/pool lists for this VM");
 
 boolean hostCanAccessPool = false;
 boolean haveEnoughSpace = false;
+
+if (readyAndReusedVolumes == null) {
+readyAndReusedVolumes = new ArrayList();
+}
+
 Map storage = new HashMap();
 TreeSet volumesOrderBySizeDesc = new TreeSet(new 
Comparator() {
 @Override
@@ -1044,7 +1052,7 @@ public class DeploymentPlanningManagerImpl extends 
ManagerBase implements Deploy
 for (StoragePool

git commit: updated refs/heads/4.2 to 7469165

2013-11-11 Thread likithas

Updated Branches:
  refs/heads/4.2 7ba48e7c6 -> 7469165da


CLOUDSTACK-5082: added the timeout configuration for upgrade


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7469165d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7469165d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7469165d

Branch: refs/heads/4.2
Commit: 7469165daa7e007d9252cc57b6d420cb53216408
Parents: 7ba48e7
Author: Anshul Gangwar 
Authored: Tue Nov 12 10:28:34 2013 +0530
Committer: Likitha Shetty 
Committed: Tue Nov 12 11:44:55 2013 +0530

--
 setup/db/db/schema-420to421.sql | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7469165d/setup/db/db/schema-420to421.sql
--
diff --git a/setup/db/db/schema-420to421.sql b/setup/db/db/schema-420to421.sql
index 1d28485..302d44a 100644
--- a/setup/db/db/schema-420to421.sql
+++ b/setup/db/db/schema-420to421.sql
@@ -224,3 +224,5 @@ update  `cloud`.`volumes` v,  `cloud`.`volume_host_ref` vhr 
 set v.format=vhr.fo
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option 
specified in -I option of impitool. candidates are: 
open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default 
valule "default" means using default option of ipmitool');
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface 
will be temporary out of order after power opertions(e.g. cycle, on), it leads 
following commands fail immediately. The value specifies retry times before 
accounting it as real failure");
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 
'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout 
in seconds');
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 
'management-server', "alert.smtp.connectiontimeout", "3", "Socket 
connection timeout value in milliseconds. -1 for infinite timeout.");
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 
'management-server', "alert.smtp.timeout", "3", "Socket I/O timeout value 
in milliseconds. -1 for infinite timeout.");

git commit: updated refs/heads/4.2 to 92aa394

2013-11-11 Thread aprateek

Updated Branches:
  refs/heads/4.2 7469165da -> 92aa39478


adding version 4.2.1 to the changes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92aa3947
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92aa3947
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92aa3947

Branch: refs/heads/4.2
Commit: 92aa39478917c8abbddb6eca294a269fd0bd5929
Parents: 7469165
Author: Abhinandan Prateek 
Authored: Tue Nov 12 12:27:24 2013 +0530
Committer: Abhinandan Prateek 
Committed: Tue Nov 12 12:27:24 2013 +0530

--
 CHANGES | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92aa3947/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 624ef90..19f19c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,12 +4,16 @@ Apache CloudStack CHANGES
 Full release notes for each release are located in the project's documentation 
website:  
 http://cloudstack.apache.org/docs
 
-Version 4.2.0
+Version 4.2.1
 
 
 Please check the release notes for details
 
 
+Version 4.2.0
+
+
+Please check the release notes for details
 
 
 Version 4.1.0

git commit: updated refs/heads/master to 5420cbe

2013-11-11 Thread kocka

Updated Branches:
  refs/heads/master 04884b8f0 -> 5420cbe98


added license header

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5420cbe9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5420cbe9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5420cbe9

Branch: refs/heads/master
Commit: 5420cbe9817070ea29e1880874d26d573bd12f15
Parents: 04884b8
Author: Laszlo Hornyak 
Authored: Tue Nov 12 08:09:12 2013 +0100
Committer: Laszlo Hornyak 
Committed: Tue Nov 12 08:09:37 2013 +0100

--
 framework/db/test/com/cloud/utils/DbUtilTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5420cbe9/framework/db/test/com/cloud/utils/DbUtilTest.java
--
diff --git a/framework/db/test/com/cloud/utils/DbUtilTest.java 
b/framework/db/test/com/cloud/utils/DbUtilTest.java
index 1eab769..e9a7287 100644
--- a/framework/db/test/com/cloud/utils/DbUtilTest.java
+++ b/framework/db/test/com/cloud/utils/DbUtilTest.java
@@ -1,3 +1,19 @@
+// 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
+// the License.  You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package com.cloud.utils;
 
 import javax.persistence.Column;

git commit: updated refs/heads/master to bd67ccd

2013-11-11 Thread kocka

Updated Branches:
  refs/heads/master 5420cbe98 -> bd67ccdd6


few cleanups in CertServiceTest and CertService

Tests:
- all tests are @Test rather than having one test to call them, so they can be 
run one by one
- tests that expect exception from a method fail if there is none
- no longer extends TestCase so that the original method names could be kept as 
test

Implementation:
- include root cause in exceptions when possible - helps at troubleshuting
- close readers

Signed-off-by: Laszlo Hornyak 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd67ccdd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd67ccdd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd67ccdd

Branch: refs/heads/master
Commit: bd67ccdd6dedf1f56a0fa45de17690ce7608fa5d
Parents: 5420cbe
Author: Laszlo Hornyak 
Authored: Sun Nov 10 16:40:35 2013 +0100
Committer: Laszlo Hornyak 
Committed: Tue Nov 12 08:13:59 2013 +0100

--
 .../cloudstack/network/lb/CertServiceImpl.java  |  43 +++---
 .../cloudstack/network/lb/CertServiceTest.java  | 135 ---
 2 files changed, 80 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd67ccdd/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
--
diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java 
b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
index 53dae50..74adb37 100644
--- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
@@ -24,16 +24,20 @@ import com.cloud.network.rules.LoadBalancer;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.exception.CloudRuntimeException;
+
 import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
 import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd;
 import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
 import org.apache.cloudstack.api.response.SslCertResponse;
+
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.utils.db.DB;
+
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMReader;
@@ -45,6 +49,7 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.ejb.Local;
 import javax.inject.Inject;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
@@ -228,7 +233,7 @@ public class CertServiceImpl implements  CertService {
 }
 
 } catch (IOException e) {
-throw new IllegalArgumentException("Parsing certificate/key 
failed: " + e.getMessage());
+throw new IllegalArgumentException("Parsing certificate/key 
failed: " + e.getMessage(), e);
 }
 
 validateCert(cert, _chain != null? true: false);
@@ -273,7 +278,7 @@ public class CertServiceImpl implements  CertService {
 try {
 ((X509Certificate)cert).checkValidity();
 } catch (Exception e) {
-throw new IllegalArgumentException("Certificate expired or not 
valid");
+throw new IllegalArgumentException("Certificate expired or not 
valid", e);
 }
 
 if( !chain_present ) {
@@ -281,7 +286,7 @@ public class CertServiceImpl implements  CertService {
 try {
 cert.verify(pubKey);
 } catch (Exception e) {
-throw new IllegalArgumentException("No chain given and 
certificate not self signed");
+throw new IllegalArgumentException("No chain given and 
certificate not self signed", e);
 }
 }
 }
@@ -309,15 +314,15 @@ public class CertServiceImpl implements  CertService {
 throw new IllegalArgumentException("Bad public-private key");
 
 } catch (BadPaddingException e) {
-throw new IllegalArgumentException("Bad public-private key");
+throw new IllegalArgumentException("Bad public-private key", e);
 } catch (IllegalBlockSizeException e) {
-throw new IllegalArgumentException("Bad public-private key");
+throw new IllegalArgumentException("Bad public-private key", e);
 } catch (NoSuchPaddingException e) {
-throw new IllegalArgumentException("Bad public-private key");
+throw new Ille

38 matches

Mail list logo