git commit: updated refs/heads/master to a45ddb5

[sanjaytripathi]

Repository: cloudstack
Updated Branches:
  refs/heads/master ef2aa2c52 -> a45ddb514


CLOUDSTACK-7969: SC: Win8.1: Key translation fails for some  EN-US  keyboard 
keys.


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

Branch: refs/heads/master
Commit: a45ddb514c13b0b72d47468fb2254e69520d37f6
Parents: ef2aa2c
Author: Sanjay Tripathi 
Authored: Wed Nov 26 13:28:25 2014 +0530
Committer: Sanjay Tripathi 
Committed: Wed Nov 26 13:35:24 2014 +0530

--
 ui/index.jsp | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a45ddb51/ui/index.jsp
--
diff --git a/ui/index.jsp b/ui/index.jsp
index 1000101..5ba6301 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -430,6 +430,7 @@
 Standard 
(US) keyboard
 UK 
keyboard
 Japanese 
keyboard
+Simplified 
Chinese keyboard
 
 
 

[2/2] git commit: updated refs/heads/4.5 to 3fc392a

[koushik]

CLOUDSTACK-7960: [Automation] Creation of Volume from Snapshot fails due to 
StringIndexOutOfBoundsException
Fixed the appropriate CopyCommand handler in simulator plugin


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

Branch: refs/heads/4.5
Commit: 3fc392abf8a17d823d76805782d3ee01b54b5210
Parents: d55059d
Author: Koushik Das 
Authored: Wed Nov 26 16:00:54 2014 +0530
Committer: Koushik Das 
Committed: Wed Nov 26 16:00:54 2014 +0530

--
 .../src/com/cloud/resource/SimulatorStorageProcessor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fc392ab/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
--
diff --git 
a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
 
b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
index bdb3277..86556f7 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
@@ -142,7 +142,7 @@ public class SimulatorStorageProcessor implements 
StorageProcessor {
 int index = snapshot.getPath().lastIndexOf("/");
 
 String snapshotName = snapshot.getPath().substring(index + 1);
-String snapshotRelPath = null;
+String snapshotRelPath = "snapshots";
 SnapshotObjectTO newSnapshot = new SnapshotObjectTO();
 newSnapshot.setPath(snapshotRelPath + File.separator + snapshotName);
 return new CopyCmdAnswer(newSnapshot);
@@ -209,7 +209,6 @@ public class SimulatorStorageProcessor implements 
StorageProcessor {
 SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
 String snapshotPath = snapshot.getPath();
 int index = snapshotPath.lastIndexOf("/");
-snapshotPath = snapshotPath.substring(0, index);
 String snapshotName = snapshotPath.substring(index + 1);
 VolumeObjectTO newVol = new VolumeObjectTO();
 newVol.setPath(snapshotName);

[1/2] git commit: updated refs/heads/4.5 to 3fc392a

[koushik]

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 dd508b3b9 -> 3fc392abf


CLOUDSTACK-7973: Proper handler for FenceCommand in simulator
Added a proper handler for FenceCommand in simulator


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

Branch: refs/heads/4.5
Commit: d55059dd5d8b276c92733e6cceed644e08c199d0
Parents: dd508b3
Author: Koushik Das 
Authored: Wed Nov 26 15:58:47 2014 +0530
Committer: Koushik Das 
Committed: Wed Nov 26 15:58:47 2014 +0530

--
 .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d55059dd/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
--
diff --git 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index 0ea6855..b0c0bc6 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -56,6 +56,7 @@ import com.cloud.agent.api.CreateVMSnapshotCommand;
 import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
 import com.cloud.agent.api.DeleteStoragePoolCommand;
 import com.cloud.agent.api.DeleteVMSnapshotCommand;
+import com.cloud.agent.api.FenceCommand;
 import com.cloud.agent.api.GetDomRVersionCmd;
 import com.cloud.agent.api.GetHostStatsCommand;
 import com.cloud.agent.api.GetStorageStatsCommand;
@@ -419,6 +420,8 @@ public class SimulatorManagerImpl extends ManagerBase 
implements SimulatorManage
 answer = 
_mockNetworkMgr.setupPVLAN((PvlanSetupCommand)cmd);
 } else if (cmd instanceof StorageSubSystemCommand) {
 answer = 
this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
+} else if (cmd instanceof FenceCommand) {
+answer = _mockVmMgr.fence((FenceCommand)cmd);
 } else if (cmd instanceof GetRouterAlertsCommand || cmd 
instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || 
cmd instanceof SetMonitorServiceCommand || cmd instanceof 
AggregationControlCommand ||
 cmd instanceof SecStorageFirewallCfgCommand) {
 answer = new Answer(cmd);

[2/2] git commit: updated refs/heads/master to 4798db0

[koushik]

CLOUDSTACK-7960: [Automation] Creation of Volume from Snapshot fails due to 
StringIndexOutOfBoundsException
Fixed the appropriate CopyCommand handler in simulator plugin


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

Branch: refs/heads/master
Commit: 4798db0de1862bbdf7f2af67f7684f2f3430609e
Parents: bf56584
Author: Koushik Das 
Authored: Wed Nov 26 16:00:54 2014 +0530
Committer: Koushik Das 
Committed: Wed Nov 26 17:30:44 2014 +0530

--
 .../src/com/cloud/resource/SimulatorStorageProcessor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4798db0d/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
--
diff --git 
a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
 
b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
index 418dd0c..527b32f 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
@@ -151,7 +151,7 @@ public class SimulatorStorageProcessor implements 
StorageProcessor {
 int index = snapshot.getPath().lastIndexOf("/");
 
 String snapshotName = snapshot.getPath().substring(index + 1);
-String snapshotRelPath = null;
+String snapshotRelPath = "snapshots";
 SnapshotObjectTO newSnapshot = new SnapshotObjectTO();
 newSnapshot.setPath(snapshotRelPath + File.separator + snapshotName);
 return new CopyCmdAnswer(newSnapshot);
@@ -218,7 +218,6 @@ public class SimulatorStorageProcessor implements 
StorageProcessor {
 SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
 String snapshotPath = snapshot.getPath();
 int index = snapshotPath.lastIndexOf("/");
-snapshotPath = snapshotPath.substring(0, index);
 String snapshotName = snapshotPath.substring(index + 1);
 VolumeObjectTO newVol = new VolumeObjectTO();
 newVol.setPath(snapshotName);

[1/2] git commit: updated refs/heads/master to 4798db0

[koushik]

Repository: cloudstack
Updated Branches:
  refs/heads/master a45ddb514 -> 4798db0de


CLOUDSTACK-7973: Proper handler for FenceCommand in simulator
Added a proper handler for FenceCommand in simulator


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

Branch: refs/heads/master
Commit: bf565845285c2e47ef362a39a278eec9dd599680
Parents: a45ddb5
Author: Koushik Das 
Authored: Wed Nov 26 15:58:47 2014 +0530
Committer: Koushik Das 
Committed: Wed Nov 26 17:30:33 2014 +0530

--
 .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf565845/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
--
diff --git 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index 0ea6855..b0c0bc6 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -56,6 +56,7 @@ import com.cloud.agent.api.CreateVMSnapshotCommand;
 import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
 import com.cloud.agent.api.DeleteStoragePoolCommand;
 import com.cloud.agent.api.DeleteVMSnapshotCommand;
+import com.cloud.agent.api.FenceCommand;
 import com.cloud.agent.api.GetDomRVersionCmd;
 import com.cloud.agent.api.GetHostStatsCommand;
 import com.cloud.agent.api.GetStorageStatsCommand;
@@ -419,6 +420,8 @@ public class SimulatorManagerImpl extends ManagerBase 
implements SimulatorManage
 answer = 
_mockNetworkMgr.setupPVLAN((PvlanSetupCommand)cmd);
 } else if (cmd instanceof StorageSubSystemCommand) {
 answer = 
this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
+} else if (cmd instanceof FenceCommand) {
+answer = _mockVmMgr.fence((FenceCommand)cmd);
 } else if (cmd instanceof GetRouterAlertsCommand || cmd 
instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || 
cmd instanceof SetMonitorServiceCommand || cmd instanceof 
AggregationControlCommand ||
 cmd instanceof SecStorageFirewallCfgCommand) {
 answer = new Answer(cmd);

[1/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 67df5b9da -> 2b264e6b5


CLOUDSTACK-6269: [Simulator] Exception "Unable to send command"

Added fix for CLOUDSTACK-6269.More details inside the bug

Signed-off-by: Santhosh Edukulla 
(cherry picked from commit 3060f884ab62d92ade9073a147dee204aba4a889)
Signed-off-by: Rohit Yadav 

Conflicts:

plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java


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

Branch: refs/heads/4.3
Commit: 7332ea8a1caa093ec5036098619d04317b269fd5
Parents: 67df5b9
Author: Santhosh Edukulla 
Authored: Wed Mar 26 00:45:44 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:13:36 2014 +0530

--
 .../com/cloud/agent/manager/MockVmManagerImpl.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7332ea8a/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..6867470 100644
--- 
a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
+++ 
b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockVmManagerImpl.java
@@ -16,6 +16,19 @@
 // under the License.
 package com.cloud.agent.manager;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import com.cloud.network.VirtualNetworkApplianceService;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.BumpUpPriorityCommand;
@@ -567,7 +580,8 @@ public class MockVmManagerImpl extends ManagerBase 
implements MockVmManager {
 
 @Override
 public GetDomRVersionAnswer getDomRVersion(GetDomRVersionCmd cmd) {
-return new GetDomRVersionAnswer(cmd, null, null, null);
+String template_version = "CloudStack Release "+ 
VirtualNetworkApplianceService._minVRVersion.toString();
+return new GetDomRVersionAnswer(cmd, null, template_version, 
UUID.randomUUID().toString());
 }
 
 @Override

[5/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6192: Return failure on StartCommand and PrepareForMigrationCommand
when connectPhysicalDisk fails, rather than continuing on

(cherry picked from commit fb0b2eb26731a6db00c65dcd799653a213475387)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: a88c3dd8a4dd108aa434440c83d6ca5cc3985e83
Parents: c2c6ecf
Author: Marcus Sorensen 
Authored: Tue Mar 4 14:18:51 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:21:20 2014 +0530

--
 .../kvm/resource/LibvirtComputingResource.java   | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a88c3dd8/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index dbd2327..c65fed8 100755
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3075,7 +3075,7 @@ ServerResource {
 
 NicTO[] nics = vm.getNics();
 
-boolean success = false;
+boolean skipDisconnect = false;
 
 try {
 Connect conn = 
LibvirtConnection.getConnectionByVmName(vm.getName());
@@ -3091,13 +3091,16 @@ ServerResource {
 }
 }
 
-_storagePoolMgr.connectPhysicalDisksViaVmSpec(vm);
+if (!_storagePoolMgr.connectPhysicalDisksViaVmSpec(vm)) {
+skipDisconnect = true;
+return new PrepareForMigrationAnswer(cmd, "failed to connect 
physical disks to host");
+}
 
 synchronized (_vms) {
 _vms.put(vm.getName(), State.Migrating);
 }
 
-success = true;
+skipDisconnect = true;
 
 return new PrepareForMigrationAnswer(cmd);
 } catch (LibvirtException e) {
@@ -3107,7 +3110,7 @@ ServerResource {
 } catch (URISyntaxException e) {
 return new PrepareForMigrationAnswer(cmd, e.toString());
 } finally {
-if (!success) {
+if (!skipDisconnect) {
 _storagePoolMgr.disconnectPhysicalDisksViaVmSpec(vm);
 }
 }
@@ -3654,7 +3657,9 @@ ServerResource {
 
 createVbd(conn, vmSpec, vmName, vm);
 
-_storagePoolMgr.connectPhysicalDisksViaVmSpec(vmSpec);
+if (!_storagePoolMgr.connectPhysicalDisksViaVmSpec(vmSpec)) {
+return new StartAnswer(cmd, "Failed to connect physical disks 
to host");
+}
 
 createVifs(vmSpec, vm);
 

[2/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results 
in out-of-range error in Mysql

(cherry picked from commit cd8af6a3e2a180ea4d2cfea8a273dbb0929e0a87)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 88ec08439dfc65178c56c365e276c0018ca03d6d
Parents: 7332ea8
Author: Min Chen 
Authored: Wed Mar 12 15:44:18 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:14:53 2014 +0530

--
 .../storage/datastore/db/SnapshotDataStoreVO.java| 11 ++-
 .../storage/datastore/db/TemplateDataStoreVO.java| 11 ++-
 .../storage/datastore/db/VolumeDataStoreVO.java  | 11 ++-
 3 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88ec0843/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java
index db86c3f..7acc891 100644
--- 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java
+++ 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreVO.java
@@ -29,6 +29,8 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State;
@@ -44,6 +46,8 @@ import com.cloud.utils.fsm.StateObject;
 @Entity
 @Table(name = "snapshot_store_ref")
 public class SnapshotDataStoreVO implements 
StateObject, DataObjectInStore {
+private static final Logger s_logger = 
Logger.getLogger(SnapshotDataStoreVO.class);
+
 @Id
 @GeneratedValue(strategy = GenerationType.IDENTITY)
 Long id;
@@ -266,7 +270,12 @@ public class SnapshotDataStoreVO implements 
StateObject 0) {
+refCnt--;
+}
+else {
+s_logger.warn("We should not try to decrement a zero reference 
count even though our code has guarded");
+}
 }
 
 public Long getVolumeId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88ec0843/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
index a3696d8..af89ee5 100755
--- 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
+++ 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java
@@ -29,6 +29,8 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State;
@@ -45,6 +47,8 @@ import com.cloud.utils.fsm.StateObject;
 @Entity
 @Table(name = "template_store_ref")
 public class TemplateDataStoreVO implements 
StateObject, DataObjectInStore {
+private static final Logger s_logger = 
Logger.getLogger(TemplateDataStoreVO.class);
+
 @Id
 @GeneratedValue(strategy = GenerationType.IDENTITY)
 Long id;
@@ -369,7 +373,12 @@ public class TemplateDataStoreVO implements 
StateObject 0) {
+refCnt--;
+}
+else{
+s_logger.warn("We should not try to decrement a zero reference 
count even though our code has guarded");
+}
 }
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88ec0843/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index e34d4a6..bd15f1c 100755
--- 
a/engine/schema/src/org/apache

[8/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6020 ipv4 address can be a larger number then
Interger.MAX_VALUE
(cherry picked from commit b3829e54d6b7af426f797ffb9fa54b4cd2abffc0)

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 2b264e6b57b90d6eb5d202c4fe72e64d867b3f9b
Parents: 11eab3d
Author: Daan Hoogland 
Authored: Tue Feb 4 18:40:18 2014 +0100
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:37:18 2014 +0530

--
 utils/src/com/cloud/utils/net/Ip.java  |  2 +-
 utils/test/com/cloud/utils/net/IpTest.java | 43 +
 2 files changed, 44 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b264e6b/utils/src/com/cloud/utils/net/Ip.java
--
diff --git a/utils/src/com/cloud/utils/net/Ip.java 
b/utils/src/com/cloud/utils/net/Ip.java
index 2cdfd9c..93972e7 100644
--- a/utils/src/com/cloud/utils/net/Ip.java
+++ b/utils/src/com/cloud/utils/net/Ip.java
@@ -56,7 +56,7 @@ public class Ip implements Serializable, Comparable {
 }
 
 public boolean isIp4() {
-return ip < Integer.MAX_VALUE;
+return ip <= 2L * Integer.MAX_VALUE + 1;
 }
 
 public boolean isIp6() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b264e6b/utils/test/com/cloud/utils/net/IpTest.java
--
diff --git a/utils/test/com/cloud/utils/net/IpTest.java 
b/utils/test/com/cloud/utils/net/IpTest.java
new file mode 100644
index 000..48615d7
--- /dev/null
+++ b/utils/test/com/cloud/utils/net/IpTest.java
@@ -0,0 +1,43 @@
+// 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.net;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class IpTest {
+
+@Test
+public void testUltimate() {
+Ip max = new Ip(2L * Integer.MAX_VALUE +1 );
+assertEquals("Maximal address not created", "255.255.255.255", 
max.addr());
+}
+@Test
+public void testTurningOfTheCentury() {
+Ip eve = new Ip(Integer.MAX_VALUE);
+assertEquals("Minimal address not created", "127.255.255.255", 
eve.addr());
+Ip dawn = new Ip(Integer.MAX_VALUE + 1L);
+assertEquals("Minimal address not created", "128.0.0.0", dawn.addr());
+}
+@Test
+public void testStart() {
+Ip min = new Ip(0);
+assertEquals("Minimal address not created", "0.0.0.0", min.addr());
+}
+
+}

[4/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on "Add 
LDAP Account" This occurs when ldap basedn is not configured. Throwing an IAE 
and a proper message is returned from the api call

Signed-off-by: Ian Duffy 
(cherry picked from commit 4552ec632201e7432afae7770f5854aaa244267c)
Signed-off-by: Rohit Yadav 

Conflicts:

plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java


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

Branch: refs/heads/4.3
Commit: c2c6ecf828d85e3a5085ea28baed0ed9e1ba5d9e
Parents: 2534b54
Author: Rajani Karuturi 
Authored: Fri Mar 7 11:13:35 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:19:54 2014 +0530

--
 .../apache/cloudstack/ldap/LdapUserManager.java |  10 +-
 .../cloudstack/ldap/LdapUserManagerSpec.groovy  | 263 ++-
 2 files changed, 146 insertions(+), 127 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2c6ecf8/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
--
diff --git 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
index 59a41de..f80142f 100644
--- 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
+++ 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapUserManager.java
@@ -25,6 +25,8 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.*;
 
+import org.apache.commons.lang.StringUtils;
+
 public class LdapUserManager {
 
 @Inject
@@ -181,6 +183,10 @@ public class LdapUserManager {
controls.setSearchScope(_ldapConfiguration.getScope());

controls.setReturningAttributes(_ldapConfiguration.getReturnAttributes());
 
-   return context.search(_ldapConfiguration.getBaseDn(), 
generateSearchFilter(username), controls);
+String basedn = _ldapConfiguration.getBaseDn();
+if (StringUtils.isBlank(basedn)) {
+throw new IllegalArgumentException("ldap basedn is not 
configured");
+}
+return context.search(basedn, generateSearchFilter(username), 
controls);
 }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2c6ecf8/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerSpec.groovy
--
diff --git 
a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerSpec.groovy
 
b/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerSpec.groovy
index fa735d3..9fbc81f 100644
--- 
a/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerSpec.groovy
+++ 
b/plugins/user-authenticators/ldap/test/groovy/org/apache/cloudstack/ldap/LdapUserManagerSpec.groovy
@@ -21,10 +21,9 @@ import org.apache.cloudstack.ldap.LdapUserManager
 import spock.lang.Shared
 
 import javax.naming.NamingException
-import javax.naming.NamingEnumeration
 import javax.naming.directory.Attribute
 import javax.naming.directory.Attributes
-import javax.naming.directory.DirContext
+import javax.naming.directory.InitialDirContext
 import javax.naming.directory.SearchControls
 import javax.naming.directory.SearchResult
 import javax.naming.ldap.LdapContext
@@ -51,83 +50,83 @@ class LdapUserManagerSpec extends spock.lang.Specification {
 
 private def createGroupSearchContext() {
 
-   def umSearchResult = Mock(SearchResult)
-   umSearchResult.getName() >> principal;
-   umSearchResult.getAttributes() >> principal
+def umSearchResult = Mock(SearchResult)
+umSearchResult.getName() >> principal;
+umSearchResult.getAttributes() >> principal
 
-   def uniqueMembers = new BasicNamingEnumerationImpl()
-   uniqueMembers.add(umSearchResult);
-   def attributes = Mock(Attributes)
-   def uniqueMemberAttribute = Mock(Attribute)
-   uniqueMemberAttribute.getId() >> "uniquemember"
-   uniqueMemberAttribute.getAll() >> uniqueMembers
-   attributes.get("uniquemember") >> uniqueMemberAttribute
+def uniqueMembers = new BasicNamingEnumerationImpl()
+uniqueMembers.add(umSearchResult);
+def attributes = Mock(Attributes)
+def uniqueMemberAttribute = Mock(Attribute)
+uniqueMemberAttribute.getId() >> "uniquemember"
+uniqueMember

[3/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
(cherry picked from commit 672bb353be2f159966f351ab2de914b433a934f9)

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 2534b54853d81d41e364348e0cc0cecb3c950294
Parents: 88ec084
Author: Min Chen 
Authored: Wed Sep 3 10:33:11 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:15:05 2014 +0530

--
 .../storage/datastore/db/VolumeDataStoreVO.java   | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2534b548/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index bd15f1c..f5589da 100755
--- 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
+++ 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
@@ -348,12 +348,7 @@ public class VolumeDataStoreVO implements 
StateObject 0) {
-refCnt--;
-}
-else {
-s_logger.warn("We should not try to decrement a zero reference 
count even though our code has guarded");
-}
+this.refCnt = refCnt;
 }
 
 public void incrRefCnt() {
@@ -361,7 +356,12 @@ public class VolumeDataStoreVO implements 
StateObject 0) {
+refCnt--;
+}
+else {
+s_logger.warn("We should not try to decrement a zero reference 
count even though our code has guarded");
+}
 }
 
 public String getExtractUrl() {

[7/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6172: Adding new test case to verify this fix

Signed-off-by: Rohit Yadav 

Conflicts:

test/integration/component/test_volumes.py

Signed-off-by: sanjeev 

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
(cherry picked from commit 2d19bcb46ad7c78b4842c1f52f552998a33f8836)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 11eab3d285620b2a62078bd48f6b9e4089ef10e9
Parents: 77446d2
Author: sanjeev 
Authored: Thu Sep 18 14:18:14 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:23:19 2014 +0530

--
 test/integration/component/test_volumes.py | 138 
 1 file changed, 138 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11eab3d2/test/integration/component/test_volumes.py
--
diff --git a/test/integration/component/test_volumes.py 
b/test/integration/component/test_volumes.py
index ee0f91d..89a3372 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -1264,3 +1264,141 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase):
 except Exception as e:
 self.fail("Create volume failed with exception: %s" % e)
 return
+
+class TestMigrateVolume(cloudstackTestCase):
+
+@classmethod
+def setUpClass(cls):
+cls.testClient = super(TestMigrateVolume, cls).getClsTestClient()
+cls.api_client = cls.testClient.getApiClient()
+
+cls.services = Services().services
+# Get Zone, Domain and templates
+cls.domain = get_domain(cls.api_client)
+cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+cls.services['mode'] = cls.zone.networktype
+cls.disk_offering = DiskOffering.create(
+cls.api_client,
+cls.services["disk_offering"]
+)
+template = get_template(
+cls.api_client,
+cls.zone.id,
+cls.services["ostype"]
+)
+cls.services["zoneid"] = cls.zone.id
+cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+cls.services["virtual_machine"]["template"] = template.id
+cls.services["virtual_machine"]["diskofferingid"] = 
cls.disk_offering.id
+
+# Create VMs, VMs etc
+cls.account = Account.create(
+cls.api_client,
+cls.services["account"],
+domainid=cls.domain.id
+)
+cls.small_offering = ServiceOffering.create(
+cls.api_client,
+cls.services["service_offering"]
+)
+cls.virtual_machine = VirtualMachine.create(
+cls.api_client,
+cls.services["virtual_machine"],
+accountid=cls.account.name,
+domainid=cls.account.domainid,
+serviceofferingid=cls.small_offering.id,
+mode=cls.services["mode"]
+)
+cls._cleanup = [
+cls.small_offering,
+cls.account
+   ]
+return
+
+@classmethod
+def tearDownClass(cls):
+try:
+cleanup_resources(cls.api_client, cls._cleanup)
+except Exception as e:
+raise Exception("Warning: Exception during cleanup : %s" % e)
+return
+
+def setUp(self):
+self.apiclient = self.testClient.getApiClient()
+self.dbclient = self.testClient.getDbConnection()
+self.cleanup = []
+return
+
+def tearDown(self):
+cleanup_resources(self.apiclient, self.cleanup)
+return
+
+@attr(tags=["advanced","sg","advancedsg"], required_hardware='true')
+def test_01_migrateVolume(self):
+"""
+@Desc:Volume is not retaining same uuid when migrating from one 
storage to another.
+Step1:Create a volume/data disk
+Step2:Verify UUID of the volume
+Step3:Migrate the volume to another primary storage within the cluster
+Step4:Migrating volume to new primary storage should succeed
+Step5:volume UUID should not change even after migration
+"""
+vol = Volume.create(
+self.apiclient,
+self.services["volume"],
+diskofferingid=self.disk_offering.id,
+zoneid=self.zone.id,
+account=self.account.name,
+domainid=self.account.domainid,
+)
+self.assertIsNotNone(vol,"Failed to create volume")
+vol_res = Volume.list(
+self.apiclient,
+id=vol.id
+ 

[6/8] git commit: updated refs/heads/4.3 to 2b264e6

[bhaisaab]

CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one 
storage to another.

(cherry picked from commit 624139d8ef9ea9462ba81d2d3941ee5ac9467b20)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 77446d2716a4d174c4505123758310ba0fe48e2d
Parents: a88c3dd
Author: Sanjay Tripathi 
Authored: Wed Feb 26 14:41:48 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 18:23:04 2014 +0530

--
 .../src/com/cloud/storage/dao/VolumeDao.java|  8 
 .../com/cloud/storage/dao/VolumeDaoImpl.java| 20 
 .../storage/volume/VolumeServiceImpl.java   |  1 +
 3 files changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77446d27/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 24ade51..47f1990 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDao.java
@@ -103,4 +103,12 @@ public interface VolumeDao extends GenericDao, StateDaohttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/77446d27/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 2fb9dba..697983c 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -555,6 +555,26 @@ public class VolumeDaoImpl extends 
GenericDaoBase implements Vol
 }
 
 @Override
+@DB
+public boolean updateUuid(long srcVolId, long destVolId) {
+TransactionLegacy txn = TransactionLegacy.currentTxn();
+txn.start();
+try {
+VolumeVO srcVol = findById(srcVolId);
+VolumeVO destVol = findById(destVolId);
+String uuid = srcVol.getUuid();
+srcVol.setUuid(null);
+destVol.setUuid(uuid);
+update(srcVolId, srcVol);
+update(destVolId, destVol);
+} catch (Exception e) {
+throw new CloudRuntimeException("Unable to persist the sequence 
number for this host");
+}
+txn.commit();
+return true;
+}
+
+@Override
 public ScopeType getVolumeStoragePoolScope(long volumeId) {
 // finding the storage scope where the volume is present
 TransactionLegacy txn = TransactionLegacy.currentTxn();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77446d27/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 4e07edd..18972ef 100644
--- 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -886,6 +886,7 @@ public class VolumeServiceImpl implements VolumeService {
 }
 srcVolume.processEvent(Event.OperationSuccessed);
 destVolume.processEvent(Event.OperationSuccessed, 
result.getAnswer());
+_volumeDao.updateUuid(srcVolume.getId(), destVolume.getId());
 destroyVolume(srcVolume.getId());
 srcVolume = volFactory.getVolume(srcVolume.getId());
 AsyncCallFuture destroyFuture = 
expungeVolumeAsync(srcVolume);

[3/4] cloudstack-docs git commit: Merge remote-tracking branch 'andy/master'

[bhaisaab]

Merge remote-tracking branch 'andy/master'

This closes #8


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

Branch: refs/heads/master
Commit: 574089e922a6d8087fa2f14414f075d612051c69
Parents: be0f4dd cbd7a13
Author: Rohit Yadav 
Authored: Wed Nov 26 19:35:16 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 19:35:16 2014 +0530

--
 rtd/source/networking/vxlan.rst | 10 ++
 1 file changed, 10 insertions(+)
--

[4/4] cloudstack-docs git commit: Merge remote-tracking branch 'rajani/patch-1'

[bhaisaab]

Merge remote-tracking branch 'rajani/patch-1'

This closes #6


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

Branch: refs/heads/master
Commit: 60fc60e67c65a22c646618b304c9a85134a9038e
Parents: 574089e 8f17a2f
Author: Rohit Yadav 
Authored: Wed Nov 26 19:36:58 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 19:36:58 2014 +0530

--
 rtd/source/developer_guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[2/4] cloudstack-docs git commit: Update vxlan.rst

[bhaisaab]

Update vxlan.rst

Added section about MTU sizes and examples.

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

Branch: refs/heads/master
Commit: cbd7a13622780142127f06bf2f0d2888afea3c68
Parents: be0f4dd
Author: andrijapanic 
Authored: Wed Nov 26 13:10:32 2014 +0100
Committer: andrijapanic 
Committed: Wed Nov 26 13:10:32 2014 +0100

--
 rtd/source/networking/vxlan.rst | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/cbd7a136/rtd/source/networking/vxlan.rst
--
diff --git a/rtd/source/networking/vxlan.rst b/rtd/source/networking/vxlan.rst
index d3b54a8..85da616 100644
--- a/rtd/source/networking/vxlan.rst
+++ b/rtd/source/networking/vxlan.rst
@@ -73,6 +73,16 @@ To check the capability of your system, execute the 
following commands.
# If it's not, your iproute2 utility doesn't support VXLAN.
 
 
+Important note on MTU size
+~~~
+
+When new vxlan interfaces are created, kernel will obtain current MTU size of 
the physical interface (ethX or the bridge)
+and then create vxlan interface/bridge that are exactly 50 bytes smaller than 
the MTU on physical interface/bridge.
+This means that in order to support default MTU size of 1500 bytes inside VM, 
your vxlan interface/bridge must also
+have MTU of 1500 bytes, meaning that your physical interface/bridge must have 
MTU of at least 1550 bytes.
+In order to configure "jumbo frames" you can i.e. make physical 
interface/bridge with 9000 bytes MTU, then all the vxlan
+interfaces will be created with MTU of 8950 bytes, and then MTU size inside VM 
can be set to 8950 bytes.
+
 Advanced: Build kernel and iproute2
 ~~~
 

[1/4] cloudstack-docs git commit: updated instructions to install jdk1.7

[bhaisaab]

Repository: cloudstack-docs
Updated Branches:
  refs/heads/master be0f4dd40 -> 60fc60e67


updated instructions to install jdk1.7

for apt-get and yum corrected the java install commands to install jdk1.7

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

Branch: refs/heads/master
Commit: 8f17a2fecd70341dad7dd585d318d7cbbc526cce
Parents: 0414fdd
Author: Rajani Karuturi 
Authored: Tue Aug 19 15:26:51 2014 +0530
Committer: Rajani Karuturi 
Committed: Tue Aug 19 15:26:51 2014 +0530

--
 rtd/source/developer_guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/8f17a2fe/rtd/source/developer_guide.rst
--
diff --git a/rtd/source/developer_guide.rst b/rtd/source/developer_guide.rst
index 0e49688..661cd11 100644
--- a/rtd/source/developer_guide.rst
+++ b/rtd/source/developer_guide.rst
@@ -66,7 +66,7 @@ Install ``openjdk``. As we're using Linux, OpenJDK is our 
first choice.
 
 ::
 
-   apt-get install openjdk-6-jdk
+   apt-get install openjdk-7-jdk
 
 Install ``tomcat6``, note that the new version of tomcat on
 `Ubuntu `__ is the
@@ -143,7 +143,7 @@ Install ``openjdk``. As we're using Linux, OpenJDK is our 
first choice.
 
 ::
 
-   yum -y install java-1.6.0-openjdk
+   yum -y install java-1.7.0-openjdk-devel
 
 Install ``tomcat6``, note that the version of tomcat6 in the default
 CentOS 6.4 repo is 6.0.24, so we will grab the 6.0.35 version. The

git commit: updated refs/heads/feature/centos7-rpm to f9cfd4d

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/feature/centos7-rpm 870ede5a0 -> f9cfd4d50


Convert the usage server service to systemd


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

Branch: refs/heads/feature/centos7-rpm
Commit: f9cfd4d5090d3653ea5d5ea237d75e730af478e7
Parents: 870ede5
Author: Hugo Trippaers 
Authored: Wed Nov 26 15:15:06 2014 +0100
Committer: Hugo Trippaers 
Committed: Wed Nov 26 15:15:06 2014 +0100

--
 packaging/centos7/cloud-usage-sysd  |  90 
 packaging/centos7/cloud-usage.rc| 156 ---
 packaging/centos7/cloud-usage.service   |  37 +++
 packaging/centos7/cloud-usage.sysconfig |  31 ++
 packaging/centos7/cloud.spec|  16 ++-
 5 files changed, 172 insertions(+), 158 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9cfd4d5/packaging/centos7/cloud-usage-sysd
--
diff --git a/packaging/centos7/cloud-usage-sysd 
b/packaging/centos7/cloud-usage-sysd
new file mode 100755
index 000..a7c0f2f
--- /dev/null
+++ b/packaging/centos7/cloud-usage-sysd
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# 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.
+
+. /etc/sysconfig/cloudstack-usage
+
+start() {
+if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
+echo "$PROGNAME apparently already running"
+exit 0
+fi
+
+if hostname --fqdn >/dev/null 2>&1 ; then
+true
+else
+echo "The host name does not resolve properly to an IP address. Cannot 
start $PROGNAME"
+exit 1
+fi
+
+echo -n "Starting $PROGNAME" "$SHORTNAME"
+
+if /usr/bin/jsvc -pidfile $PIDFILE $DAEMON -home "$JAVA_HOME" -cp 
"$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
+  -errfile $LOGDIR/cloudstack-usage.err -outfile 
$LOGDIR/cloudstack-usage.out -Dpid=$$ $CLASS
+RETVAL=$?
+then
+rc=0
+sleep 1
+if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
+rc=1
+fi
+else
+rc=1
+fi
+
+if [ $rc -ne 0 ]; then
+echo > "$PIDFILE"
+exit 1
+fi
+}
+
+stop() {
+echo -n "Stopping $PROGNAME" "$SHORTNAME"
+if [ -e $PIDFILE ] ; then
+kill $(<$PIDFILE) > /dev/null 2>&1
+echo > $PIDFILE
+else
+echo Unable to stop $SHORTNAME, no pid file
+echo > $PIDFILE
+exit 1
+fi
+}
+
+case "$1" in
+start)
+start
+;;
+stop)
+stop
+;;
+status)
+status -p $PIDFILE $SHORTNAME
+RETVAL=$?
+;;
+restart | force-reload)
+stop
+sleep 3
+start
+;;
+*)
+echo "Usage: $0 {start|stop|restart|force-reload|status}"
+RETVAL=3
+esac
+
+exit $RETVAL
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9cfd4d5/packaging/centos7/cloud-usage.rc
--
diff --git a/packaging/centos7/cloud-usage.rc b/packaging/centos7/cloud-usage.rc
deleted file mode 100755
index 7741137..000
--- a/packaging/centos7/cloud-usage.rc
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides:  cloudstack-usage
-# Required-Start:$network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-##  The CloudStack Usage Monitor is a part of the Apache CloudStack project 
and is used
-##  for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agre

git commit: updated refs/heads/feature/centos7-rpm to b249c91

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/feature/centos7-rpm f9cfd4d50 -> b249c91bf


Fix python reference


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

Branch: refs/heads/feature/centos7-rpm
Commit: b249c91bf1946bfcafdf684c172e0d74ba7d04bc
Parents: f9cfd4d
Author: Hugo Trippaers 
Authored: Wed Nov 26 15:18:12 2014 +0100
Committer: Hugo Trippaers 
Committed: Wed Nov 26 15:18:12 2014 +0100

--
 packaging/centos7/replace.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b249c91b/packaging/centos7/replace.properties
--
diff --git a/packaging/centos7/replace.properties 
b/packaging/centos7/replace.properties
index 8345854..f99dab8 100644
--- a/packaging/centos7/replace.properties
+++ b/packaging/centos7/replace.properties
@@ -49,7 +49,7 @@ MSUSER=cloud
 PIDDIR=/var/run
 PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
 PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
-PYTHONDIR=/usr/lib/python2.6/site-packages/
+PYTHONDIR=/usr/lib/python2.7/site-packages/
 SERVERSYSCONFDIR=/etc/sysconfig
 SETUPDATADIR=/usr/share/cloudstack-management/setup
 SYSCONFDIR=/etc/sysconfig

[05/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5839: fixed xml serializer to process collection field when its 
elements are of String type

(cherry picked from commit c3680cc111c3d43838da298aa6f639b84eb43b5f)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/api/response/ApiResponseSerializer.java


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

Branch: refs/heads/4.3
Commit: 4d24452334acb00532ba2358401444a8510d4b3f
Parents: 4fdfd8f
Author: Alena Prokharchyk 
Authored: Wed Jan 8 15:38:08 2014 -0800
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:13:28 2014 +0530

--
 server/src/com/cloud/api/response/ApiResponseSerializer.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d244523/server/src/com/cloud/api/response/ApiResponseSerializer.java
--
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java 
b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index a3e6f0f..5e407d6 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -28,6 +28,7 @@ import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.ResponseObject;
+
 import org.apache.cloudstack.api.response.*;
 import org.apache.log4j.Logger;
 
@@ -232,6 +233,8 @@ public class ApiResponseSerializer {
 if (idFieldName != null) {
 sb.append("<" + "uuidProperty" + ">" + 
idFieldName + "");
 }
+} else if (value instanceof String) {
+
sb.append("<").append(serializedName.value()).append(">").append(value).append("");
 }
 }
 if (usedUuidList) {

[12/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CHANGES: update CHANGES list of issues for 4.3.2

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 8de4894696fb96cc9cc54b99cf2e53a2dce61852
Parents: ba7711b
Author: Rohit Yadav 
Authored: Thu Nov 27 00:06:45 2014 +0530
Committer: Rohit Yadav 
Committed: Thu Nov 27 00:06:45 2014 +0530

--
 CHANGES.md | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8de48946/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
index 1399abc..9fdba2a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -84,7 +84,24 @@ This is a bug fix release. The following issues were fixed:
 CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
 CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus
 CLOUDSTACK-6328: run.sh check if an existing java process is running, 
before spawining new ones
-CLOUDSTACK-6322 - Don't allow service instance creation with empty or null 
service-instance "name".
+CLOUDSTACK-6322: Don't allow service instance creation with empty or null 
service-instance "name".
+CLOUDSTACK-6269: [Simulator] Exception "Unable to send command"
+CLOUDSTACK-6236: Negative ref_cnt of template(snapshot/volume)_store_ref 
results in out-of-range error in Mysql
+CLOUDSTACK-6210: LDAP:listLdapUsers api throws exception when we click on 
"Add LDAP Account"
+CLOUDSTACK-6192: Return failure on StartCommand and 
PrepareForMigrationCommand when connectPhysicalDisk fails
+CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one 
storage to another.
+CLOUDSTACK-6020: ipv4 address can be a larger number then 
Interger.MAX_VALUE
+CLOUDSTACK-5962: Value of Global parameter "custom.diskoffering.size.min" 
is not reflected in UI during new instance creation.
+CLOUDSTACK-5870: API support for retrieving user data
+CLOUDSTACK-5865: Unable to use login API if domainId parameter is id and 
not uuid
+CLOUDSTACK-5839: return canEnableIndividualService in 
listNetworkServiceProvidersResponse
+CLOUDSTACK-5821: systemvmiso is locked by systevmvm in hyperv
+CLOUDSTACK-5762: VM wizard, custom compute offering: Fix error label
+CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical Network 
dropdown is changed, refresh Network Offering dropdown
+CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.
+CLOUDSTACK-5501: Allow one vpn customer gateway with multiple connections
+CLOUDSTACK-5446: delete all the leftover snapshots on primary storage in 
case of snapshot errors
+
 
 Version 4.3.1
 -

[01/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 2b264e6b5 -> 8de489469


CLOUDSTACK-5962: Value of Global parameter "custom.diskoffering.size.min" is 
not reflected in UI during new instance creation.

Added fields to /api and /server classes for CustomDiskOfferingMinSize
to be available in CapabilitiesResponse. Fixed UI code in Instance
Wizard to have this config value as the minimum selectable option when
we are in custom disk size mode.

(cherry picked from commit 883d7f17f78433b37e4f20103b532b3b20582014)
Signed-off-by: Rohit Yadav 

Conflicts:
api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
server/src/com/cloud/server/ManagementServerImpl.java


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

Branch: refs/heads/4.3
Commit: 17c3e83cae5e21b9d69cc84216c504766d0ef0a2
Parents: 2b264e6
Author: Gabor Apati-Nagy 
Authored: Fri Mar 28 14:39:02 2014 +
Committer: Rohit Yadav 
Committed: Wed Nov 26 21:59:16 2014 +0530

--
 api/src/org/apache/cloudstack/api/ApiConstants.java|  1 +
 .../api/command/user/config/ListCapabilitiesCmd.java   |  1 +
 .../cloudstack/api/response/CapabilitiesResponse.java  | 13 +++--
 server/src/com/cloud/server/ManagementServerImpl.java  |  2 ++
 ui/index.jsp   |  2 +-
 ui/scripts/instanceWizard.js   |  6 ++
 ui/scripts/ui-custom/instanceWizard.js |  7 ++-
 7 files changed, 28 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17c3e83c/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 68abf8d..b7ac97b 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -400,6 +400,7 @@ public class ApiConstants {
 public static final String INSTANCE_NAME = "instancename";
 public static final String START_VM = "startvm";
 public static final String HA_HOST = "hahost";
+public static final String CUSTOM_DISK_OFF_MIN_SIZE = 
"customdiskofferingminsize";
 public static final String CUSTOM_DISK_OFF_MAX_SIZE = 
"customdiskofferingmaxsize";
 public static final String DEFAULT_ZONE_ID = "defaultzoneid";
 public static final String LIVE_MIGRATE = "livemigrate";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17c3e83c/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 2176bc0..78d5be9 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -52,6 +52,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
 response.setSupportELB((String)capabilities.get("supportELB"));
 
response.setProjectInviteRequired((Boolean)capabilities.get("projectInviteRequired"));
 
response.setAllowUsersCreateProjects((Boolean)capabilities.get("allowusercreateprojects"));
+
response.setDiskOffMinSize((Long)capabilities.get("customDiskOffMinSize"));
 
response.setDiskOffMaxSize((Long)capabilities.get("customDiskOffMaxSize"));
 
response.setRegionSecondaryEnabled((Boolean)capabilities.get("regionSecondaryEnabled"));
 
response.setKVMSnapshotEnabled((Boolean)capabilities.get("KVMSnapshotEnabled"));

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17c3e83c/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java 
b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 3ce31b5..b64ebdd 100644
--- a/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -43,9 +43,14 @@ public class CapabilitiesResponse extends BaseResponse {
 @SerializedName(ApiConstants.ALLOW_USER_CREATE_PROJECTS) 
@Param(description="true if regular user is allowed to create projects")
 private Boolean allowUsersCreateProjects;
 
-@SerializedName(ApiConstants.CUSTOM_DISK_OFF_MAX_SI

[04/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5839 : return canEnableIndividualService in 
listNetworkServiceProvidersResponse

(cherry picked from commit 07557eb5705e4a822055b204f2d4d86d31eb1d67)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 4fdfd8f9139a45a84e8d9b84952606a5ad41e64a
Parents: 6609191
Author: Alena Prokharchyk 
Authored: Wed Jan 8 14:15:18 2014 -0800
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:11:23 2014 +0530

--
 server/src/com/cloud/api/ApiResponseHelper.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4fdfd8f9/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 4d06a15..cab4f61 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2679,6 +2679,10 @@ public class ApiResponseHelper implements 
ResponseGenerator {
 }
 response.setServices(services);
 
+Provider serviceProvider = 
Provider.getProvider(result.getProviderName());
+boolean canEnableIndividualServices = 
ApiDBUtils.canElementEnableIndividualServices(serviceProvider);
+response.setCanEnableIndividualServices(canEnableIndividualServices);
+
 response.setObjectName("networkserviceprovider");
 return response;
 }

[07/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5762: VM wizard, custom compute offering: Fix error label

(cherry picked from commit 71767cfe8199af075ca0d97db6535d2661071b9a)
Signed-off-by: Rohit Yadav 

Conflicts:
ui/css/cloudstack3.css


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

Branch: refs/heads/4.3
Commit: 8784f58ff29721538efa67d113b185a35d57040c
Parents: 3622471
Author: Brian Federle 
Authored: Thu Oct 23 11:29:02 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:23:21 2014 +0530

--
 ui/css/cloudstack3.css | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8784f58f/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 4ee6916..e8f5248 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6015,6 +6015,17 @@ label.error {
   margin-left: 26px;
 }
 
+.instance-wizard .step.service-offering .custom-size .field label.error {
+  position: relative;
+  top: 0;
+  left: 0;
+}
+
+.instance-wizard .step.service-offering .custom-iops .field input {
+  width: 88%;
+  margin-left: 26px;
+}
+
 /*** Network*/
 .multi-wizard.instance-wizard .no-network {
   background: #FF;

[03/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not 
uuid

(cherry picked from commit e5512960afa384245cfb9d012ac6482b2b7f8940)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 66091911331cd9a8cc8c7cee39d8f9f1e866a1b4
Parents: 1e63d0b
Author: Likitha Shetty 
Authored: Tue Jan 14 13:45:50 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:07:51 2014 +0530

--
 server/src/com/cloud/api/ApiServer.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66091911/server/src/com/cloud/api/ApiServer.java
--
diff --git a/server/src/com/cloud/api/ApiServer.java 
b/server/src/com/cloud/api/ApiServer.java
index 1311879..e39cc85 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -868,7 +868,11 @@ public class ApiServer extends ManagerBase implements 
HttpRequestHandler, ApiSer
 
 @Override
 public Long fetchDomainId(String domainUUID) {
-return _domainMgr.getDomain(domainUUID).getId();
+Domain domain = _domainMgr.getDomain(domainUUID);
+if (domain != null)
+return domain.getId();
+else 
+return null; 
 }
 
 @Override

[11/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5446:
delete all the leftover snapshots on primary storage in case of snapshot
errors, after a new backup snapshot is finished

(cherry picked from commit 2667855ccb932f9a03ddf6639f6411c73fea1b2c)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: ba7711b06685993bca5443ebdf6ccb76e87b9f6f
Parents: e9c5a03
Author: Edison Su 
Authored: Wed Nov 19 14:31:51 2014 -0800
Committer: Rohit Yadav 
Committed: Wed Nov 26 23:43:59 2014 +0530

--
 scripts/storage/qcow2/managesnapshot.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba7711b0/scripts/storage/qcow2/managesnapshot.sh
--
diff --git a/scripts/storage/qcow2/managesnapshot.sh 
b/scripts/storage/qcow2/managesnapshot.sh
index 42bd1eb..6f13600 100755
--- a/scripts/storage/qcow2/managesnapshot.sh
+++ b/scripts/storage/qcow2/managesnapshot.sh
@@ -146,7 +146,8 @@ destroy_snapshot() {
 fi
 lvm lvremove -f "${vg}/${snapshotname}-cow"
   elif [ -f $disk ]; then
- $qemu_img snapshot -d "$snapshotname" $disk
+ #delete all the existing snapshots
+ $qemu_img snapshot -l $disk |tail -n +3|awk '{print $1}'|xargs -I {} 
$qemu_img snapshot -d {} $disk >&2
  if [ $? -gt 0 ]
  then
failed=2

[10/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5501: Allow one vpn customer gateway with multiple connections

This restriction was purposely avoid confusion of VPN setup, but later found too
strictly and cause troubles for deployment. Removed after testing one customer
gateway with multiple connections.

(cherry picked from commit 0a62eb8380390acc7b76a211ef802de0e19aaf13)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java


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

Branch: refs/heads/4.3
Commit: e9c5a03fb0253261b466fd1e3b496cbd500a8049
Parents: 6cd4b28
Author: Sheng Yang 
Authored: Mon May 12 18:26:53 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 23:36:47 2014 +0530

--
 .../src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java  | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9c5a03f/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java 
b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 4b21cb2..db7533e 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -250,14 +250,9 @@ public class Site2SiteVpnManagerImpl extends ManagerBase 
implements Site2SiteVpn
 }
 
 if 
(_vpnConnectionDao.findByVpnGatewayIdAndCustomerGatewayId(vpnGatewayId, 
customerGatewayId) != null) {
-throw new InvalidParameterValueException("The vpn connection with 
customer gateway id " + customerGatewayId + " or vpn gateway id " 
-+ vpnGatewayId + " already existed!");
+throw new InvalidParameterValueException("The vpn connection with 
customer gateway id " + customerGatewayId + " and vpn gateway id " + 
vpnGatewayId +
+" already existed!");
 }
-if (_vpnConnectionDao.findByCustomerGatewayId(customerGatewayId) != 
null) {
-throw new InvalidParameterValueException("The vpn connection with 
specified customer gateway id " + customerGatewayId +
-" already exists!");
-}
-
 String[] cidrList = customerGateway.getGuestCidrList().split(",");
 
 // Remote sub nets cannot overlap VPC's sub net

[02/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5870: API support for retrieving user data

(cherry picked from commit bd79fb33a6978a9dbe7933bcda1579238da4bb27)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java


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

Branch: refs/heads/4.3
Commit: 1e63d0b1346ba6db99b9c094ce28a8f5dbd4600b
Parents: 17c3e83
Author: Alena Prokharchyk 
Authored: Thu Jan 16 15:31:01 2014 -0800
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:06:44 2014 +0530

--
 api/src/com/cloud/vm/UserVmService.java |  8 +++
 .../api/command/admin/vm/GetVMUserDataCmd.java  | 63 
 .../api/response/VMUserDataResponse.java| 26 
 client/tomcatconf/commands.properties.in|  1 +
 .../com/cloud/server/ManagementServerImpl.java  |  2 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 12 
 6 files changed, 112 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e63d0b1/api/src/com/cloud/vm/UserVmService.java
--
diff --git a/api/src/com/cloud/vm/UserVmService.java 
b/api/src/com/cloud/vm/UserVmService.java
index e6ca719..4c64dcf 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -478,4 +478,12 @@ public interface UserVmService {
 
 UserVm expungeVm(long vmId) throws ResourceUnavailableException, 
ConcurrentOperationException;
 
+/**
+ * Finds and returns an encrypted password for a VM.
+ *
+ * @param  userVmId
+ * @return Base64 encoded userdata
+ */
+String getVmUserData(long vmId);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e63d0b1/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java 
b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
new file mode 100644
index 000..b02dc11
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
@@ -0,0 +1,63 @@
+package org.apache.cloudstack.api.command.admin.vm;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.VMUserDataResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.user.Account;
+import com.cloud.uservm.UserVm;
+
+@APICommand(name = "getVirtualMachineUserData", description = "Returns user 
data associated with the VM", responseObject = VMUserDataResponse.class, since 
= "4.4")
+public class GetVMUserDataCmd extends BaseCmd {
+public static final Logger s_logger = 
Logger.getLogger(GetVMUserDataCmd.class);
+private static final String s_name = "getvirtualmachineuserdataresponse";
+
+/
+ API parameters /
+/
+
+@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = 
CommandType.UUID, entityType = UserVmResponse.class, required = true, 
description = "The ID of the virtual machine")
+private Long vmId;
+
+/
+/// Accessors ///
+/
+
+public long getId() {
+return vmId;
+}
+
+/
+/// API Implementation///
+/
+
+@Override
+public void execute() {
+String userData = _userVmService.getVmUserData(getId());
+VMUserDataResponse resp = new VMUserDataResponse();
+resp.setVmId(_entityMgr.findById(UserVm.class, getId()).getUuid());
+resp.setUserData(userData);
+resp.setObjectName("virtualmachineuserdata");
+resp.setResponseName(getCommandName());
+this.setResponseObject(resp);
+}
+
+@Override
+public long getEntityOwnerId() {
+UserVm userVm = _entityMgr.findById(UserVm.class, getId());
+if (userVm != null) {
+return userVm.getAccountId();
+}
+
+return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent 
this command to SYSTEM so ERROR events are tracked
+}
+
+@Override
+p

[06/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv

(cherry picked from commit 7ac48934f77c3b9a72c05300163088a4c198ebf2)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: 3622471099294dce91dd6dce5d096fa791ddf9ef
Parents: 4d24452
Author: Rajesh Battala 
Authored: Tue Jan 28 06:42:54 2014 +0530
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:15:35 2014 +0530

--
 systemvm/patches/debian/config/etc/init.d/cloud-early-config | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/36224710/systemvm/patches/debian/config/etc/init.d/cloud-early-config
--
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config 
b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 8cc927f..a34db68 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -135,7 +135,7 @@ get_boot_params() {
  virtualpc|hyperv)
   # Hyper-V is recognized as virtualpc hypervisor type. Boot args are 
passed using KVP Daemon
   #waiting for the hv_kvp_daemon to start up
-  #sleep 30 need to fix the race condition of hv_kvp_daemon and 
cloud-early-config
+  #sleep  need to fix the race condition of hv_kvp_daemon and 
cloud-early-config
   sleep 5
   cp -f /var/opt/hyperv/.kvp_pool_0 /var/cache/cloud/cmdline
   cat /dev/null > /var/opt/hyperv/.kvp_pool_0
@@ -1250,6 +1250,10 @@ start() {
   patch_log4j
   parse_cmd_line
   change_password
+  if [ "$hyp" == "hyperv" ]; then
+# eject the systemvm.iso
+  eject
+  fi
   case $TYPE in 
  router)
  [ "$NAME" == "" ] && NAME=router

[08/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical Network 
dropdown is changed, refresh Network Offering dropdown (because each physical 
network has its own tags which maps to different network offerings)

(cherry picked from commit 0af0c041e9b05d52d72936b6ecd194ee07be7421)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.3
Commit: bce07b68b8c26f3b44d0e91d76295aaf1d9d15f6
Parents: 8784f58
Author: Jessica Wang 
Authored: Thu Oct 9 13:14:52 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 22:24:52 2014 +0530

--
 ui/scripts/sharedFunctions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bce07b68/ui/scripts/sharedFunctions.js
--
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 86a4a92..b33b099 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -476,7 +476,7 @@ var addGuestNetworkDialog = {
 networkOfferingId: {
 label: 'label.network.offering',
 docID: 'helpGuestNetworkZoneNetworkOffering',
-dependsOn: ['zoneId', 'scope'],
+dependsOn: ['zoneId', 'physicalNetworkId', 'scope'],
 select: function(args) {   

if(args.$form.find('.form-item[rel=zoneId]').find('select').val() == null || 
args.$form.find('.form-item[rel=zoneId]').find('select').val().length == 0) {
args.response.success({

[09/12] git commit: updated refs/heads/4.3 to 8de4894

[bhaisaab]

CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.

(cherry picked from commit e796d418b4ff7d3644bcc962b796d929b3d7baf7)
Signed-off-by: Rohit Yadav 

Conflicts:
ui/scripts/network.js


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

Branch: refs/heads/4.3
Commit: 6cd4b289b2d73359152a4bf53b74edee8e725384
Parents: bce07b6
Author: Jessica Wang 
Authored: Fri Oct 17 14:46:23 2014 -0700
Committer: Rohit Yadav 
Committed: Wed Nov 26 23:31:25 2014 +0530

--
 client/WEB-INF/classes/resources/messages.properties | 10 +-
 ui/scripts/network.js|  8 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cd4b289/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties 
b/client/WEB-INF/classes/resources/messages.properties
index 1af9b30..c6ab351 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -522,7 +522,7 @@ label.DHCP.server.type=DHCP Server Type
 label.dhcp=DHCP
 label.direct.ips=Shared Network IPs
 label.disable.provider=Disable provider
-label.disable.vpn=Disable VPN
+label.disable.vpn=Disable Remote Access VPN
 label.disabled=Disabled
 label.disabling.vpn.access=Disabling VPN Access
 label.disk.allocated=Disk Allocated
@@ -572,7 +572,7 @@ label.email=Email
 label.enable.provider=Enable provider
 label.enable.s3=Enable S3-backed Secondary Storage
 label.enable.swift=Enable Swift
-label.enable.vpn=Enable VPN
+label.enable.vpn=Enable Remote Access VPN
 label.enabling.vpn.access=Enabling VPN Access
 label.enabling.vpn=Enabling VPN
 label.end.IP=End IP
@@ -1436,7 +1436,7 @@ message.detach.iso.confirm=Please confirm that you want 
to detach the ISO from t
 message.disable.account=Please confirm that you want to disable this account.  
By disabling the account, all users for this account will no longer have access 
to their cloud resources.  All running virtual machines will be immediately 
shut down.
 message.disable.snapshot.policy=You have successfully disabled your current 
snapshot policy.
 message.disable.user=Please confirm that you would like to disable this user.
-message.disable.vpn.access=Please confirm that you want to disable VPN Access.
+message.disable.vpn.access=Please confirm that you want to disable Remote 
Access VPN.
 message.disable.vpn=Are you sure you want to disable VPN?
 message.download.ISO=Please click 0 to download ISO
 message.download.template=Please click 0 to download 
template
@@ -1449,9 +1449,9 @@ message.edit.traffic.type=Please specify the traffic 
label you want associated w
 message.enable.account=Please confirm that you want to enable this account.
 message.enable.user=Please confirm that you would like to enable this user.
 message.enable.vpn.access=VPN is currently disabled for this IP Address.  
Would you like to enable VPN access?
-message.enable.vpn=Please confirm that you want VPN access enabled for this IP 
address.
+message.enable.vpn=Please confirm that you want Remote Access VPN enabled for 
this IP address.
 message.enabled.vpn.ip.sec=Your IPSec pre-shared key is
-message.enabled.vpn=Your VPN access is currently enabled and can be accessed 
via the IP
+message.enabled.vpn=Your Remote Access VPN is currently enabled and can be 
accessed via the IP
 message.enabling.security.group.provider=Enabling Security Group provider
 message.enabling.zone=Enabling zone
 message.enter.token=Please enter the token that you were given in your invite 
e-mail.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cd4b289/ui/scripts/network.js
--
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 511ad41..9d3b6ae 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2275,7 +2275,13 @@
 return 'label.enable.vpn';
 },
 complete: function(args) {
-return _l('message.enabled.vpn') + ' ' 
+ args.remoteaccessvpn.publicip + '.' + '' + 
_l('message.enabled.vpn.ip.sec') + '' + args.remoteaccessvpn.presharedkey;
+var msg;
+if (args.vpn.state == "Running") {
+msg = _l('message.enabled.vpn') + 
' ' + args.remoteaccessvpn.publ

git commit: updated refs/heads/master to db9c97e

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/master 4798db0de -> db9c97e7f


UI cleanup


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

Branch: refs/heads/master
Commit: db9c97e7f4701034fa30d952b58e4928610c504a
Parents: 4798db0
Author: Brian Federle 
Authored: Thu Aug 22 13:14:54 2013 -0700
Committer: Brian Federle 
Committed: Wed Nov 26 11:48:27 2014 -0800

--
 ui/scripts/ui/core.js | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db9c97e7/ui/scripts/ui/core.js
--
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
index 94edb19..c5816a0 100644
--- a/ui/scripts/ui/core.js
+++ b/ui/scripts/ui/core.js
@@ -285,6 +285,9 @@
 .appendTo(this);
 var context = args.context;
 
+// Cleanup login
+$('.login').remove();
+
 // Create pageElems
 $.each(pageElems, function(id, fn) {
 var $elem = $('').attr({

git commit: updated refs/heads/4.5 to 8657659

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 3fc392abf -> 86576593b


Adding support for RHEL 6.5


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

Branch: refs/heads/4.5
Commit: 86576593bebd337a7be8e2489a59184a6fca33ce
Parents: 3fc392a
Author: amoghvk 
Authored: Wed Nov 26 14:08:02 2014 -0800
Committer: amoghvk 
Committed: Wed Nov 26 14:08:02 2014 -0800

--
 setup/db/db/schema-442to450.sql | 19 +++
 1 file changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86576593/setup/db/db/schema-442to450.sql
--
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 2f4e2e9..3d850f0 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -751,3 +751,22 @@ ALTER TABLE `cloud_usage`.`usage_vpn_user` CHANGE 
`user_name` `user_name` VARCHA
 ALTER TABLE `cloud`.`user_vm_details` MODIFY `value` VARCHAR(5120);
 
 UPDATE `cloud`.`host` SET resource = REPLACE(resource, 
'com.cloud.hypervisor.xen.resource', 'com.cloud.hypervisor.xenserver.resource') 
WHERE hypervisor_type='XenServer' AND REMOVED IS NULL;
+
+--Support for RHEL 6.5 in relevant hypervisor versions
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (252, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (32-bit)', 
utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (253, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (64-bit)', 
utc_timestamp());
+
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'Red Hat Enterprise Linux 6.5', 252, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'Red Hat Enterprise Linux 6.5', 253, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'LXC', 'default', 'Red Hat Enterprise Linux 6.5', 252, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'LXC', 'default', 'Red Hat Enterprise Linux 6.5', 253, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 6 (32-bit)', 
252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 6 (64-bit)', 
253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '4.1', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '4.1', 'rhel6_64Guest', 253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.0', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.0', 'rhel6_64Guest', 253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.1', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.1', 'rhel6_64Guest', 253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.5', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE I

git commit: updated refs/heads/master to 837a17b

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/master db9c97e7f -> 837a17b3d


Revert "VM detail view: Disable 'change service offering' action per 
CLOUDSTACK-4200"

This reverts commit 73087bc3ffed4200e4e0a298b9e5539e248449a1.


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

Branch: refs/heads/master
Commit: 837a17b3da8e419143a9d6ee9ad67c69deebdb0b
Parents: db9c97e
Author: Brian Federle 
Authored: Wed Nov 26 14:18:01 2014 -0800
Committer: Brian Federle 
Committed: Wed Nov 26 14:18:01 2014 -0800

--
 ui/scripts/instances.js | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/837a17b3/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7ee5db4..11aa725 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1459,9 +1459,6 @@
 
 scaleUp: {
 label: 'label.change.service.offering',
-preFilter: function() {
-return false;
-},
 createForm: {
 title: 'label.change.service.offering',
 desc: function(args) {

git commit: updated refs/heads/master to 3d6635a

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/master 837a17b3d -> 3d6635a53


Add support for RHEL 6.5 and relevant hypervisor mappings


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

Branch: refs/heads/master
Commit: 3d6635a537ca33e6d8d2643c768e31742c001f99
Parents: 837a17b
Author: amoghvk 
Authored: Wed Nov 26 14:21:21 2014 -0800
Committer: amoghvk 
Committed: Wed Nov 26 14:21:21 2014 -0800

--
 setup/db/db/schema-442to450.sql | 19 +++
 1 file changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d6635a5/setup/db/db/schema-442to450.sql
--
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 843b8d0..70b7b7d 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -768,3 +768,22 @@ UPDATE `cloud`.`host` SET resource = REPLACE(resource, 
'com.cloud.hypervisor.xen
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, 
extractable, state)
 VALUES (11, UUID(), 'centos7-x86_64-lxc', 'CentOS 7(64-bit) no GUI (LXC)', 
1, now(), 'BUILTIN', 0, 64, 1, 
'http://download.cloud.com/templates/builtin/centos-7-x86_64.tar.gz', 
'c2c4fa2d0978121c7977db571f132d6e', 0, 'CentOS 7(64-bit) no GUI (LXC)', 'TAR', 
246, 1, 1, 'LXC', 1, 'Active');
+
+--Support for RHEL 6.5 in relevant hypervisor versions
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (252, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (32-bit)', 
utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (253, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (64-bit)', 
utc_timestamp());
+
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'Red Hat Enterprise Linux 6.5', 252, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'Red Hat Enterprise Linux 6.5', 253, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'LXC', 'default', 'Red Hat Enterprise Linux 6.5', 252, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'LXC', 'default', 'Red Hat Enterprise Linux 6.5', 253, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 6 (32-bit)', 
252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Red Hat Enterprise Linux 6 (64-bit)', 
253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '4.1', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '4.1', 'rhel6_64Guest', 253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.0', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.0', 'rhel6_64Guest', 253, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'VMware', '5.1', 'rhel6Guest', 252, utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 

git commit: updated refs/heads/master to 86895ec

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/master 3d6635a53 -> 86895ec13


Add validation for domain names passed via global pamaremets


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

Branch: refs/heads/master
Commit: 86895ec13c11bdf4dc1feab0a3dfa003e02fde12
Parents: 3d6635a
Author: amoghvk 
Authored: Wed Nov 26 14:45:50 2014 -0800
Committer: amoghvk 
Committed: Wed Nov 26 14:45:50 2014 -0800

--
 server/src/com/cloud/configuration/Config.java  | 21 ++--
 .../configuration/ConfigurationManagerImpl.java |  9 +
 2 files changed, 20 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86895ec1/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index 0ef0e25..a1dd882 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -16,6 +16,15 @@
 // under the License.
 package com.cloud.configuration;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
 import com.cloud.agent.AgentManager;
 import com.cloud.consoleproxy.ConsoleProxyManager;
 import com.cloud.ha.HighAvailabilityManager;
@@ -29,14 +38,6 @@ import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.template.TemplateManager;
 import com.cloud.vm.UserVmManager;
 import com.cloud.vm.snapshot.VMSnapshotManager;
-import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
-import org.apache.cloudstack.framework.config.ConfigKey;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringTokenizer;
 
 public enum Config {
 
@@ -438,7 +439,7 @@ public enum Config {
 "Console proxy command port that is used to communicate with 
management server",
 null),
 ConsoleProxyRestart("Console Proxy", AgentManager.class, Boolean.class, 
"consoleproxy.restart", "true", "Console proxy restart flag, defaulted to 
true", null),
-ConsoleProxyUrlDomain("Console Proxy", AgentManager.class, String.class, 
"consoleproxy.url.domain", "", "Console proxy url domain", null),
+ConsoleProxyUrlDomain("Console Proxy", AgentManager.class, String.class, 
"consoleproxy.url.domain", "", "Console proxy url domain", "domainName"),
 ConsoleProxyLoadscanInterval(
 "Console Proxy",
 AgentManager.class,
@@ -774,7 +775,7 @@ public enum Config {
 "secstorage.ssl.cert.domain",
 "",
 "SSL certificate used to encrypt copy traffic between zones",
-null),
+"domainName"),
 SecStorageCapacityStandby(
 "Advanced",
 AgentManager.class,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86895ec1/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 57b50e6..9d25b30 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -327,6 +327,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 
 private int _maxVolumeSizeInGb = 
Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
 private long _defaultPageSize = 
Long.parseLong(Config.DefaultPageSize.getDefaultValue());
+private static final String DOMAIN_NAME_PATTERN = 
"^((?!-)[A-Za-z0-9-]{1,63}(? configValuesForValidation;
 private Set weightBasedParametersForValidation;
 private Set overprovisioningFactorsForValidation;
@@ -838,6 +839,14 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 if (!NetUtils.verifyInstanceName(value)) {
 return "Instance name can not contain hyphen, space or 
plus sign";
 }
+} else if (range.equalsIgnoreCase("domainName")) {
+String domainName = value;
+   

git commit: updated refs/heads/master to 95ea203

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/master 86895ec13 -> 95ea20390


CLOUDSTACK-7976 : Param validation for global params involving domain name


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

Branch: refs/heads/master
Commit: 95ea20390739a24dad92895b8db712282be31bbb
Parents: 86895ec
Author: amoghvk 
Authored: Wed Nov 26 14:54:42 2014 -0800
Committer: amoghvk 
Committed: Wed Nov 26 14:54:42 2014 -0800

--
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95ea2039/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 9d25b30..714e6fc 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -327,7 +327,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 
 private int _maxVolumeSizeInGb = 
Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
 private long _defaultPageSize = 
Long.parseLong(Config.DefaultPageSize.getDefaultValue());
-private static final String DOMAIN_NAME_PATTERN = 
"^((?!-)[A-Za-z0-9-]{1,63}(? configValuesForValidation;
 private Set weightBasedParametersForValidation;
 private Set overprovisioningFactorsForValidation;
@@ -844,7 +844,8 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 if (value.startsWith("*")) {
 domainName = value.substring(2); //skip the "*."
 }
-if (!domainName.matches(DOMAIN_NAME_PATTERN)) {
+//max length for FQDN is 253 + 2, code adds xxx-xxx-xxx-xxx to 
domain name when creating URL
+if (domainName.length() >= 238 || 
!domainName.matches(DOMAIN_NAME_PATTERN)) {
 return "Please enter a valid string for domain name, 
prefixed with '*.' if applicable";
 }
 } else if (range.equals("routes")) {

git commit: updated refs/heads/master to 960b7bb

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/master 95ea20390 -> 960b7bbf7


CLOUDSTACK-7977
Fix password generator, add guards for minimum length


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

Branch: refs/heads/master
Commit: 960b7bbf742bbba62cd25bc62b700c6c829e35f2
Parents: 95ea203
Author: amoghvk 
Authored: Wed Nov 26 15:08:48 2014 -0800
Committer: amoghvk 
Committed: Wed Nov 26 15:08:48 2014 -0800

--
 server/src/com/cloud/configuration/Config.java  |  8 ++
 .../configuration/ConfigurationManagerImpl.java |  5 
 .../src/com/cloud/utils/PasswordGenerator.java  | 26 ++--
 .../com/cloud/utils/PasswordGeneratorTest.java  |  7 +++---
 4 files changed, 35 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/960b7bbf/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index a1dd882..cd0824e 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -908,6 +908,14 @@ public enum Config {
 "0",
 "Default disk I/O read rate in requests per second allowed in User 
vm's disk.",
 null),
+VmPasswordLength(
+"Advanced",
+ManagementServer.class,
+Integer.class,
+"vm.password.length",
+"6",
+"Specifies the length of a randomly generated password",
+null),
 VmDiskThrottlingIopsWriteRate(
 "Advanced",
 ManagementServer.class,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/960b7bbf/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 714e6fc..918dd93 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -367,6 +367,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 configValuesForValidation.add("xenserver.heartbeat.interval");
 configValuesForValidation.add("xenserver.heartbeat.timeout");
 configValuesForValidation.add("incorrect.login.attempts.allowed");
+configValuesForValidation.add("vm.password.length");
 }
 
 private void weightBasedParametersForValidation() {
@@ -780,6 +781,10 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 if (val <= 0) {
 throw new InvalidParameterValueException("Please enter a 
positive value for the configuration parameter:" + name);
 }
+//TODO - better validation for all password pamameters
+if ("vm.password.length".equalsIgnoreCase(name) && val < 6) {
+throw new InvalidParameterValueException("Please enter a 
value greater than 6 for the configuration parameter:" + name);
+}
 } catch (NumberFormatException e) {
 s_logger.error("There was an error trying to parse the integer 
value for:" + name);
 throw new InvalidParameterValueException("There was an error 
trying to parse the integer value for:" + name);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/960b7bbf/utils/src/com/cloud/utils/PasswordGenerator.java
--
diff --git a/utils/src/com/cloud/utils/PasswordGenerator.java 
b/utils/src/com/cloud/utils/PasswordGenerator.java
index b6e4bed..6fa2843 100644
--- a/utils/src/com/cloud/utils/PasswordGenerator.java
+++ b/utils/src/com/cloud/utils/PasswordGenerator.java
@@ -35,18 +35,28 @@ public class PasswordGenerator {
 static private char[] alphaNumeric = new char[] {'A', 'B', 'C', 'D', 'E', 
'F', 'G', 'H', 'J', 'K', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 
'X', 'Y',
 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 
'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '2', '3', '4', '5', '6', '7', 
'8', '9'};
 
+static private int minLength = 3;
+
 public static String generateRandomPassword(int num) {
 Random r = new SecureRandom();
 StringBuilder password = new StringBuilder();
 
-// Generate random 3-character string with a 

[1/3] git commit: updated refs/heads/master to d5761ea

[sangeethah]

Repository: cloudstack
Updated Branches:
  refs/heads/master 960b7bbf7 -> d5761ea65


CLOUDSTACK-7978 : Fixed the script 'test_egress_rules.py' - Zone Network Type 
Information should to be passed to VirtualMachine create method


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

Branch: refs/heads/master
Commit: b81cf5eab19a00b12c2c39c105442f8c12d5cd82
Parents: 960b7bb
Author: Chandan Purushothama 
Authored: Wed Nov 26 16:06:26 2014 -0800
Committer: Sangeetha Hariharan 
Committed: Wed Nov 26 19:32:46 2014 -0800

--
 test/integration/component/test_egress_rules.py | 21 +---
 1 file changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b81cf5ea/test/integration/component/test_egress_rules.py
--
diff --git a/test/integration/component/test_egress_rules.py 
b/test/integration/component/test_egress_rules.py
index 0f05c07..138c765 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -412,7 +412,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 # Should be able to SSH VM
@@ -586,7 +587,8 @@ class TestDefaultGroupEgress(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -766,7 +768,8 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -982,7 +985,8 @@ class TestRevokeEgressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -1379,7 +1383,8 @@ class 
TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
 accountid=self.accountA.name,
 domainid=self.accountA.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.cleanup.append(self.virtual_machineA)
 self.debug("Deploying VM in account: %s" % self.accountA.name)
@@ -1650,7 +1655,8 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase):
 accountid=self.accountA.name,
 domainid=self.accountA.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_groupA.id]
+

[2/3] git commit: updated refs/heads/master to d5761ea

[sangeethah]

CLOUDSTACK-7979 : Fixed the script 'test_security_groups.py' - Zone Network 
Type Information should to be passed to VirtualMachine create method


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

Branch: refs/heads/master
Commit: 4f8799315f71e30ce9edf1e10b39d1bb433ae36b
Parents: b81cf5e
Author: Chandan Purushothama 
Authored: Wed Nov 26 16:12:12 2014 -0800
Committer: Sangeetha Hariharan 
Committed: Wed Nov 26 19:33:06 2014 -0800

--
 .../component/test_security_groups.py   | 21 +---
 1 file changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f879931/test/integration/component/test_security_groups.py
--
diff --git a/test/integration/component/test_security_groups.py 
b/test/integration/component/test_security_groups.py
index 89317f4..eb242c7 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -502,7 +502,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 # Should be able to SSH VM
@@ -643,7 +644,8 @@ class TestRevokeIngressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -729,7 +731,8 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
 cls.services["virtual_machine"],
 accountid=cls.account.name,
 domainid=cls.account.domainid,
-serviceofferingid=cls.service_offering.id
+serviceofferingid=cls.service_offering.id,
+mode=cls.services['mode']
 )
 cls._cleanup = [
 cls.account,
@@ -955,7 +958,8 @@ class TestdeployVMWithUserData(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 # Should be able to SSH VM
@@ -1348,7 +1352,8 @@ class TestIngressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 
@@ -1466,7 +1471,8 @@ class TestIngressRule(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services['mode']
 )

[3/3] git commit: updated refs/heads/master to d5761ea

[sangeethah]

CLOUDSTACK-7980 : Fixed the script 
'/maint/test_egress_rules_host_maintenance.py' - Zone Network Type Information 
should to be passed to VirtualMachine create method


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

Branch: refs/heads/master
Commit: d5761ea65ba6cffecc2f79af2b76cbce380a4547
Parents: 4f87993
Author: Chandan Purushothama 
Authored: Wed Nov 26 16:16:37 2014 -0800
Committer: Sangeetha Hariharan 
Committed: Wed Nov 26 19:33:23 2014 -0800

--
 .../component/maint/test_egress_rules_host_maintenance.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5761ea6/test/integration/component/maint/test_egress_rules_host_maintenance.py
--
diff --git 
a/test/integration/component/maint/test_egress_rules_host_maintenance.py 
b/test/integration/component/maint/test_egress_rules_host_maintenance.py
index a27ada3..5018a14 100644
--- a/test/integration/component/maint/test_egress_rules_host_maintenance.py
+++ b/test/integration/component/maint/test_egress_rules_host_maintenance.py
@@ -234,7 +234,8 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
 accountid=self.account.name,
 domainid=self.account.domainid,
 serviceofferingid=self.service_offering.id,
-securitygroupids=[security_group.id]
+securitygroupids=[security_group.id],
+mode=self.services["mode"]
 )
 self.debug("Deploying VM in account: %s" % self.account.name)
 

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

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/master d5761ea65 -> 4e7af26c9


CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
resource tags due to joining user_vm_details to user_vm_view.


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

Branch: refs/heads/master
Commit: 4e7af26c9fcdb3914c577c743fd83c8f7b8ef424
Parents: d5761ea
Author: Min Chen 
Authored: Fri Nov 21 18:38:33 2014 -0800
Committer: Min Chen 
Committed: Wed Nov 26 17:23:07 2014 -0800

--
 .../cloudstack/api/response/UserVmResponse.java |   7 +
 server/src/com/cloud/api/ApiDBUtils.java|   7 +-
 .../cloud/api/query/dao/ResourceTagJoinDao.java |   2 +
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |   9 +
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |   4 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java|  77 
 setup/db/db/schema-442to450.sql | 192 +++
 7 files changed, 213 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e7af26c/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java 
b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
index 9fe3475..1f55f5b 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -240,6 +240,8 @@ public class UserVmResponse extends BaseResponse implements 
ControlledEntityResp
 @Param(description = "the list of resource tags associated with vm", 
responseObject = ResourceTagResponse.class)
 private Set tags;
 
+transient Set tagIds;
+
 @SerializedName(ApiConstants.DETAILS)
 @Param(description = "Vm details in key/value pairs.", since = "4.2.1")
 private Map details;
@@ -272,6 +274,7 @@ public class UserVmResponse extends BaseResponse implements 
ControlledEntityResp
 securityGroupList = new LinkedHashSet();
 nics = new LinkedHashSet();
 tags = new LinkedHashSet();
+tagIds = new LinkedHashSet();
 affinityGroupList = new LinkedHashSet();
 }
 
@@ -723,6 +726,10 @@ public class UserVmResponse extends BaseResponse 
implements ControlledEntityResp
 this.instanceName = instanceName;
 }
 
+public boolean containTag(Long tagId) {
+return tagIds.contains(tagId);
+}
+
 public void setTags(Set tags) {
 this.tags = tags;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e7af26c/server/src/com/cloud/api/ApiDBUtils.java
--
diff --git a/server/src/com/cloud/api/ApiDBUtils.java 
b/server/src/com/cloud/api/ApiDBUtils.java
index bd974f9..b6eb757 100644
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -1629,12 +1629,7 @@ public class ApiDBUtils {
 }
 
 public static ResourceTagJoinVO findResourceTagViewById(Long tagId) {
-List tags = s_tagJoinDao.searchByIds(tagId);
-if (tags != null && tags.size() > 0) {
-return tags.get(0);
-} else {
-return null;
-}
+return s_tagJoinDao.searchById(tagId);
 }
 
 public static EventResponse newEventResponse(EventJoinVO ve) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e7af26c/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
--
diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java 
b/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
index 1524705..329d927 100644
--- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
+++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
@@ -34,4 +34,6 @@ public interface ResourceTagJoinDao extends 
GenericDao
 List searchByIds(Long... ids);
 
 List listBy(String resourceUUID, ResourceObjectType 
resourceType);
+
+ResourceTagJoinVO searchById(Long id);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e7af26c/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java 
b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
index 27d3787..a496753 100644
--- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
@@ -146

git commit: updated refs/heads/4.5 to bf8dd82

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 86576593b -> bf8dd828f


CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate
resource tags due to joining user_vm_details to user_vm_view.


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

Branch: refs/heads/4.5
Commit: bf8dd828f5c9f9ade42eb17e812d0579478c5467
Parents: 8657659
Author: Min Chen 
Authored: Fri Nov 21 18:38:33 2014 -0800
Committer: Min Chen 
Committed: Wed Nov 26 17:40:06 2014 -0800

--
 .../cloudstack/api/response/UserVmResponse.java |   7 +
 server/src/com/cloud/api/ApiDBUtils.java|   7 +-
 .../cloud/api/query/dao/ResourceTagJoinDao.java |   2 +
 .../api/query/dao/ResourceTagJoinDaoImpl.java   |   9 +
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |   4 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java|  77 
 setup/db/db/schema-442to450.sql | 192 +++
 7 files changed, 213 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf8dd828/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java 
b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
index 9fe3475..1f55f5b 100644
--- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -240,6 +240,8 @@ public class UserVmResponse extends BaseResponse implements 
ControlledEntityResp
 @Param(description = "the list of resource tags associated with vm", 
responseObject = ResourceTagResponse.class)
 private Set tags;
 
+transient Set tagIds;
+
 @SerializedName(ApiConstants.DETAILS)
 @Param(description = "Vm details in key/value pairs.", since = "4.2.1")
 private Map details;
@@ -272,6 +274,7 @@ public class UserVmResponse extends BaseResponse implements 
ControlledEntityResp
 securityGroupList = new LinkedHashSet();
 nics = new LinkedHashSet();
 tags = new LinkedHashSet();
+tagIds = new LinkedHashSet();
 affinityGroupList = new LinkedHashSet();
 }
 
@@ -723,6 +726,10 @@ public class UserVmResponse extends BaseResponse 
implements ControlledEntityResp
 this.instanceName = instanceName;
 }
 
+public boolean containTag(Long tagId) {
+return tagIds.contains(tagId);
+}
+
 public void setTags(Set tags) {
 this.tags = tags;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf8dd828/server/src/com/cloud/api/ApiDBUtils.java
--
diff --git a/server/src/com/cloud/api/ApiDBUtils.java 
b/server/src/com/cloud/api/ApiDBUtils.java
index 37abdcb..86b88d7 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -1633,12 +1633,7 @@ public class ApiDBUtils {
 }
 
 public static ResourceTagJoinVO findResourceTagViewById(Long tagId) {
-List tags = s_tagJoinDao.searchByIds(tagId);
-if (tags != null && tags.size() > 0) {
-return tags.get(0);
-} else {
-return null;
-}
+return s_tagJoinDao.searchById(tagId);
 }
 
 public static EventResponse newEventResponse(EventJoinVO ve) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf8dd828/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
--
diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java 
b/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
index 1524705..329d927 100644
--- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
+++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDao.java
@@ -34,4 +34,6 @@ public interface ResourceTagJoinDao extends 
GenericDao
 List searchByIds(Long... ids);
 
 List listBy(String resourceUUID, ResourceObjectType 
resourceType);
+
+ResourceTagJoinVO searchById(Long id);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf8dd828/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java 
b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
index 27d3787..a496753 100644
--- a/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java
@@ -146,6 +14