date:20131010

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

2013-10-10 Thread kishan

CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived 
templates Template created from a volume or snapshot did not have the 
sourcetemplateid field set in vm_template table.


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

Branch: refs/heads/master
Commit: bb7493775c202f9a0345482b7a9cb478ed48ba11
Parents: 2799ee3
Author: Harikrishna Patnala 
Authored: Wed Oct 9 16:32:09 2013 +0530
Committer: Kishan Kavala 
Committed: Thu Oct 10 12:20:40 2013 +0530

--
 engine/schema/src/com/cloud/storage/VolumeVO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb749377/engine/schema/src/com/cloud/storage/VolumeVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java 
b/engine/schema/src/com/cloud/storage/VolumeVO.java
index 43a8d4c..df7cfd4 100755
--- a/engine/schema/src/com/cloud/storage/VolumeVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeVO.java
@@ -155,7 +155,7 @@ public class VolumeVO implements Volume {
 private Long vmSnapshotChainSize;
 
 @Column(name = "iso_id")
-private long isoId;
+private Long isoId;
 
 @Transient
 // @Column(name="reservation")
@@ -571,7 +571,7 @@ public class VolumeVO implements Volume {
 return this.isoId;
 }
 
-public void setIsoId(long isoId) {
+public void setIsoId(Long isoId) {
 this.isoId =isoId;
 }

[1/2] git commit: updated refs/heads/4.2 to 4392a47

2013-10-10 Thread kishan

Updated Branches:
  refs/heads/4.2 34fecbf5e -> 4392a47d1
  refs/heads/master 2799ee3d4 -> bb7493775


CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived 
templates Template created from a volume or snapshot did not have the 
sourcetemplateid field set in vm_template table.


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

Branch: refs/heads/4.2
Commit: 4392a47d1dfac656e645ac7620ac95a839745a29
Parents: 34fecbf
Author: Harikrishna Patnala 
Authored: Wed Oct 9 16:32:09 2013 +0530
Committer: Kishan Kavala 
Committed: Thu Oct 10 12:19:54 2013 +0530

--
 engine/schema/src/com/cloud/storage/VolumeVO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4392a47d/engine/schema/src/com/cloud/storage/VolumeVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java 
b/engine/schema/src/com/cloud/storage/VolumeVO.java
index ea3d6bf..8a5bf56 100755
--- a/engine/schema/src/com/cloud/storage/VolumeVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeVO.java
@@ -154,7 +154,7 @@ public class VolumeVO implements Volume {
 private Long vmSnapshotChainSize;
 
 @Column(name = "iso_id")
-private long isoId;
+private Long isoId;
 
 @Transient
 // @Column(name="reservation")
@@ -570,7 +570,7 @@ public class VolumeVO implements Volume {
 return this.isoId;
 }
 
-public void setIsoId(long isoId) {
+public void setIsoId(Long isoId) {
 this.isoId =isoId;
 }
 }

Jenkins build is back to normal : cloudstack-rat-master #3384

2013-10-10 Thread Apache Jenkins Server

See

[3/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

RoleBasedEntityAccessChecker logic now performs checkAccess for VM entity


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

Branch: refs/heads/rbac
Commit: 7d1ba6505d83a61f30e86b5037a3a5645cc35c6b
Parents: 0b1aaf5
Author: Prachi Damle 
Authored: Wed Oct 9 15:21:27 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:43:59 2013 -0700

--
 .../entity/RoleBasedEntityAccessChecker.java| 96 +---
 1 file changed, 45 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d1ba650/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
--
diff --git 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
index 5be8836..6031d92 100644
--- 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
+++ 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.acl.entity;
 
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -39,6 +40,7 @@ import org.apache.log4j.Logger;
 import com.cloud.acl.DomainChecker;
 import com.cloud.api.ApiDispatcher;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.vm.VirtualMachine;
@@ -64,75 +66,67 @@ public class RoleBasedEntityAccessChecker extends 
DomainChecker implements Secur
 @Override
 public boolean checkAccess(Account caller, ControlledEntity entity, 
AccessType accessType)
 throws PermissionDeniedException {
+if (entity instanceof VirtualMachine) {
 
-String entityType = AclEntityType.VM.toString();
+String entityType = AclEntityType.VM.toString();
 
-// check if explicit allow/deny is present for this entity in
-// acl_entity_permission
+// check if explicit allow/deny is present for this entity in
+// acl_entity_permission
 
-if (entity instanceof InternalIdentity) {
-InternalIdentity entityWithId = (InternalIdentity) entity;
+if (entity instanceof InternalIdentity) {
+InternalIdentity entityWithId = (InternalIdentity) entity;
 
-List acctGroups = 
_aclGroupAccountMapDao.listByAccountId(caller.getId());
+List acctGroups = 
_aclGroupAccountMapDao.listByAccountId(caller.getId());
 
-for (AclGroupAccountMapVO groupMapping : acctGroups) {
-AclEntityPermissionVO entityPermission = 
_entityPermissionDao.findByGroupAndEntity(
-groupMapping.getAclGroupId(), entityType, 
entityWithId.getId(), accessType);
+for (AclGroupAccountMapVO groupMapping : acctGroups) {
+AclEntityPermissionVO entityPermission = 
_entityPermissionDao.findByGroupAndEntity(
+groupMapping.getAclGroupId(), entityType, 
entityWithId.getId(), accessType);
 
-if (entityPermission != null) {
-if (entityPermission.isAllowed()) {
-return true;
-} else {
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Account " + caller + " does not 
have permission to access resource "
-+ entity + " for access type: " + 
accessType);
+if (entityPermission != null) {
+if (entityPermission.isAllowed()) {
+return true;
+} else {
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Account " + caller + " does 
not have permission to access resource "
++ entity + " for access type: " + 
accessType);
+}
+throw new PermissionDeniedException(caller
++ " does not have permission to access 
resource " + entity);
 }
-throw new PermissionDeniedException(caller + " does 
not have permission to access resource "
-

[6/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

Duplicate getter-setter after merge


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

Branch: refs/heads/rbac
Commit: 5c7db71bbbdfdb9fd04a1ed090565fa8afe1258f
Parents: 8245154
Author: Prachi Damle 
Authored: Thu Oct 10 00:47:36 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:47:36 2013 -0700

--
 .../src/org/apache/cloudstack/acl/AclRolePermissionVO.java   | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c7db71b/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java 
b/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
index bb993d0..d1a8e32 100644
--- a/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
+++ b/engine/schema/src/org/apache/cloudstack/acl/AclRolePermissionVO.java
@@ -115,12 +115,4 @@ public class AclRolePermissionVO implements 
AclRolePermission {
 this.allowed = allowed;
 }
 
-@Override
-public PermissionScope getScope() {
-return scope;
-}
-
-public void setScope(PermissionScope scope) {
-this.scope = scope;
-}
 }

[2/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

More logic to Role based checker


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

Branch: refs/heads/rbac
Commit: 0b1aaf514f7957a252ce71bcfbe5c7e3cecd5625
Parents: 7ebb972
Author: Prachi Damle 
Authored: Tue Oct 8 15:36:23 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:43:56 2013 -0700

--
 api/src/org/apache/cloudstack/acl/AclRole.java  |  4 ++
 .../org/apache/cloudstack/acl/AclService.java   |  3 ++
 .../org/apache/cloudstack/acl/AclRoleVO.java| 14 +++
 .../entity/RoleBasedEntityAccessChecker.java| 41 
 .../apache/cloudstack/acl/AclServiceImpl.java   | 18 +
 setup/db/db/schema-420to430.sql | 15 +++
 6 files changed, 81 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b1aaf51/api/src/org/apache/cloudstack/acl/AclRole.java
--
diff --git a/api/src/org/apache/cloudstack/acl/AclRole.java 
b/api/src/org/apache/cloudstack/acl/AclRole.java
index 3324879..207aece 100644
--- a/api/src/org/apache/cloudstack/acl/AclRole.java
+++ b/api/src/org/apache/cloudstack/acl/AclRole.java
@@ -28,4 +28,8 @@ public interface AclRole extends PartOf, InternalIdentity, 
Identity {
 String getDescription();
 
 // Long getParentRoleId();
+
+public enum RoleType {
+Static, Dynamic
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b1aaf51/api/src/org/apache/cloudstack/acl/AclService.java
--
diff --git a/api/src/org/apache/cloudstack/acl/AclService.java 
b/api/src/org/apache/cloudstack/acl/AclService.java
index c7a1174..749fc15 100644
--- a/api/src/org/apache/cloudstack/acl/AclService.java
+++ b/api/src/org/apache/cloudstack/acl/AclService.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 
 import com.cloud.utils.Pair;
+import com.cloud.user.Account;
 
 public interface AclService {
 
@@ -86,4 +87,6 @@ public interface AclService {
 
 boolean isAPIAccessibleForRoles(String apiName, List roles);
 
+List getEffectiveRoles(Account caller, ControlledEntity entity);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b1aaf51/engine/schema/src/org/apache/cloudstack/acl/AclRoleVO.java
--
diff --git a/engine/schema/src/org/apache/cloudstack/acl/AclRoleVO.java 
b/engine/schema/src/org/apache/cloudstack/acl/AclRoleVO.java
index 767fdfe..30ba472 100644
--- a/engine/schema/src/org/apache/cloudstack/acl/AclRoleVO.java
+++ b/engine/schema/src/org/apache/cloudstack/acl/AclRoleVO.java
@@ -21,6 +21,8 @@ import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -55,6 +57,10 @@ public class AclRoleVO implements AclRole {
 @Column(name = GenericDao.CREATED_COLUMN)
 private Date created;
 
+@Column(name = "role_type")
+@Enumerated(value = EnumType.STRING)
+private AclRole.RoleType roleType;
+
 public AclRoleVO() {
uuid = UUID.randomUUID().toString();
 }
@@ -63,6 +69,7 @@ public class AclRoleVO implements AclRole {
 this.name = name;
 this.description = description;
uuid = UUID.randomUUID().toString();
+this.roleType = AclRole.RoleType.Static;
 }
 
 @Override
@@ -107,4 +114,11 @@ public class AclRoleVO implements AclRole {
 this.domainId = domainId;
 }
 
+public RoleType getRoleType() {
+return roleType;
+}
+
+public void setRoleType(RoleType roleType) {
+this.roleType = roleType;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b1aaf51/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
--
diff --git 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
index 21ced06..5be8836 100644
--- 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
+++ 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
@@ -21,8 +21

[4/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker


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

Branch: refs/heads/rbac
Commit: ec4fa61ae30cccac3f4bc3cff9cb3b31ab1818ea
Parents: 7d1ba65
Author: Prachi Damle 
Authored: Thu Oct 10 00:39:31 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:46:06 2013 -0700

--
 .../cloudstack/acl/AclRolePermission.java   |  2 ++
 .../api/command/user/vm/StartVMCmd.java |  3 ++
 client/pom.xml  |  5 +++
 client/tomcatconf/applicationContext.xml.in |  1 +
 client/tomcatconf/componentContext.xml.in   |  1 +
 client/tomcatconf/nonossComponentContext.xml.in |  1 +
 .../tomcatconf/simulatorComponentContext.xml.in |  1 +
 .../cloudstack/acl/AclRolePermissionVO.java |  9 +
 .../entity/RoleBasedEntityAccessChecker.java| 35 +---
 9 files changed, 53 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec4fa61a/api/src/org/apache/cloudstack/acl/AclRolePermission.java
--
diff --git a/api/src/org/apache/cloudstack/acl/AclRolePermission.java 
b/api/src/org/apache/cloudstack/acl/AclRolePermission.java
index 69259e2..0c0c0de 100644
--- a/api/src/org/apache/cloudstack/acl/AclRolePermission.java
+++ b/api/src/org/apache/cloudstack/acl/AclRolePermission.java
@@ -30,4 +30,6 @@ public interface AclRolePermission extends InternalIdentity {
 PermissionScope getScope();
 
 boolean isAllowed();
+
+PermissionScope getScope();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec4fa61a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
--
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java 
b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 8441ac6..e971ff2 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.vm;
 
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -50,6 +52,7 @@ public class StartVMCmd extends BaseAsyncCmd {
 // // API parameters /
 // ///
 
+@ACL(accessType = AccessType.OperateEntry)
 @Parameter(name = ApiConstants.ID, type = CommandType.UUID, 
entityType=UserVmResponse.class,
 required = true, description = "The ID of the virtual machine")
 private Long id;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec4fa61a/client/pom.xml
--
diff --git a/client/pom.xml b/client/pom.xml
index f441601..99a3c3e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -36,6 +36,11 @@
 
 
   org.apache.cloudstack
+  cloud-plugin-acl-role-based-access-checkers
+  ${project.version}
+
+
+  org.apache.cloudstack
   cloud-plugin-dedicated-resources
   ${project.version}
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec4fa61a/client/tomcatconf/applicationContext.xml.in
--
diff --git a/client/tomcatconf/applicationContext.xml.in 
b/client/tomcatconf/applicationContext.xml.in
index 1095e0a..da242b3 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -389,6 +389,7 @@
   
   
   
+

[1/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

Updated Branches:
  refs/heads/rbac 2b4703b6e -> 5c7db71bb


SecurityChecker checking against the acl_entity_permission table


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

Branch: refs/heads/rbac
Commit: 7ebb972885e7dc5714f376168425f3c25aec065e
Parents: 2b4703b
Author: Prachi Damle 
Authored: Mon Oct 7 16:29:49 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:41:11 2013 -0700

--
 .../entity/RoleBasedEntityAccessChecker.java| 37 ++--
 1 file changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ebb9728/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
--
diff --git 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
index fa8bed1..21ced06 100644
--- 
a/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
+++ 
b/plugins/acl/role-based-access-checkers/src/org/apache/cloudstack/acl/entity/RoleBasedEntityAccessChecker.java
@@ -20,16 +20,21 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import org.apache.cloudstack.acl.AclEntityPermissionVO;
 import org.apache.cloudstack.acl.AclGroupAccountMapVO;
 import org.apache.cloudstack.acl.AclRole;
 import org.apache.cloudstack.acl.AclService;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.acl.dao.AclEntityPermissionDao;
 import org.apache.cloudstack.acl.dao.AclGroupAccountMapDao;
 import org.apache.cloudstack.acl.dao.AclGroupDao;
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.log4j.Logger;
 
 import com.cloud.acl.DomainChecker;
+import com.cloud.api.ApiDispatcher;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
@@ -37,6 +42,8 @@ import com.cloud.vm.VirtualMachine;
 
 public class RoleBasedEntityAccessChecker extends DomainChecker implements 
SecurityChecker {
 
+private static final Logger s_logger = 
Logger.getLogger(RoleBasedEntityAccessChecker.class.getName());
+
 @Inject
 AccountService _accountService;
 @Inject
@@ -45,15 +52,41 @@ public class RoleBasedEntityAccessChecker extends 
DomainChecker implements Secur
 @Inject
 AclGroupAccountMapDao _aclGroupAccountMapDao;
 
+@Inject
+AclEntityPermissionDao _entityPermissionDao;
+
 @Override
 public boolean checkAccess(Account caller, ControlledEntity entity, 
AccessType accessType)
 throws PermissionDeniedException {
 
+String entityType = "";
+
 // check if explicit allow/deny is present for this entity in
 // acl_entity_permission
 
-List acctGroups = 
_aclGroupAccountMapDao.listByAccountId(caller.getId());
-
+if (entity instanceof InternalIdentity) {
+InternalIdentity entityWithId = (InternalIdentity) entity;
+
+List acctGroups = 
_aclGroupAccountMapDao.listByAccountId(caller.getId());
+
+for (AclGroupAccountMapVO groupMapping : acctGroups) {
+AclEntityPermissionVO entityPermission = 
_entityPermissionDao.findByGroupAndEntity(
+groupMapping.getAclGroupId(), entityType, 
entityWithId.getId(), accessType);
+
+if (entityPermission != null) {
+if (entityPermission.isAllowed()) {
+return true;
+} else {
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Account " + caller + " does not 
have permission to access resource "
++ entity + " for access type: " + 
accessType);
+}
+throw new PermissionDeniedException(caller + " does 
not have permission to access resource "
++ entity);
+}
+}
+}
+}
 
 // Is Caller RootAdmin? Yes, granted true
 if (_accountService.isRootAdmin(caller.getId())) {

[5/6] git commit: updated refs/heads/rbac to 5c7db71

2013-10-10 Thread prachidamle

Schema change to add role_type to acl_role


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

Branch: refs/heads/rbac
Commit: 8245154c2f3381fa26faa29be707841b8ce7bfb9
Parents: ec4fa61
Author: Prachi Damle 
Authored: Thu Oct 10 00:40:23 2013 -0700
Committer: Prachi Damle 
Committed: Thu Oct 10 00:46:09 2013 -0700

--
 setup/db/db/schema-420to430.sql | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8245154c/setup/db/db/schema-420to430.sql
--
diff --git a/setup/db/db/schema-420to430.sql b/setup/db/db/schema-420to430.sql
index eb4dfff..ec68273 100644
--- a/setup/db/db/schema-420to430.sql
+++ b/setup/db/db/schema-420to430.sql
@@ -333,12 +333,12 @@ CREATE TABLE `cloud`.`acl_group_role_map` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (1, 'NORMAL', 'Domain user role', UUID(), 1, Now(), 'Static');
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (2, 'ADMIN', 'Root admin role', UUID(), 1, Now(), 'Static');
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (3, 'DOMAIN_ADMIN', 'Domain admin role', UUID(), 1, Now(), 
'Static');
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (4, 'RESOURCE_DOMAIN_ADMIN', 'Resource domain admin role', 
UUID(), 1, Now(), 'Static');
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (5, 'READ_ONLY_ADMIN', 'Read only admin role', UUID(), 1, 
Now(), 'Static');
-INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created) VALUES (6, 'RESOURCE_OWNER', 'Resource owner role', UUID(), 1, Now(), 
'Dynamic');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (1, 'NORMAL', 'Domain user role', UUID(), 1, Now(), 
'Static');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (2, 'ADMIN', 'Root admin role', UUID(), 1, Now(), 
'Static');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (3, 'DOMAIN_ADMIN', 'Domain admin role', UUID(), 1, 
Now(), 'Static');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (4, 'RESOURCE_DOMAIN_ADMIN', 'Resource domain admin 
role', UUID(), 1, Now(), 'Static');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (5, 'READ_ONLY_ADMIN', 'Read only admin role', 
UUID(), 1, Now(), 'Static');
+INSERT IGNORE INTO `cloud`.`acl_role` (id, name, description, uuid, domain_id, 
created, role_type) VALUES (6, 'RESOURCE_OWNER', 'Resource owner role', UUID(), 
1, Now(), 'Dynamic');
 
 INSERT IGNORE INTO `cloud`.`acl_group` (id, name, description, uuid, 
domain_id, created) VALUES (1, 'NORMAL', 'Domain user group', UUID(), 1, Now());
 INSERT IGNORE INTO `cloud`.`acl_group` (id, name, description, uuid, 
domain_id, created) VALUES (2, 'ADMIN', 'Root admin group', UUID(), 1, Now());

git commit: updated refs/heads/4.2 to d5eda57

2013-10-10 Thread swamy

Updated Branches:
  refs/heads/4.2 4392a47d1 -> d5eda578c


CLOUDSTACK-702: 1. Moved common code to setupClass method 2. Added a test to 
deply vm in new CIDR and verify dns service on alias IP

Conflicts:

test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: sanjeevneelarapu 
Signed-off-by: venkataswamybabu budumuru 
(cherry picked from commit 1efd544ee27fd0c7c9eac4649568647c0dcbc85b)


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

Branch: refs/heads/4.2
Commit: d5eda578cd1dafe24d6ab3b633113468acbecd4f
Parents: 4392a47
Author: sanjeevneelarapu 
Authored: Thu Oct 3 22:34:55 2013 +0530
Committer: venkataswamybabu budumuru 
Committed: Thu Oct 10 17:38:55 2013 +0530

--
 .../component/maint/test_multiple_ip_ranges.py  | 263 +++
 1 file changed, 156 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5eda578/test/integration/component/maint/test_multiple_ip_ranges.py
--
diff --git a/test/integration/component/maint/test_multiple_ip_ranges.py 
b/test/integration/component/maint/test_multiple_ip_ranges.py
index 782957c..68b5979 100644
--- a/test/integration/component/maint/test_multiple_ip_ranges.py
+++ b/test/integration/component/maint/test_multiple_ip_ranges.py
@@ -59,11 +59,11 @@ class Services:
 "ostype": "CentOS 5.3 (64-bit)",
 "templatefilter": 'self',
 },
- "vlan_ip_range": {
-   "startip": "",
-   "endip": "",
-   "netmask": "",
-   "gateway": "",
+"vlan_ip_range": {
+   "startip": "10.147.43.130",
+   "endip": "10.147.43.135",
+   "netmask": "255.255.255.192",
+   "gateway": "10.147.43.129",
"forvirtualnetwork": "false",
"vlan": "untagged",
 },
@@ -73,14 +73,12 @@ class Services:
 "password": "password",
 "hypervisor": 'XenServer',
 },
-   "cidr": {
-  "name": "cidr1 -Test",
-  "gateway" :"10.147.43.1",
-  "netmask" :"255.255.255.128",
-  "startip" :"10.147.43.3",
-  "endip" :"10.147.43.10",
+"host": {
+   "publicport": 22,
+   "username": "root",# Host creds for SSH
+   "password": "password",
 },
-"ostype": "CentOS 5.3 (64-bit)",
+   "ostype": "CentOS 5.3 (64-bit)",
 "sleep": 60,
 "timeout": 10,
   }
@@ -88,11 +86,10 @@ class Services:
 class TestMultipleIpRanges(cloudstackTestCase):
 """Test Multiple IP Ranges for guest network
 """
-
-
 @classmethod
 def setUpClass(cls):
 cls.api_client = super(TestMultipleIpRanges, 
cls).getClsTestClient().getApiClient()
+cls.dbclient = super(TestMultipleIpRanges, 
cls).getClsTestClient().getDbConnection()
 cls.services = Services().services
 # Get Zone, Domain and templates
 cls.domain = get_domain(cls.api_client, cls.services)
@@ -122,7 +119,49 @@ class TestMultipleIpRanges(cloudstackTestCase):
 )
 cls.services["templates"]["ostypeid"] = cls.template.ostypeid
 cls.services["diskoffering"] = cls.disk_offering.id
+cls.dc_id = cls.dbclient.execute(
+  "select id from data_center where uuid = 
'%s';" % str(cls.services["zoneid"])
+  )
+cls.dc_id = cls.dc_id[0][0]
+cls.ids = cls.dbclient.execute(
+"select id from user_ip_address where allocated is 
null and data_center_id = '%s';" % str(cls.dc_id)
+)
+cls.id_list = []
+for i in range(len(cls.ids)):
+cls.id_list.append(cls.ids[i][0])
+#Check if V

git commit: updated refs/heads/master to 52c2bc0

2013-10-10 Thread tsp

Updated Branches:
  refs/heads/master bb7493775 -> 52c2bc0ba


pep8: fix regression from 10938612cc9f518e254f8756581548eeb52913b4

Signed-off-by: Prasanna Santhanam 


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

Branch: refs/heads/master
Commit: 52c2bc0baf69c31ef54617e391e5badf85db53e9
Parents: bb74937
Author: Prasanna Santhanam 
Authored: Thu Oct 10 17:47:33 2013 +0530
Committer: Prasanna Santhanam 
Committed: Thu Oct 10 17:47:52 2013 +0530

--
 tools/marvin/marvin/cloudstackConnection.py | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52c2bc0b/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index c5a4c67..686c533 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -32,8 +32,10 @@ from requests import RequestException
 
 
 class cloudConnection(object):
+
 """ Connections to make API calls to the cloudstack management server
 """
+
 def __init__(self, mgtSvr, port=8096, user=None, passwd=None,
  apiKey=None, securityKey=None,
  asyncTimeout=3600, logging=None, scheme='http',
@@ -144,9 +146,11 @@ class cloudConnection(object):
 
 try:
 if method == 'POST':
-response = requests.post(self.baseurl, params=payload, 
verify=False)
+response = requests.post(
+self.baseurl, params=payload, verify=False)
 else:
-response = requests.get(self.baseurl, params=payload, 
verify=False)
+response = requests.get(
+self.baseurl, params=payload, verify=False)
 except ConnectionError, c:
 self.logging.debug("Connection refused. Reason: %s : %s" %
(self.baseurl, c))

[8/9] git commit: updated refs/heads/hyperv to c2ddf83

2013-10-10 Thread devdeep

Rearrange code to make it clearer what .NET objects are being used.


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

Branch: refs/heads/hyperv
Commit: 1edd300966ce11e1d59e4b1ff9feaaa77f531f5b
Parents: 53fd4e8
Author: Donal Lafferty 
Authored: Thu Oct 10 18:13:52 2013 +0530
Committer: Devdeep Singh 
Committed: Thu Oct 10 18:16:16 2013 +0530

--
 .../hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1edd3009/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index 3f2761f..7557320 100755
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -56,11 +56,10 @@ namespace HypervResource
 kvpItem.LateBoundObject["Source"] = 0;
 logger.Debug("VM " + vm.Name + " gets userdata " + userData);
 
-String kvpStr = 
kvpItem.LateBoundObject.GetText(TextFormat.CimDtd20);
-
 // Update the resource settings for the VM.
-ManagementPath jobPath;
-
+System.Management.ManagementBaseObject kvpMgmtObj = 
kvpItem.LateBoundObject;
+System.Management.ManagementPath jobPath;
+String kvpStr = 
kvpMgmtObj.GetText(System.Management.TextFormat.CimDtd20);
 uint ret_val = vmMgmtSvc.AddKvpItems(new String[] { kvpStr }, 
vm.Path, out jobPath);
 
 // If the Job is done asynchronously

[7/9] git commit: updated refs/heads/hyperv to c2ddf83

2013-10-10 Thread devdeep

Add ability to pass kvp data via the key cloudstack-vm-userdata


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

Branch: refs/heads/hyperv
Commit: 53fd4e8c7244d8db148fd248613b748e422b8639
Parents: 1d0a931
Author: Devdeep Singh 
Authored: Thu Oct 10 18:11:58 2013 +0530
Committer: Devdeep Singh 
Committed: Thu Oct 10 18:11:58 2013 +0530

--
 .../AgentShell/AgentSettings.Designer.cs|   12 +
 .../AgentShell/AgentSettings.settings   |   11 +-
 .../HypervResource/HypervResource.csproj|3 +-
 .../HypervResource/HypervResourceController.cs  |4 +-
 .../ServerResource/HypervResource/WmiCalls.cs   |  219 --
 .../ServerResource/HypervResource/WmiCallsV2.cs |  501 +
 .../HypervResourceControllerTest.cs |   84 +
 ...OOT.virtualization.v2.Msvm_ComputerSystem.cs | 1800 
 .../ROOT.virtualization.v2.Msvm_ConcreteJob.cs  | 1826 +
 ...rtualization.v2.Msvm_KvpExchangeComponent.cs | 1597 +++
 ...n.v2.Msvm_KvpExchangeComponentSettingData.cs | 1037 ++
 ...irtualization.v2.Msvm_KvpExchangeDataItem.cs |  653 ++
 ...on.v2.Msvm_VirtualSystemManagementService.cs | 1916 ++
 ...lization.v2.Msvm_VirtualSystemSettingData.cs | 1673 +++
 .../WmiWrappers/WmiWrappers.csproj  |   21 +
 15 files changed, 11134 insertions(+), 223 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53fd4e8c/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.Designer.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.Designer.cs
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.Designer.cs
index 44df706..a73e6bb 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.Designer.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.Designer.cs
@@ -367,5 +367,17 @@ namespace CloudStack.Plugin.AgentShell {
 this["testCifsPath"] = value;
 }
 }
+
+[global::System.Configuration.UserScopedSettingAttribute()]
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+[global::System.Configuration.DefaultSettingValueAttribute("CentOS64")]
+public string testKvpVmName {
+get {
+return ((string)(this["testKvpVmName"]));
+}
+set {
+this["testKvpVmName"] = value;
+}
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53fd4e8c/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings
index 0d54f44..435b8e0 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentSettings.settings
@@ -98,5 +98,14 @@
 
   2048
 
+
+  cifs://10.1.1.1/secondary?user\u003dadministrator\u0026password\u003d1pass%40word1
+
+
+  template/tmpl/2/201/61d5316a-3cc4-30cf-a557-78691ff5c143.vhd
+
+
+  CentOS64
+
   
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53fd4e8c/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj
index 48cf5a5..dbd7b15 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj
@@ -76,6 +76,7 @@
   
   
 
+
 
 
 
@@ -99,4 +100,4 @@
   
   
   -->
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53fd4e8c/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/Hyp

[9/9] git commit: updated refs/heads/hyperv to c2ddf83

2013-10-10 Thread devdeep

Test failures are easier to deal with if test key is not deleted.


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

Branch: refs/heads/hyperv
Commit: c2ddf836bfa6289b6e19127699c9b912b3cffc26
Parents: 1edd300
Author: Donal Lafferty 
Authored: Thu Oct 10 18:17:27 2013 +0530
Committer: Devdeep Singh 
Committed: Thu Oct 10 18:18:05 2013 +0530

--
 .../ServerResource.Tests/HypervResourceControllerTest.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2ddf836/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceControllerTest.cs
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceControllerTest.cs
 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceControllerTest.cs
index 7d7f627..8a86727 100644
--- 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceControllerTest.cs
+++ 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/HypervResourceControllerTest.cs
@@ -816,7 +816,7 @@ namespace ServerResource.Tests
 
 if (existingKey == key && existingValue == value)
 {
-WmiCallsV2.DeleteHostKvpItem(vm, existingKey);
+//WmiCallsV2.DeleteHostKvpItem(vm, existingKey);
 userDataInPlace = true;
 break;
 }

git commit: Add publican config for qig

2013-10-10 Thread duffy

Updated Branches:
  refs/heads/master 941c197b5 -> 5483aed28


Add publican config for qig


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

Branch: refs/heads/master
Commit: 5483aed28ae887a1d14e35e51375ee7d3a1296d5
Parents: 941c197
Author: Ian Duffy 
Authored: Thu Oct 10 16:04:34 2013 +0100
Committer: Ian Duffy 
Committed: Thu Oct 10 16:04:34 2013 +0100

--
 qig/publican.cfg | 28 
 1 file changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/5483aed2/qig/publican.cfg
--
diff --git a/qig/publican.cfg b/qig/publican.cfg
new file mode 100644
index 000..368ba5d
--- /dev/null
+++ b/qig/publican.cfg
@@ -0,0 +1,28 @@
+# Publican configuration file for CloudStack Complete Documentation Set
+# Contains all technical docs except release notes
+# Config::Simple 4.58
+# Tue May 29 00:57:27 2012
+#
+# 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.
+
+xml_lang: en-US
+type: Book
+docname: qig
+brand: cloudstack
+chunk_first: 1
+chunk_section_depth: 1
+condition: install

git commit: updated refs/heads/master to c4084a7

2013-10-10 Thread alena1108

Updated Branches:
  refs/heads/master 52c2bc0ba -> c4084a7c3


Fixes for resource details code: 1) Fixed the NPE happening when the resource 
detail couldn't be located by the key passed through API 2) Added 
ResourceDetails interface, made all resource details VO objects to implement it.


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

Branch: refs/heads/master
Commit: c4084a7c3497ed959cd37cbd9d36d94df41b4eed
Parents: 52c2bc0
Author: Alena Prokharchyk 
Authored: Thu Oct 10 11:03:15 2013 -0700
Committer: Alena Prokharchyk 
Committed: Thu Oct 10 11:13:47 2013 -0700

--
 .../apache/cloudstack/api/ResourceDetail.java   | 27 
 engine/schema/src/com/cloud/dc/DcDetailVO.java  | 12 +++-
 .../src/com/cloud/storage/VolumeDetailVO.java   | 12 +++-
 engine/schema/src/com/cloud/vm/NicDetailVO.java | 12 +++-
 .../schema/src/com/cloud/vm/UserVmDetailVO.java | 12 +++-
 .../com/cloud/api/query/QueryManagerImpl.java   | 67 ++--
 6 files changed, 83 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/api/src/org/apache/cloudstack/api/ResourceDetail.java
--
diff --git a/api/src/org/apache/cloudstack/api/ResourceDetail.java 
b/api/src/org/apache/cloudstack/api/ResourceDetail.java
new file mode 100644
index 000..0c5dcab
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/ResourceDetail.java
@@ -0,0 +1,27 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api;
+
+public interface ResourceDetail {
+
+public long getResourceDetail();
+
+public String getName();
+
+public String getValue();
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/engine/schema/src/com/cloud/dc/DcDetailVO.java
--
diff --git a/engine/schema/src/com/cloud/dc/DcDetailVO.java 
b/engine/schema/src/com/cloud/dc/DcDetailVO.java
index 15bfacb..158a8ed 100644
--- a/engine/schema/src/com/cloud/dc/DcDetailVO.java
+++ b/engine/schema/src/com/cloud/dc/DcDetailVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.dc;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,9 +23,12 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.api.ResourceDetail;
+
 @Entity
 @Table(name="data_center_details")
-public class DcDetailVO implements InternalIdentity {
+public class DcDetailVO implements InternalIdentity, ResourceDetail {
 @Id
 @GeneratedValue(strategy=GenerationType.IDENTITY)
 @Column(name="id")
@@ -70,4 +71,9 @@ public class DcDetailVO implements InternalIdentity {
 public long getId() {
 return id;
 }
+
+@Override
+public long getResourceDetail() {
+return dcId;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java 
b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
index b0c8c1d..6d2a618 100644
--- a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.storage;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,9 +23,12 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 impo

git commit: updated refs/heads/hyperv to 0d424d1

2013-10-10 Thread rajeshbattala

Updated Branches:
  refs/heads/hyperv c2ddf836b -> 0d424d152


Acquire management/pod ip for control ip when VR deploys in HyperV


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

Branch: refs/heads/hyperv
Commit: 0d424d152e5736bc32b16cc81e7ef31dbbc48657
Parents: c2ddf83
Author: Rajesh Battala 
Authored: Thu Oct 10 23:46:56 2013 +0530
Committer: Rajesh Battala 
Committed: Fri Oct 11 00:02:46 2013 +0530

--
 server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d424d15/server/src/com/cloud/network/guru/ControlNetworkGuru.java
--
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java 
b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 1943e16..a5b7c88 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -133,7 +133,9 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru 
implements NetworkGu
 InsufficientAddressCapacityException {
 assert nic.getTrafficType() == TrafficType.Control;
 
-if (dest.getHost().getHypervisorType() == HypervisorType.VMware && 
isRouterVm(vm)) {
+// we have to get management/private ip for the control nic for 
vmware/hyperv due ssh issues.
+ HypervisorType hType = dest.getHost().getHypervisorType(); 
+if ( ( (hType == HypervisorType.VMware) || (hType == 
HypervisorType.Hyperv) )&& isRouterVm(vm)) {
 if(dest.getDataCenter().getNetworkType() != NetworkType.Basic) {
 super.reserve(nic, config, vm, dest, context);

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

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/master c4084a7c3 -> 1f85124d7


CLOUDSTACK-4348: Fix quick view detail height


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

Branch: refs/heads/master
Commit: 1f85124d701406a26ff5927551e6c5ab558933a9
Parents: c4084a7
Author: Brian Federle 
Authored: Thu Oct 10 11:42:47 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 11:42:59 2013 -0700

--
 ui/css/cloudstack3.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f85124d/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 6510d0e..49e35f3 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1356,7 +1356,7 @@ div.list-view td.state.off span {
 
 .quick-view-tooltip .detail-view .main-groups {
   width: 456px;
-  height: 132px;
+  height: 152px;
   position: absolute;
   top: 55px;
   padding-top: 7px;

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

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/4.2 d5eda578c -> 8bcf83698


CLOUDSTACK-4348: Fix quick view detail height


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

Branch: refs/heads/4.2
Commit: 8bcf83698c1d6f943f30721fcf03a5be743595b6
Parents: d5eda57
Author: Brian Federle 
Authored: Thu Oct 10 11:42:47 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 11:43:31 2013 -0700

--
 ui/css/cloudstack3.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bcf8369/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 394771c..985d974 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1356,7 +1356,7 @@ div.list-view td.state.off span {
 
 .quick-view-tooltip .detail-view .main-groups {
   width: 456px;
-  height: 132px;
+  height: 152px;
   position: absolute;
   top: 55px;
   padding-top: 7px;

git commit: updated refs/heads/4.2 to a414375

2013-10-10 Thread jessicawang

Updated Branches:
  refs/heads/4.2 8bcf83698 -> a41437563


CLOUDSTACK-1888: UI > Domains > allow domain-admin to update resource limits on 
its sub-domains (but disallow on its own domain).


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

Branch: refs/heads/4.2
Commit: a4143756326fc6d57cf97082b199cddcc8eed9d6
Parents: 8bcf836
Author: Jessica Wang 
Authored: Thu Oct 10 12:14:50 2013 -0700
Committer: Jessica Wang 
Committed: Thu Oct 10 12:15:16 2013 -0700

--
 ui/scripts/domains.js | 126 +
 1 file changed, 71 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4143756/ui/scripts/domains.js
--
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 139412d..7306a38 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -99,24 +99,31 @@
 var domainObj;
 
 var data = {
-id: args.context.domains[0].id,
-networkdomain: args.data.networkdomain
+id: args.context.domains[0].id 
   
 };
 
-if (args.data.name != null) {
+if (args.data.name != null) { //args.data.name == 
undefined means name field is not editable (when log in as normal user or 
domain admin)
 $.extend(data, {
 name: args.data.name
 });
 }
-
-$.ajax({
-url: createURL("updateDomain"),
-async: false,
-data: data,
-success: function(json) {
-domainObj = 
json.updatedomainresponse.domain;
-}
-});
+
+if (args.data.networkdomain != null) { 
//args.data.networkdomain == undefined means networkdomain field is not 
editable (when log in as normal user or domain admin)
+$.extend(data, {
+   networkdomain: args.data.networkdomain
+});
+}
+   
+if('name' in data || 'networkdomain' in data)  {   
 
+   $.ajax({
+   url: createURL("updateDomain"),
+   async: false,
+   data: data,
+   success: function(json) {
+   domainObj = 
json.updatedomainresponse.domain;
+   }
+   });
+}
 
 if (args.data.vmLimit != null) {
 $.ajax({
@@ -328,8 +335,8 @@
 fields: [{
 name: {
 label: 'label.name',
-isEditable: function(context) {
-if (context.domains[0].level != 0) //ROOT 
domain (whose level is 0) is not allowed to change domain name
+isEditable: function(args) {
+if (isAdmin() && args.domains[0].level != 
0) //ROOT domain (whose level is 0) is not allowed to change domain name
 return true;
 else
 return false;
@@ -346,96 +353,101 @@
 
 networkdomain: {
 label: 'label.network.domain',
-isEditable: true
+isEditable: function(args) {
+if (isAdmin()) 
+return true;
+else
+return false;
+}
 },
 vmLimit: {
 label: 'label.instance.limits',
-isEditable:

git commit: updated refs/heads/master to 506520a

2013-10-10 Thread jessicawang

Updated Branches:
  refs/heads/master 1f85124d7 -> 506520a9d


CLOUDSTACK-1888: UI > Domains > allow domain-admin to update resource limits on 
its sub-domains (but disallow on its own domain).


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

Branch: refs/heads/master
Commit: 506520a9d6586da7f7dff41c94b4427179a450de
Parents: 1f85124
Author: Jessica Wang 
Authored: Thu Oct 10 12:14:50 2013 -0700
Committer: Jessica Wang 
Committed: Thu Oct 10 12:17:05 2013 -0700

--
 ui/scripts/domains.js | 126 +
 1 file changed, 71 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/506520a9/ui/scripts/domains.js
--
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 139412d..7306a38 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -99,24 +99,31 @@
 var domainObj;
 
 var data = {
-id: args.context.domains[0].id,
-networkdomain: args.data.networkdomain
+id: args.context.domains[0].id 
   
 };
 
-if (args.data.name != null) {
+if (args.data.name != null) { //args.data.name == 
undefined means name field is not editable (when log in as normal user or 
domain admin)
 $.extend(data, {
 name: args.data.name
 });
 }
-
-$.ajax({
-url: createURL("updateDomain"),
-async: false,
-data: data,
-success: function(json) {
-domainObj = 
json.updatedomainresponse.domain;
-}
-});
+
+if (args.data.networkdomain != null) { 
//args.data.networkdomain == undefined means networkdomain field is not 
editable (when log in as normal user or domain admin)
+$.extend(data, {
+   networkdomain: args.data.networkdomain
+});
+}
+   
+if('name' in data || 'networkdomain' in data)  {   
 
+   $.ajax({
+   url: createURL("updateDomain"),
+   async: false,
+   data: data,
+   success: function(json) {
+   domainObj = 
json.updatedomainresponse.domain;
+   }
+   });
+}
 
 if (args.data.vmLimit != null) {
 $.ajax({
@@ -328,8 +335,8 @@
 fields: [{
 name: {
 label: 'label.name',
-isEditable: function(context) {
-if (context.domains[0].level != 0) //ROOT 
domain (whose level is 0) is not allowed to change domain name
+isEditable: function(args) {
+if (isAdmin() && args.domains[0].level != 
0) //ROOT domain (whose level is 0) is not allowed to change domain name
 return true;
 else
 return false;
@@ -346,96 +353,101 @@
 
 networkdomain: {
 label: 'label.network.domain',
-isEditable: true
+isEditable: function(args) {
+if (isAdmin()) 
+return true;
+else
+return false;
+}
 },
 vmLimit: {
 label: 'label.instance.limits',
-isEdit

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

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/4.2 a41437563 -> 7ff6f0b60


CLOUDSTACK-3823: Show ICMP fields for protocolnumber


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

Branch: refs/heads/4.2
Commit: 7ff6f0b6029d5daad2328542a4865407dbd35049
Parents: a414375
Author: Brian Federle 
Authored: Thu Oct 10 12:26:42 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:26:59 2013 -0700

--
 ui/scripts/vpc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ff6f0b6/ui/scripts/vpc.js
--
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 8059d6b..f25e57d 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -137,7 +137,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $portFields.show();
 $protocolFields.show();
 $portFields.show();
@@ -191,7 +191,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $otherFields.hide();
 $protocolFields.show().addClass('required');
 
$inputs.filter('[name=startport],[name=endport]').show().attr('disabled', 
false);

git commit: updated refs/heads/master to 991f933

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/master 506520a9d -> 991f93349


CLOUDSTACK-3823: Show ICMP fields for protocolnumber


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

Branch: refs/heads/master
Commit: 991f933492bde455649a5778aa010fa87770768f
Parents: 506520a
Author: Brian Federle 
Authored: Thu Oct 10 12:26:42 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:27:30 2013 -0700

--
 ui/scripts/vpc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/991f9334/ui/scripts/vpc.js
--
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 8059d6b..f25e57d 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -137,7 +137,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $portFields.show();
 $protocolFields.show();
 $portFields.show();
@@ -191,7 +191,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $otherFields.hide();
 $protocolFields.show().addClass('required');
 
$inputs.filter('[name=startport],[name=endport]').show().attr('disabled', 
false);

git commit: Removing a link, section is not in the Installation guide

2013-10-10 Thread ke4qqq

Updated Branches:
  refs/heads/master 5483aed28 -> 35bf5941a


Removing a link, section is not in the Installation guide


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

Branch: refs/heads/master
Commit: 35bf5941a690eb2faf9a2dc335cb1a7671f08402
Parents: 5483aed
Author: David Nalley 
Authored: Thu Oct 10 15:49:28 2013 -0400
Committer: David Nalley 
Committed: Thu Oct 10 15:49:28 2013 -0400

--
 en-US/system-reserved-ip-addresses.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/35bf5941/en-US/system-reserved-ip-addresses.xml
--
diff --git a/en-US/system-reserved-ip-addresses.xml 
b/en-US/system-reserved-ip-addresses.xml
index c3078a2..e2588ed 100644
--- a/en-US/system-reserved-ip-addresses.xml
+++ b/en-US/system-reserved-ip-addresses.xml
@@ -31,7 +31,7 @@
 Provide private IPs for the system in each pod and provision them in 
&PRODUCT;.
 For KVM and XenServer, the recommended number of private IPs per pod 
is one per host. If you expect a pod to grow, add enough private IPs now to 
accommodate the growth.
 In a zone that uses advanced 
networking:
-For zones with advanced networking, we recommend provisioning enough 
private IPs for your total number of customers, plus enough for the required 
&PRODUCT; System VMs. Typically, about 10 additional IPs are required for the 
System VMs. For more information about System VMs, see  in the Administrator's Guide.
+For zones with advanced networking, we recommend provisioning enough 
private IPs for your total number of customers, plus enough for the required 
&PRODUCT; System VMs. Typically, about 10 additional IPs are required for the 
System VMs. For more information about System VMs, see the section on working 
with SystemVMs in the Administrator's Guide.
 When advanced networking is being used, the number of private IP 
addresses available in each pod varies depending on which hypervisor is running 
on the nodes in that pod. Citrix XenServer and KVM use link-local addresses, 
which in theory provide more than 65,000 private IP addresses within the 
address block. As the pod grows over time, this should be more than enough for 
any reasonable number of hosts as well as IP addresses for guest virtual 
routers. VMWare ESXi, by contrast uses any administrator-specified subnetting 
scheme, and the typical administrator provides only 255 IPs per pod. Since 
these are shared by physical machines, the guest virtual router, and other 
entities, it is possible to run out of private IPs when scaling up a pod whose 
nodes are running ESXi.
 To ensure adequate headroom to scale private IP space in an ESXi pod 
that uses advanced networking, use one or both of the following 
techniques:

git commit: Removing a link, section is not in the Installation guide

2013-10-10 Thread ke4qqq

Updated Branches:
  refs/heads/4.2 941c197b5 -> de730abfd


Removing a link, section is not in the Installation guide


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

Branch: refs/heads/4.2
Commit: de730abfda14f9dc7c415b5b6ad3a20b53bd2fd1
Parents: 941c197
Author: David Nalley 
Authored: Thu Oct 10 15:49:28 2013 -0400
Committer: David Nalley 
Committed: Thu Oct 10 15:50:08 2013 -0400

--
 en-US/system-reserved-ip-addresses.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/de730abf/en-US/system-reserved-ip-addresses.xml
--
diff --git a/en-US/system-reserved-ip-addresses.xml 
b/en-US/system-reserved-ip-addresses.xml
index c3078a2..e2588ed 100644
--- a/en-US/system-reserved-ip-addresses.xml
+++ b/en-US/system-reserved-ip-addresses.xml
@@ -31,7 +31,7 @@
 Provide private IPs for the system in each pod and provision them in 
&PRODUCT;.
 For KVM and XenServer, the recommended number of private IPs per pod 
is one per host. If you expect a pod to grow, add enough private IPs now to 
accommodate the growth.
 In a zone that uses advanced 
networking:
-For zones with advanced networking, we recommend provisioning enough 
private IPs for your total number of customers, plus enough for the required 
&PRODUCT; System VMs. Typically, about 10 additional IPs are required for the 
System VMs. For more information about System VMs, see  in the Administrator's Guide.
+For zones with advanced networking, we recommend provisioning enough 
private IPs for your total number of customers, plus enough for the required 
&PRODUCT; System VMs. Typically, about 10 additional IPs are required for the 
System VMs. For more information about System VMs, see the section on working 
with SystemVMs in the Administrator's Guide.
 When advanced networking is being used, the number of private IP 
addresses available in each pod varies depending on which hypervisor is running 
on the nodes in that pod. Citrix XenServer and KVM use link-local addresses, 
which in theory provide more than 65,000 private IP addresses within the 
address block. As the pod grows over time, this should be more than enough for 
any reasonable number of hosts as well as IP addresses for guest virtual 
routers. VMWare ESXi, by contrast uses any administrator-specified subnetting 
scheme, and the typical administrator provides only 255 IPs per pod. Since 
these are shared by physical machines, the guest virtual router, and other 
entities, it is possible to run out of private IPs when scaling up a pod whose 
nodes are running ESXi.
 To ensure adequate headroom to scale private IP space in an ESXi pod 
that uses advanced networking, use one or both of the following 
techniques:

git commit: updated refs/heads/4.2 to 1ac6ef1

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/4.2 7ff6f0b60 -> 1ac6ef1a7


CLOUDSTACK-4823: Add icon for assignVmToAnotherAccount


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

Branch: refs/heads/4.2
Commit: 1ac6ef1a7023fac9038e6695761da945d41fd04c
Parents: 7ff6f0b
Author: Brian Federle 
Authored: Thu Oct 10 12:55:26 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:58:43 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ac6ef1a/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 985d974..fdab562 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -12269,6 +12269,14 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
   background-position: -230px -677px;
 }
 
+.assignVmToAnotherAccount .icon {
+  background-position: -270px -36px;
+}
+
+.assignVmToAnotherAccount:hover .icon {
+  background-position: -270px -615px;
+}
+
 .label-hovered {
   cursor: pointer;
   color: #FF !important;

git commit: updated refs/heads/master to 746c8c5

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/master 991f93349 -> 746c8c504


CLOUDSTACK-4823: Add icon for assignVmToAnotherAccount


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

Branch: refs/heads/master
Commit: 746c8c50469c125cdf3933ecb9953aace69226e6
Parents: 991f933
Author: Brian Federle 
Authored: Thu Oct 10 12:55:26 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:55:26 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/746c8c50/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 49e35f3..c931fe3 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -12265,6 +12265,14 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
   background-position: -230px -677px;
 }
 
+.assignVmToAnotherAccount .icon {
+  background-position: -270px -36px;
+}
+
+.assignVmToAnotherAccount:hover .icon {
+  background-position: -270px -615px;
+}
+
 .label-hovered {
   cursor: pointer;
   color: #FF !important;

[2/3] git commit: updated refs/heads/ui-restyle to 09e4327

2013-10-10 Thread bfederle

Add styling for toolbar refresh button


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

Branch: refs/heads/ui-restyle
Commit: 9c8e1f720600959ba2880f8e44917720e74f2c4c
Parents: a46ba98
Author: Brian Federle 
Authored: Thu Oct 10 14:10:08 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:10:24 2013 -0700

--
 ui/stylesheets/cloudstack.scss   | 58 +--
 ui/stylesheets/csui/_button.scss | 22 +
 2 files changed, 57 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c8e1f72/ui/stylesheets/cloudstack.scss
--
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 8a606bf..2fad4ad 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -221,6 +221,35 @@ body {
 }
 }
 
+// Panel toolbars
+.toolbar {
+@include csui-toolbar;
+
+.panel-controls {
+display: none;
+}
+
+.button.refresh {
+@include csui-button-refresh;
+
+float: right;
+}
+}
+
+// Action buttons
+.action {
+@include csui-action-button;
+
+.icon {
+background-image: url(../images/sprites.png);
+}
+}
+
+// Wizards
+.multi-wizard {
+@include csui-wizard;
+}
+
 // List view widget
 .list-view {
 @include csui-list;
@@ -289,6 +318,12 @@ body {
 }
 
 .detail-view {
+.toolbar {
+background: none;
+float: right;
+padding: 0;
+}
+
 .ui-tabs-nav {
 @include csui-tabs;
 
@@ -360,26 +395,3 @@ body {
 }
 }
 }
-
-// Panel toolbars
-.toolbar {
-@include csui-toolbar;
-
-.panel-controls {
-display: none;
-}
-}
-
-// Action buttons
-.action {
-@include csui-action-button;
-
-.icon {
-background-image: url(../images/sprites.png);
-}
-}
-
-// Wizards
-.multi-wizard {
-@include csui-wizard;
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c8e1f72/ui/stylesheets/csui/_button.scss
--
diff --git a/ui/stylesheets/csui/_button.scss b/ui/stylesheets/csui/_button.scss
index 48b3982..754ec3a 100644
--- a/ui/stylesheets/csui/_button.scss
+++ b/ui/stylesheets/csui/_button.scss
@@ -34,6 +34,18 @@
 }
 }
 
+@mixin csui-button-simple {
+@include csui-button;
+
+background: none;
+border-color: white;
+
+&:hover {
+box-shadow: none;
+border-color: #ccc;
+}
+}
+
 @mixin csui-button-cta {
 @include csui-button;
 @include linear-gradient(darkgray, lighten(black, 15%));
@@ -44,6 +56,16 @@
 text-shadow: 0px 1px 1px black;
 }
 
+@mixin csui-button-refresh {
+@include csui-button-simple;
+
+&:before {
+@include icon($refresh);
+
+margin-right: 10px;
+}
+}
+
 // Defaults
 .ui-dialog button {
 &:not(.ok) {

[3/3] git commit: updated refs/heads/ui-restyle to 09e4327

2013-10-10 Thread bfederle

Detail view: Move toolbar to top of element for easier styling


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

Branch: refs/heads/ui-restyle
Commit: 09e432765277135766255dbd6e803fb390e75106
Parents: 9c8e1f7
Author: Brian Federle 
Authored: Thu Oct 10 14:10:43 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:10:43 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09e43276/ui/scripts/ui/widgets/detailView.js
--
diff --git a/ui/scripts/ui/widgets/detailView.js 
b/ui/scripts/ui/widgets/detailView.js
index 0e975e4..b7235a4 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1360,7 +1360,7 @@
 
 // Create toolbar
 if (!compact) {
-$toolbar.appendTo($detailView);
+$toolbar.prependTo($detailView);
 }
 }

[1/3] git commit: updated refs/heads/ui-restyle to 09e4327

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/ui-restyle f302c8685 -> 09e432765


Dialog: remove top default close button; add button area margin


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

Branch: refs/heads/ui-restyle
Commit: a46ba98c42e0071e6ee7c349d8ac4f2d65f9eaa8
Parents: f302c86
Author: Brian Federle 
Authored: Thu Oct 10 14:09:51 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:09:51 2013 -0700

--
 ui/stylesheets/csui/_dialog.scss | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a46ba98c/ui/stylesheets/csui/_dialog.scss
--
diff --git a/ui/stylesheets/csui/_dialog.scss b/ui/stylesheets/csui/_dialog.scss
index f3b708f..832fa43 100644
--- a/ui/stylesheets/csui/_dialog.scss
+++ b/ui/stylesheets/csui/_dialog.scss
@@ -67,4 +67,12 @@
 position: absolute;
 top: 0px;
 background: rgba(#000, 0.5);
+}
+
+.ui-icon.ui-icon-closethick {
+display: none;
+}
+
+.ui-dialog-buttonpane {
+margin-top: 20px;
 }
\ No newline at end of file

git commit: updated refs/heads/rbac to 6b8cee5

2013-10-10 Thread mchen

Updated Branches:
  refs/heads/rbac 5c7db71bb -> 6b8cee5fc


Fix build error.

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

Branch: refs/heads/rbac
Commit: 6b8cee5fc976064fc1dad76097e88c9a9ab5ee10
Parents: 5c7db71
Author: Min Chen 
Authored: Thu Oct 10 14:11:08 2013 -0700
Committer: Min Chen 
Committed: Thu Oct 10 14:11:08 2013 -0700

--
 api/src/org/apache/cloudstack/acl/AclRolePermission.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b8cee5f/api/src/org/apache/cloudstack/acl/AclRolePermission.java
--
diff --git a/api/src/org/apache/cloudstack/acl/AclRolePermission.java 
b/api/src/org/apache/cloudstack/acl/AclRolePermission.java
index 0c0c0de..4920dcc 100644
--- a/api/src/org/apache/cloudstack/acl/AclRolePermission.java
+++ b/api/src/org/apache/cloudstack/acl/AclRolePermission.java
@@ -31,5 +31,4 @@ public interface AclRolePermission extends InternalIdentity {
 
 boolean isAllowed();
 
-PermissionScope getScope();
 }

[1/3] git commit: updated refs/heads/ui-restyle to bf12101

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/ui-restyle 09e432765 -> bf121011b


Move detail/list view styling to separate SCSS files


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

Branch: refs/heads/ui-restyle
Commit: c455c027aaca86315264790861de98afc5c6cfa0
Parents: 09e4327
Author: Brian Federle 
Authored: Thu Oct 10 14:15:29 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:15:29 2013 -0700

--
 ui/stylesheets/_detail-view.scss |  94 ++
 ui/stylesheets/_list-view.scss   |  81 +++
 ui/stylesheets/cloudstack.scss   | 144 +-
 3 files changed, 177 insertions(+), 142 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c455c027/ui/stylesheets/_detail-view.scss
--
diff --git a/ui/stylesheets/_detail-view.scss b/ui/stylesheets/_detail-view.scss
new file mode 100644
index 000..d9afa39
--- /dev/null
+++ b/ui/stylesheets/_detail-view.scss
@@ -0,0 +1,94 @@
+// 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.
+.detail-view {
+.toolbar {
+background: none;
+float: right;
+padding: 0;
+}
+
+.ui-tabs-nav {
+@include csui-tabs;
+
+li.ui-state-active {
+@include csui-tab-active;
+}
+}
+
+.detail-group {
+@include csui-details;
+
+.main-groups {
+max-height: 400px;
+overflow: auto;
+}
+}
+
+.ui-tabs-hide {
+display: none;
+}
+
+table {
+width: 100%;
+
+tr {
+&:nth-child(even) {
+background: lighten(#ccc, 12%);
+}
+}
+
+th, td {
+padding: 10px;
+}
+}
+
+.detail-actions {
+background: white;
+border-radius: 6px;
+display: inline-block;
+height: 50px;
+overflow: hidden;
+@include row;
+
+.buttons {
+.action:not(.text) {
+margin: 8px 5px;
+}
+
+.action.text {
+margin-left: 25px;
+margin-top: -4px;
+}
+}
+}
+
+td.view-all {
+display: block;
+float: left;
+padding: 15px 25px 0 0;
+
+a {
+color: #5194C0;
+text-decoration: none;
+
+&:hover {
+text-decoration: underline;
+color: black;
+}
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c455c027/ui/stylesheets/_list-view.scss
--
diff --git a/ui/stylesheets/_list-view.scss b/ui/stylesheets/_list-view.scss
new file mode 100644
index 000..4ddb8c4
--- /dev/null
+++ b/ui/stylesheets/_list-view.scss
@@ -0,0 +1,81 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+.list-view {
+@include csui-list;
+
+// Advanced search field
+#advanced_search {
+float: right;
+.icon {
+@include

[2/3] git commit: updated refs/heads/ui-restyle to bf12101

2013-10-10 Thread bfederle

No overflow on dashboard pie charts


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

Branch: refs/heads/ui-restyle
Commit: 6651a4a30540805b1b847ea345337725682c7bed
Parents: c455c02
Author: Brian Federle 
Authored: Thu Oct 10 14:17:18 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:17:18 2013 -0700

--
 ui/stylesheets/_dashboard.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6651a4a3/ui/stylesheets/_dashboard.scss
--
diff --git a/ui/stylesheets/_dashboard.scss b/ui/stylesheets/_dashboard.scss
index 64c1fd2..12eee82 100644
--- a/ui/stylesheets/_dashboard.scss
+++ b/ui/stylesheets/_dashboard.scss
@@ -108,9 +108,7 @@
 
 ul {
 padding: 0;
-max-height: 230px;
-overflow: auto;
-
+
 li {
 width: 200px;
 height: 200px;

[3/3] git commit: updated refs/heads/ui-restyle to bf12101

2013-10-10 Thread bfederle

Make 'fetch latest' have refresh button icon


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

Branch: refs/heads/ui-restyle
Commit: bf121011bf16639ecc4a017170c586bd74fc80a2
Parents: 6651a4a
Author: Brian Federle 
Authored: Thu Oct 10 14:18:21 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 14:18:21 2013 -0700

--
 ui/stylesheets/_dashboard.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf121011/ui/stylesheets/_dashboard.scss
--
diff --git a/ui/stylesheets/_dashboard.scss b/ui/stylesheets/_dashboard.scss
index 12eee82..a7b8a64 100644
--- a/ui/stylesheets/_dashboard.scss
+++ b/ui/stylesheets/_dashboard.scss
@@ -94,8 +94,9 @@
 }
 
 .fetch-latest {
+@include csui-button-refresh;
 @include csui-button;
-
+
 float: right;
 }
 }

git commit: updated refs/heads/4.2 to 999c1bc

2013-10-10 Thread frankzhang

Updated Branches:
  refs/heads/4.2 1ac6ef1a7 -> 999c1bc1c


Change security_group_agent python side in line with default
security group rules change in 4.2


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

Branch: refs/heads/4.2
Commit: 999c1bc1c029a21110b5bea4638d2d9a99b00f12
Parents: 1ac6ef1
Author: Frank.Zhang 
Authored: Thu Oct 10 14:43:40 2013 -0700
Committer: Frank.Zhang 
Committed: Thu Oct 10 14:44:14 2013 -0700

--
 .../security_group_agent/cs_sg_agent.py | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/999c1bc1/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py
--
diff --git 
a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py
 
b/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py
index f940264..9bd541b 100755
--- 
a/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py
+++ 
b/plugins/hypervisors/baremetal/resources/security_group_agent/security_group_agent/cs_sg_agent.py
@@ -323,6 +323,14 @@ class SGAgent(object):
 
 @staticmethod
 def start():
+
+def create_rule_if_not_exists(rule):
+out = sglib.ShellCmd('iptables-save')()
+if rule in out:
+return
+
+sglib.ShellCmd('iptables %s' % rule)()
+
 def prepare_default_rules():
 sglib.ShellCmd('iptables --policy INPUT DROP')()
 name = 'default-chain'
@@ -330,7 +338,9 @@ class SGAgent(object):
 sglib.ShellCmd('iptables -F %s' % name)()
 except Exception:
 sglib.ShellCmd('iptables -N %s' % name)()
-sglib.ShellCmd('iptables -I INPUT -p tcp --dport 9988 -j ACCEPT')()
+
+create_rule_if_not_exists('-I INPUT -p tcp --dport 9988 -j ACCEPT')
+create_rule_if_not_exists('-I INPUT -m state --state 
RELATED,ESTABLISHED -j ACCEPT')
 
 
 prepare_default_rules()

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

2013-10-10 Thread frankzhang

Updated Branches:
  refs/heads/4.2 999c1bc1c -> 8edaf63c4


CLOUDSTACK-4850
[UCS] using template instead of cloning profile


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

Branch: refs/heads/4.2
Commit: 8edaf63c4e4a054b17a2dfe4233d103fb2ee9e6a
Parents: 999c1bc
Author: Frank.Zhang 
Authored: Thu Oct 10 14:45:03 2013 -0700
Committer: Frank.Zhang 
Committed: Thu Oct 10 14:45:03 2013 -0700

--
 api/src/com/cloud/event/EventTypes.java |   2 +
 .../org/apache/cloudstack/api/ApiConstants.java |   3 +
 client/tomcatconf/commands.properties.in|   3 +
 .../src/com/cloud/ucs/manager/UcsCommands.java  |  85 +
 .../com/cloud/ucs/manager/UcsHttpClient.java|  61 ++-
 .../src/com/cloud/ucs/manager/UcsManager.java   |  19 +-
 .../com/cloud/ucs/manager/UcsManagerImpl.java   | 173 +++
 .../com/cloud/ucs/structure/UcsTemplate.java|  40 +
 .../api/DisassociateUcsProfileCmd.java  |  21 ++-
 ...ntiateUcsTemplateAndAssociateToBladeCmd.java |  99 +++
 .../cloudstack/api/ListUcsTemplatesCmd.java |  55 ++
 .../cloudstack/api/RefreshUcsBladesCmd.java |  71 
 .../api/response/UcsTemplateResponse.java   |  36 
 13 files changed, 588 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edaf63c/api/src/com/cloud/event/EventTypes.java
--
diff --git a/api/src/com/cloud/event/EventTypes.java 
b/api/src/com/cloud/event/EventTypes.java
index dc20400..1f5b5b7 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -443,7 +443,9 @@ public class EventTypes {
 public static final String EVENT_CLEANUP_VM_RESERVATION = 
"VM.RESERVATION.CLEANUP";
 
 public static final String EVENT_UCS_ASSOCIATED_PROFILE = 
"UCS.ASSOCIATEPROFILE";
+public static final String EVENT_UCS_INSTANTIATE_TEMPLATE_AND_ASSOCIATE = 
"UCS.TEMPLATEASSOCIATION";
 public static final String EVENT_UCS_DISASSOCIATED_PROFILE = 
"UCS.DISASSOCIATEPROFILE";
+public static final String EVENT_UCS_REFRESH_BLADES = "UCS.REFRESHBLADES";
 
 static {
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edaf63c/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 14e1c96..d71db40 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -493,8 +493,11 @@ public class ApiConstants {
 public static final String RESERVED_IP_RANGE = "reservediprange";
 public static final String UCS_MANAGER_ID = "ucsmanagerid";
 public static final String UCS_PROFILE_DN = "profiledn";
+public static final String UCS_TEMPLATE_DN = "templatedn";
 public static final String UCS_BLADE_DN = "bladedn";
 public static final String UCS_BLADE_ID = "bladeid";
+public static final String UCS_PROFILE_NAME = "profilename";
+public static final String UCS_DELETE_PROFILE = "deleteprofile";
 public static final String VM_GUEST_IP = "vmguestip";
 public static final String HEALTHCHECK_RESPONSE_TIMEOUT = 
"responsetimeout";
 public static final String HEALTHCHECK_INTERVAL_TIME = "intervaltime";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edaf63c/client/tomcatconf/commands.properties.in
--
diff --git a/client/tomcatconf/commands.properties.in 
b/client/tomcatconf/commands.properties.in
index 492661e..d4aff29 100644
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -616,9 +616,12 @@ addUcsManager=1
 listUcsManagers=1
 listUcsProfiles=1
 listUcsBlades=1
+listUcsTemplates=1
 associateUcsProfileToBlade=1
 deleteUcsManager=1
 disassociateUcsProfileFromBlade=1
+refreshUcsBlades=1
+instantiateUcsTemplateAndAssocaciateToBlade=1
 
  New Load Balancer commands
 createLoadBalancer=15

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edaf63c/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java
--
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java 
b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java
index 52e5edf..8232844 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java
+++ b/plugins/hypervisors/ucs/src/com/c

git commit: updated refs/heads/ui-restyle to 6fff7c7

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/ui-restyle bf121011b -> 6fff7c720


WIP: Style instance wizard, network step


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

Branch: refs/heads/ui-restyle
Commit: 6fff7c7206a16ffbd157eb799f87309082d52a7b
Parents: bf12101
Author: Brian Federle 
Authored: Thu Oct 10 15:43:28 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 15:43:28 2013 -0700

--
 ui/scripts/ui-custom/instanceWizard.js |  1 -
 ui/stylesheets/_instance-wizard.scss   | 85 -
 2 files changed, 84 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fff7c72/ui/scripts/ui-custom/instanceWizard.js
--
diff --git a/ui/scripts/ui-custom/instanceWizard.js 
b/ui/scripts/ui-custom/instanceWizard.js
index a88d4c3..a7d8449 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -1032,7 +1032,6 @@
 return $wizard.dialog({
 title: _l('label.vm.add'),
 width: 800,
-height: 570,
 modal: true,
 closeOnEscape: false,
 zIndex: 5000

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fff7c72/ui/stylesheets/_instance-wizard.scss
--
diff --git a/ui/stylesheets/_instance-wizard.scss 
b/ui/stylesheets/_instance-wizard.scss
index 0797d38..04ffd21 100644
--- a/ui/stylesheets/_instance-wizard.scss
+++ b/ui/stylesheets/_instance-wizard.scss
@@ -59,8 +59,16 @@
 margin: 5px 0;
 }
 
+.secondary-input {
+@include span-columns(3);
+
+input {
+margin-right: 15px;
+}
+}
+
 .select-desc {
-@include span-columns(11);
+@include span-columns(7);
 
 .name {
 font-weight: bold;
@@ -109,4 +117,79 @@
 margin-top: 20px;
 }
 }
+
+.step.network {
+table {
+width: 100%;
+}
+
+.select.my-networks {
+.select-container {
+height: 250px;
+overflow: auto;
+}
+}
+
+.new-network {
+.select-container {
+height: 220px;
+}
+
+&.unselected {
+.select-container {
+height: 100px;
+}
+}
+
+.name {
+@include span-columns(2);
+}
+
+.value {
+@include span-columns(4);
+}
+
+.select {
+@include row;
+
+input[type=checkbox] {
+@include span-columns(1);
+}
+.field.name {
+@include span-columns(10);
+
+.name {
+@include span-columns(3);
+}
+
+.value {
+@include span-columns(9);
+
+input {
+width: 100%;
+
+padding: 5px;
+}
+}
+}
+
+.field.service-offering {
+@include span-columns(12);
+}
+
+.secondary-input {
+@include span-columns(2);
+}
+}
+}
+}
+
+.hide-if-selected { display: none !important; }
+.unselected .hide-if-selected {
+display: block !important;
+}
+
+ .unselected .hide-if-unselected {
+display: none !important;
+}
 }
\ No newline at end of file

git commit: updated refs/heads/master to 6af882c

2013-10-10 Thread bfederle

Updated Branches:
  refs/heads/master 746c8c504 -> 6af882c6b


Icon for 'add guest network' toolbar button


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

Branch: refs/heads/master
Commit: 6af882c6b94126a50f1db3f8da9996cfcffc97f3
Parents: 746c8c5
Author: Brian Federle 
Authored: Thu Oct 10 15:46:31 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 15:46:31 2013 -0700

--
 ui/css/cloudstack3.css | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6af882c6/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index c931fe3..d124d1e 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -11984,13 +11984,15 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
 
 .add .icon,
 .addNew .icon,
-.assignVm .icon {
+.assignVm .icon,
+.rootAdminAddGuestNetwork .icon {
   background-position: -37px -61px;
 }
 
 .add:hover .icon,
 .addNew:hover .icon,
-.assignVm:hover .icon {
+.assignVm:hover .icon,
+.rootAdminAddGuestNetwork:hover .icon {
   background-position: -37px -643px;
 }

git commit: updated refs/heads/master to 90cc0d8

2013-10-10 Thread alena1108

Updated Branches:
  refs/heads/master 6af882c6b -> 90cc0d8f0


VolumeResponse: added storageId to the response (returned to admin only) as 
this parameter is being passed in migrateVolume/updateVolume API requests, so 
have to return it in the response as well


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

Branch: refs/heads/master
Commit: 90cc0d8f0174f0c3c8e74a0b681459bc9286f199
Parents: 6af882c
Author: Alena Prokharchyk 
Authored: Thu Oct 10 16:39:08 2013 -0700
Committer: Alena Prokharchyk 
Committed: Thu Oct 10 16:51:47 2013 -0700

--
 .../org/apache/cloudstack/api/response/VolumeResponse.java   | 8 +++-
 server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java| 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90cc0d8f/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java 
b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
index d2ca37a..56c007f 100644
--- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java
@@ -17,7 +17,6 @@
 package org.apache.cloudstack.api.response;
 
 import java.util.Date;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -189,6 +188,10 @@ public class VolumeResponse extends BaseResponse 
implements ControlledViewEntity
 @SerializedName(ApiConstants.PATH)
 @Param(description="The path of the volume")
 private String path;
+
+@SerializedName(ApiConstants.STORAGE_ID)
+@Param(description = "id of the primary storage hosting the disk volume; 
returned to admin user only", since="4.3")
+private String storagePoolId;
 
 public String getPath() {
 return path;
@@ -402,4 +405,7 @@ public class VolumeResponse extends BaseResponse implements 
ControlledViewEntity
 this.displayVm = displayVm;
 }
 
+public void setStoragePoolId(String storagePoolId) {
+this.storagePoolId = storagePoolId;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90cc0d8f/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java 
b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index b76ff34..edd471b 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -182,6 +182,7 @@ public class VolumeJoinDaoImpl extends 
GenericDaoBase implem
 Long poolId = volume.getPoolId();
 String poolName = (poolId == null) ? "none" : volume.getPoolName();
 volResponse.setStoragePoolName(poolName);
+volResponse.setStoragePoolId(volume.getPoolUuid());
 }
 
 volResponse.setAttached(volume.getAttached());

git commit: updated refs/heads/4.2 to eb8c0a7

2013-10-10 Thread frankzhang

Updated Branches:
  refs/heads/4.2 8edaf63c4 -> eb8c0a7e1


CLOUDSTACK-4850
[UCS] using template instead of cloning profile


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

Branch: refs/heads/4.2
Commit: eb8c0a7e1727b013f4e1972cceda08540497d93c
Parents: 8edaf63
Author: Frank.Zhang 
Authored: Thu Oct 10 17:39:07 2013 -0700
Committer: Frank.Zhang 
Committed: Thu Oct 10 17:39:07 2013 -0700

--
 .../hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb8c0a7e/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
--
diff --git 
a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java 
b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index 68c05f7..5f0d49f 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -370,7 +370,7 @@ public class UcsManagerImpl implements UcsManager {
 throw new CloudRuntimeException(String.format("cannot associated a 
profile to blade[dn:%s]. please check your UCS manasger for detailed error 
information", dn));
 }
 
-return xo.get("outConfig.lsServer.assocState").equals("associated");
+return 
xo.get("outConfig.computeBlade.association").equals("associated");
 //return !xo.get("outConfig.computeBlade.assignedToDn").equals("");
 }
 
@@ -618,6 +618,7 @@ public class UcsManagerImpl implements UcsManager {
}
 
 @Override
+@DB
 public ListResponse refreshBlades(Long mgrId) {
 SyncBladesThread synct = new SyncBladesThread();
 synct.run();

[01/67] [abbrv] [partial] Removing docs from master

2013-10-10 Thread edison

Updated Branches:
  refs/heads/pluggable_vm_snapshot 4c2e40ac3 -> d73f75a2d


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/pot/sysprep-windows-server-2008R2.pot
--
diff --git a/docs/pot/sysprep-windows-server-2008R2.pot 
b/docs/pot/sysprep-windows-server-2008R2.pot
deleted file mode 100644
index 91202d8..000
--- a/docs/pot/sysprep-windows-server-2008R2.pot
+++ /dev/null
@@ -1,147 +0,0 @@
-#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.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2013-02-02T20:11:59\n"
-"PO-Revision-Date: 2013-02-02T20:11:59\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
-"MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Tag: title
-#, no-c-format
-msgid "System Preparation for Windows Server 2008 R2"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "For Windows 2008 R2, you run Windows System Image Manager to create a 
custom sysprep response XML file. Windows System Image Manager is installed as 
part of the Windows Automated Installation Kit (AIK). Windows AIK can be 
downloaded from the Microsoft Download Center at the following location:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "http://www.microsoft.com/en-us/download/details.aspx?id=9085\"; 
/>Microsoft Download Center."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Use the following steps to run sysprep for Windows 2008 R2:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The steps outlined here are derived from the excellent guide by Charity 
Shelbourne, originally published at http://blogs.technet.com/askcore/archive/2008/10/31/automating-the-oobe-process-during-windows-server-2008-sysprep-mini-setup.aspx\";
 />Windows Server 2008 Sysprep Mini-Setup"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Download and install the Windows AIK"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Windows AIK should not be installed on the Windows 2008 R2 VM you just 
created. Windows AIK should not be part of the template you create. It is only 
used to create the sysprep answer file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Copy the install.wim file in the \\sources directory of the Windows 
2008 R2 installation DVD to the hard disk. This is a very large file and may 
take a long time to copy. Windows AIK requires the WIM file to be writable."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Start the Windows System Image Manager, which is part of the Windows 
AIK."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "In the Windows Image pane, right click âSelect a Windows image or 
catalog fileâ to load the install.wim file you just copied."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Select the Windows 2008 R2 Edition"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "You may be prompted with a warning that the catalog file cannot be 
opened. Click Yes to create a new catalog file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "In the Answer File pane, right click to create a new answer file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Generate the answer file from the Windows System Image Manager using 
the following steps:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The first page you need to automate is the Language and Country or 
Region Selection page. To automate this, expand Components in your Windows 
Image pane, right-click and add the Microsoft-Windows-International-Core 
setting to Pass 7 oobeSystem. In your Answer File pane, configure the 
InputLocale, SystemLocale, UILanguage, and UserLocale with the appropriate 
settings for your language and country or region. Should you have a question 
about any of these settings, you can right-click on the specific setting and 
select Help. This will open the appropriate CHM help file with more 
information, including examples on the setting you are attempting to configure."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "You need to automate the Software License Terms Selection page, 
otherwise known as the End-User License Agreement (EULA). To do this, expand 
the Microsoft-Windows-Shell

[53/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

Remove wrong ConfigDepot class from simulatorContext


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 0d7aa931b4892661df733cd1ba20fe139d13e59b
Parents: 7646063
Author: Darren Shepherd 
Authored: Wed Oct 9 10:52:28 2013 -0700
Committer: Darren Shepherd 
Committed: Wed Oct 9 10:52:28 2013 -0700

--
 client/tomcatconf/simulatorComponentContext.xml.in | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d7aa931/client/tomcatconf/simulatorComponentContext.xml.in
--
diff --git a/client/tomcatconf/simulatorComponentContext.xml.in 
b/client/tomcatconf/simulatorComponentContext.xml.in
index 82ff433..bc3599f 100644
--- a/client/tomcatconf/simulatorComponentContext.xml.in
+++ b/client/tomcatconf/simulatorComponentContext.xml.in
@@ -281,5 +281,4 @@
   
 
   
-

[57/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-3105: UI > Instances menu > Instance detailView > View Hosts > fix a 
bug that wrong parameter name is passed to listHosts API.


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: dc8f053d6aa1fb9ae58e8a238fcdaafdbfc8d972
Parents: 0b69e89
Author: Jessica Wang 
Authored: Wed Oct 9 15:05:30 2013 -0700
Committer: Jessica Wang 
Committed: Wed Oct 9 15:07:37 2013 -0700

--
 ui/scripts/system.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc8f053d/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index d197d34..3d25f34 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -11440,8 +11440,8 @@
 array1.push("&podid=" + 
args.context.pods[0].id);
 if ("clusters" in args.context)
 array1.push("&clusterid=" + 
args.context.clusters[0].id);
-} else {
-array1.push("&hostid=" + 
args.context.instances[0].hostid);
+} else { //Instances menu > Instance detailView > View 
Hosts
+array1.push("&id=" + 
args.context.instances[0].hostid);
 }
 
 $.ajax({

[60/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-4707: "sourcetemplateid" field is not getting set for derived 
templates Template created from a volume or snapshot did not have the 
sourcetemplateid field set in vm_template table.


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: bb7493775c202f9a0345482b7a9cb478ed48ba11
Parents: 2799ee3
Author: Harikrishna Patnala 
Authored: Wed Oct 9 16:32:09 2013 +0530
Committer: Kishan Kavala 
Committed: Thu Oct 10 12:20:40 2013 +0530

--
 engine/schema/src/com/cloud/storage/VolumeVO.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb749377/engine/schema/src/com/cloud/storage/VolumeVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VolumeVO.java 
b/engine/schema/src/com/cloud/storage/VolumeVO.java
index 43a8d4c..df7cfd4 100755
--- a/engine/schema/src/com/cloud/storage/VolumeVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeVO.java
@@ -155,7 +155,7 @@ public class VolumeVO implements Volume {
 private Long vmSnapshotChainSize;
 
 @Column(name = "iso_id")
-private long isoId;
+private Long isoId;
 
 @Transient
 // @Column(name="reservation")
@@ -571,7 +571,7 @@ public class VolumeVO implements Volume {
 return this.isoId;
 }
 
-public void setIsoId(long isoId) {
+public void setIsoId(Long isoId) {
 this.isoId =isoId;
 }

[18/67] [abbrv] [partial] Removing docs from master

2013-10-10 Thread edison

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/en-US/zone-add.xml
--
diff --git a/docs/en-US/zone-add.xml b/docs/en-US/zone-add.xml
deleted file mode 100644
index 4137b67..000
--- a/docs/en-US/zone-add.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-
-%BOOK_ENTITIES;
-]>
-
-
-
-
-Adding a Zone
-When you add a new zone, you will be prompted to configure the 
zoneâs physical network and add the first pod, cluster, host, primary 
storage, and secondary storage.
-
-Log in to the &PRODUCT; UI as the root administrator. 
See .
-In the left navigation, choose 
Infrastructure.
-On Zones, click View More.
-Click Add Zone. The zone creation wizard will 
appear.
-Choose one of the following network types:
-
-Basic. For 
AWS-style networking. Provides a single network where each VM instance is 
assigned an IP directly from the network. Guest isolation can be provided 
through layer-3 means such as security groups (IP address source 
filtering).
-Advanced. For 
more sophisticated network topologies. This network model provides the most 
flexibility in defining guest networks and providing custom network offerings 
such as firewall, VPN, or load balancer support.
-
-
-The rest of the steps differ depending on whether you 
chose Basic or Advanced. Continue with the steps that apply to you:
-
-
-
-
-
-
-http://www.w3.org/2001/XInclude"/>
-http://www.w3.org/2001/XInclude"/>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/pot/Admin_Guide.pot
--
diff --git a/docs/pot/Admin_Guide.pot b/docs/pot/Admin_Guide.pot
deleted file mode 100644
index d3acd9b..000
--- a/docs/pot/Admin_Guide.pot
+++ /dev/null
@@ -1,40 +0,0 @@
-#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.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2013-02-02T20:11:55\n"
-"PO-Revision-Date: 2013-02-02T20:11:55\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
-"MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Tag: title
-#, no-c-format
-msgid "&PRODUCT; Administrator's Guide"
-msgstr ""
-
-#. Tag: productname
-#, no-c-format
-msgid "Apache CloudStack"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Administration Guide for &PRODUCT;."
-msgstr ""
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/pot/Author_Group.pot
--
diff --git a/docs/pot/Author_Group.pot b/docs/pot/Author_Group.pot
deleted file mode 100644
index 7e9c48f..000
--- a/docs/pot/Author_Group.pot
+++ /dev/null
@@ -1,35 +0,0 @@
-#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.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2013-02-02T20:11:55\n"
-"PO-Revision-Date: 2013-02-02T20:11:55\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: None\n"
-"MIME-Version: 1.0\n"
-"Content-Type: application/x-publican; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Tag: firstname
-#, no-c-format
-msgid "Apache"
-msgstr ""
-
-#. Tag: surname
-#, no-c-format
-msgid "CloudStack"
-msgstr ""
-

http:/

[61/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

pep8: fix regression from 10938612cc9f518e254f8756581548eeb52913b4

Signed-off-by: Prasanna Santhanam 


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 52c2bc0baf69c31ef54617e391e5badf85db53e9
Parents: bb74937
Author: Prasanna Santhanam 
Authored: Thu Oct 10 17:47:33 2013 +0530
Committer: Prasanna Santhanam 
Committed: Thu Oct 10 17:47:52 2013 +0530

--
 tools/marvin/marvin/cloudstackConnection.py | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52c2bc0b/tools/marvin/marvin/cloudstackConnection.py
--
diff --git a/tools/marvin/marvin/cloudstackConnection.py 
b/tools/marvin/marvin/cloudstackConnection.py
index c5a4c67..686c533 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -32,8 +32,10 @@ from requests import RequestException
 
 
 class cloudConnection(object):
+
 """ Connections to make API calls to the cloudstack management server
 """
+
 def __init__(self, mgtSvr, port=8096, user=None, passwd=None,
  apiKey=None, securityKey=None,
  asyncTimeout=3600, logging=None, scheme='http',
@@ -144,9 +146,11 @@ class cloudConnection(object):
 
 try:
 if method == 'POST':
-response = requests.post(self.baseurl, params=payload, 
verify=False)
+response = requests.post(
+self.baseurl, params=payload, verify=False)
 else:
-response = requests.get(self.baseurl, params=payload, 
verify=False)
+response = requests.get(
+self.baseurl, params=payload, verify=False)
 except ConnectionError, c:
 self.logging.debug("Connection refused. Reason: %s : %s" %
(self.baseurl, c))

[67/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

move a lot of code into vmsnapshot strategy


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: d73f75a2d5e9baf8b83fd2462439578066f3c179
Parents: 746c8c5
Author: Edison Su 
Authored: Thu Oct 10 18:00:21 2013 -0700
Committer: Edison Su 
Committed: Thu Oct 10 18:00:21 2013 -0700

--
 .../api/storage/VMSnapshotStrategy.java |  28 ++
 .../cloud/vm/snapshot/VMSnapshotDetailsVO.java  |  81 
 .../vm/snapshot/dao/VMSnapshotDetailsDao.java   |  28 ++
 .../snapshot/dao/VMSnapshotDetailsDaoImpl.java  |  52 +++
 .../vmsnapshot/DefaultVMSnapshotStrategy.java   | 371 ++
 .../storage/vmsnapshot/VMSnapshotHelper.java|  27 ++
 .../vmsnapshot/VMSnapshotHelperImpl.java|  40 ++
 .../vm/snapshot/VMSnapshotManagerImpl.java  | 374 +++
 8 files changed, 672 insertions(+), 329 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d73f75a2/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java
--
diff --git 
a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java
 
b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java
new file mode 100644
index 000..8dd6eca
--- /dev/null
+++ 
b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.engine.subsystem.api.storage;
+
+import com.cloud.vm.snapshot.VMSnapshot;
+
+public interface VMSnapshotStrategy {
+VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot);
+boolean deleteVMSnapshot(VMSnapshot vmSnapshot);
+boolean revertVMSnapshot(VMSnapshot vmSnapshot);
+boolean canHandle(VMSnapshot vmSnapshot);
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d73f75a2/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java
--
diff --git a/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java 
b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java
new file mode 100644
index 000..7ab7c72
--- /dev/null
+++ b/engine/schema/src/com/cloud/vm/snapshot/VMSnapshotDetailsVO.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.vm.snapshot;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+public class VMSnapshotDetailsVO implements InternalIdentity {
+@Id
+@GeneratedValue(strategy= GenerationType.IDENTITY)
+@Column(name="id")
+private long id;
+
+@Column(name = "vm_snapshot_id")
+Long vmSnapshotId;
+
+@Column(name = "name")
+String name;
+
+@Column(name = "value")
+String value;
+
+public VMSnapshotDetailsVO() {
+
+}
+
+public VMSnapsho

[54/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

ReflectUtil: test for getAllFieldsForClass

- code comment turned to javadoc
- added braces to if and for statements to make it look more like the rest
- tests added

Signed-off-by: Laszlo Hornyak 


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: d1dd85a4c42d1dfc282a0b71407ac668701ccd12
Parents: 66fe3ab
Author: Laszlo Hornyak 
Authored: Tue Oct 8 21:02:58 2013 +0200
Committer: Laszlo Hornyak 
Committed: Wed Oct 9 20:39:41 2013 +0200

--
 utils/src/com/cloud/utils/ReflectUtil.java  | 16 +++--
 utils/test/com/cloud/utils/ReflectUtilTest.java | 63 
 2 files changed, 75 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1dd85a4/utils/src/com/cloud/utils/ReflectUtil.java
--
diff --git a/utils/src/com/cloud/utils/ReflectUtil.java 
b/utils/src/com/cloud/utils/ReflectUtil.java
index 930e0b6..fecd896 100755
--- a/utils/src/com/cloud/utils/ReflectUtil.java
+++ b/utils/src/com/cloud/utils/ReflectUtil.java
@@ -106,7 +106,12 @@ public class ReflectUtil {
 return fields;
 }
 
-// Returns all unique fields except excludeClasses for a cmd class
+/**
+ * Returns all unique fields except excludeClasses for a cmd class
+ * @param cmdClassthe class in which fields should be collected
+ * @param excludeClasses the classes whose fields must be ignored
+ * @return list of fields
+ */
 public static Set getAllFieldsForClass(Class cmdClass,
   Class[] excludeClasses) {
 Set fields = new HashSet();
@@ -116,14 +121,17 @@ public class ReflectUtil {
 while (superClass != null && superClass != Object.class) {
 String superName = superClass.getName();
 boolean isNameEqualToSuperName = false;
-for (Class baseClass: excludeClasses)
-if (superName.equals(baseClass.getName()))
+for (Class baseClass: excludeClasses) {
+if (superName.equals(baseClass.getName())) {
 isNameEqualToSuperName = true;
+}
+}
 
 if (!isNameEqualToSuperName) {
 Field[] superClassFields = superClass.getDeclaredFields();
-if (superClassFields != null)
+if (superClassFields != null) {
 Collections.addAll(fields, superClassFields);
+}
 }
 superClass = superClass.getSuperclass();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1dd85a4/utils/test/com/cloud/utils/ReflectUtilTest.java
--
diff --git a/utils/test/com/cloud/utils/ReflectUtilTest.java 
b/utils/test/com/cloud/utils/ReflectUtilTest.java
index 4c8eb50..fc1cda6 100644
--- a/utils/test/com/cloud/utils/ReflectUtilTest.java
+++ b/utils/test/com/cloud/utils/ReflectUtilTest.java
@@ -16,7 +16,11 @@
 // under the License.package com.cloud.utils;
 package com.cloud.utils;
 
+import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Set;
+
+import org.junit.Assert;
 import org.junit.Test;
 
 import static com.cloud.utils.ReflectUtil.flattenProperties;
@@ -88,4 +92,63 @@ public final class ReflectUtilTest {
 }
 
 }
+
+static class Empty {
+}
+
+static class Foo {
+String fooField;
+int fooIntField;
+}
+
+static class Bar extends Foo {
+String barField;
+int barIntField;
+}
+
+static class Baz extends Foo {
+String bazField;
+int bazIntField;
+}
+
+@Test
+public void getAllFieldsForClassWithFoo() throws NoSuchFieldException, 
SecurityException {
+Set fooFields = ReflectUtil.getAllFieldsForClass(Foo.class, new 
Class [] {});
+Assert.assertNotNull(fooFields);
+Assert.assertEquals(2, fooFields.size());
+
Assert.assertTrue(fooFields.contains(Foo.class.getDeclaredField("fooField")));
+
Assert.assertTrue(fooFields.contains(Foo.class.getDeclaredField("fooIntField")));
+}
+
+@Test
+public void getAllFieldsForClassWithBar() throws NoSuchFieldException, 
SecurityException {
+Set barFields = ReflectUtil.getAllFieldsForClass(Bar.class, new 
Class [] {});
+Assert.assertNotNull(barFields);
+Assert.assertEquals(4, barFields.size());
+
Assert.assertTrue(barFields.contains(Foo.class.getDeclaredField("fooField")));
+
Assert.assertTrue(barFields.contains(Foo.class.

[62/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

Fixes for resource details code: 1) Fixed the NPE happening when the resource 
detail couldn't be located by the key passed through API 2) Added 
ResourceDetails interface, made all resource details VO objects to implement it.


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: c4084a7c3497ed959cd37cbd9d36d94df41b4eed
Parents: 52c2bc0
Author: Alena Prokharchyk 
Authored: Thu Oct 10 11:03:15 2013 -0700
Committer: Alena Prokharchyk 
Committed: Thu Oct 10 11:13:47 2013 -0700

--
 .../apache/cloudstack/api/ResourceDetail.java   | 27 
 engine/schema/src/com/cloud/dc/DcDetailVO.java  | 12 +++-
 .../src/com/cloud/storage/VolumeDetailVO.java   | 12 +++-
 engine/schema/src/com/cloud/vm/NicDetailVO.java | 12 +++-
 .../schema/src/com/cloud/vm/UserVmDetailVO.java | 12 +++-
 .../com/cloud/api/query/QueryManagerImpl.java   | 67 ++--
 6 files changed, 83 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/api/src/org/apache/cloudstack/api/ResourceDetail.java
--
diff --git a/api/src/org/apache/cloudstack/api/ResourceDetail.java 
b/api/src/org/apache/cloudstack/api/ResourceDetail.java
new file mode 100644
index 000..0c5dcab
--- /dev/null
+++ b/api/src/org/apache/cloudstack/api/ResourceDetail.java
@@ -0,0 +1,27 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api;
+
+public interface ResourceDetail {
+
+public long getResourceDetail();
+
+public String getName();
+
+public String getValue();
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/engine/schema/src/com/cloud/dc/DcDetailVO.java
--
diff --git a/engine/schema/src/com/cloud/dc/DcDetailVO.java 
b/engine/schema/src/com/cloud/dc/DcDetailVO.java
index 15bfacb..158a8ed 100644
--- a/engine/schema/src/com/cloud/dc/DcDetailVO.java
+++ b/engine/schema/src/com/cloud/dc/DcDetailVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.dc;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,9 +23,12 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.api.ResourceDetail;
+
 @Entity
 @Table(name="data_center_details")
-public class DcDetailVO implements InternalIdentity {
+public class DcDetailVO implements InternalIdentity, ResourceDetail {
 @Id
 @GeneratedValue(strategy=GenerationType.IDENTITY)
 @Column(name="id")
@@ -70,4 +71,9 @@ public class DcDetailVO implements InternalIdentity {
 public long getId() {
 return id;
 }
+
+@Override
+public long getResourceDetail() {
+return dcId;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4084a7c/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java 
b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
index b0c8c1d..6d2a618 100644
--- a/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
+++ b/engine/schema/src/com/cloud/storage/VolumeDetailVO.java
@@ -16,8 +16,6 @@
 // under the License.
 package com.cloud.storage;
 
-import org.apache.cloudstack.api.InternalIdentity;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,9 +23,12 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache

[55/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

ReflectUtil: findMethod removed

findMethod was not used, it is removed

Signed-off-by: Laszlo Hornyak 


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 66fe3abe3b73766df03771cb68640424ee2099c8
Parents: 0d7aa93
Author: Laszlo Hornyak 
Authored: Tue Oct 8 20:06:44 2013 +0200
Committer: Laszlo Hornyak 
Committed: Wed Oct 9 20:39:41 2013 +0200

--
 utils/src/com/cloud/utils/ReflectUtil.java | 14 --
 1 file changed, 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66fe3abe/utils/src/com/cloud/utils/ReflectUtil.java
--
diff --git a/utils/src/com/cloud/utils/ReflectUtil.java 
b/utils/src/com/cloud/utils/ReflectUtil.java
index 08a780a..930e0b6 100755
--- a/utils/src/com/cloud/utils/ReflectUtil.java
+++ b/utils/src/com/cloud/utils/ReflectUtil.java
@@ -26,7 +26,6 @@ import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -58,19 +57,6 @@ public class ReflectUtil {
 return null;
 }
 }
-
-public static Method findMethod(Class clazz, String methodName) {
-do {
-Method[] methods = clazz.getDeclaredMethods();
-for (Method method : methods) {
-if (methodName.equals(method.getName())) {
-return method;
-}
-}
-clazz = clazz.getSuperclass();
-} while (clazz != null);
-return null;
-}
 
 // Gets all classes with some annotation from a package
 public static Set> getClassesWithAnnotation(Class annotation,

[58/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

Resource details:
1) Fixed the way we build the response for resource details
2) Fixed the response name - should be generic "resourcedetail". The type is 
being carried in resourceType response parameter
3) Throw unsupported excpetion if unsupported resourceType is passed in. 
Before, user vm was returned


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: a5a6f58eb88ba62db7d71d24838247acc9e0592c
Parents: dc8f053
Author: Alena Prokharchyk 
Authored: Wed Oct 9 17:53:29 2013 -0700
Committer: Alena Prokharchyk 
Committed: Wed Oct 9 18:22:49 2013 -0700

--
 .../com/cloud/api/query/QueryManagerImpl.java   | 139 ---
 1 file changed, 60 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5a6f58e/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 9ff37a6..21fa25e 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -27,12 +27,6 @@ import java.util.Set;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import com.cloud.dc.DcDetailVO;
-import com.cloud.dc.dao.DcDetailsDao;
-import com.cloud.vm.UserVmDetailVO;
-import com.cloud.vm.dao.UserVmDetailsDao;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -90,6 +84,8 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.query.QueryService;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import com.cloud.api.query.dao.AccountJoinDao;
 import com.cloud.api.query.dao.AffinityGroupJoinDao;
@@ -132,7 +128,9 @@ import com.cloud.api.query.vo.TemplateJoinVO;
 import com.cloud.api.query.vo.UserAccountJoinVO;
 import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.api.query.vo.VolumeJoinVO;
+import com.cloud.dc.DcDetailVO;
 import com.cloud.dc.DedicatedResourceVO;
+import com.cloud.dc.dao.DcDetailsDao;
 import com.cloud.dc.dao.DedicatedResourceDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.DomainVO;
@@ -141,10 +139,9 @@ import com.cloud.event.dao.EventJoinDao;
 import com.cloud.exception.CloudAuthenticationException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.UnsupportedServiceException;
 import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.network.dao.NetworkDomainVO;
-import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.security.SecurityGroupVMMapVO;
 import com.cloud.network.security.dao.SecurityGroupVMMapDao;
 import com.cloud.org.Grouping;
@@ -189,11 +186,13 @@ import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.NicDetailVO;
+import com.cloud.vm.UserVmDetailVO;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDetailDao;
 import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.UserVmDetailsDao;
 
 @Component
 @Local(value = { QueryService.class })
@@ -3222,108 +3221,90 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 
 @Override
 public List listResource(ListResourceDetailsCmd 
cmd) {
-
 String key = cmd.getKey();
 ResourceTag.TaggedResourceType resourceType = cmd.getResourceType();
 String resourceId = cmd.getResourceId();
 Long id = _taggedResourceMgr.getResourceId(resourceId, resourceType);
-
+List responseList = new 
ArrayList();
+
 if (resourceType == ResourceTag.TaggedResourceType.Volume) {
-
-List volumeDetailList;
+List detailList;
 if (key == null) {
-volumeDetailList = _volumeDetailDao.findDetails(id);
+detailList = _volumeDetailDao.findDetails(id);
 } else {
 VolumeDetailVO volumeDetail = _volumeDetailDao.findDetail(id, 
key);

[66/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-4823: Add icon for assignVmToAnotherAccount


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 746c8c50469c125cdf3933ecb9953aace69226e6
Parents: 991f933
Author: Brian Federle 
Authored: Thu Oct 10 12:55:26 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:55:26 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/746c8c50/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 49e35f3..c931fe3 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -12265,6 +12265,14 @@ div.ui-dialog div.autoscaler div.field-group 
div.form-container form div.form-it
   background-position: -230px -677px;
 }
 
+.assignVmToAnotherAccount .icon {
+  background-position: -270px -36px;
+}
+
+.assignVmToAnotherAccount:hover .icon {
+  background-position: -270px -615px;
+}
+
 .label-hovered {
   cursor: pointer;
   color: #FF !important;

[64/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-1888: UI > Domains > allow domain-admin to update resource limits on 
its sub-domains (but disallow on its own domain).


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 506520a9d6586da7f7dff41c94b4427179a450de
Parents: 1f85124
Author: Jessica Wang 
Authored: Thu Oct 10 12:14:50 2013 -0700
Committer: Jessica Wang 
Committed: Thu Oct 10 12:17:05 2013 -0700

--
 ui/scripts/domains.js | 126 +
 1 file changed, 71 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/506520a9/ui/scripts/domains.js
--
diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 139412d..7306a38 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -99,24 +99,31 @@
 var domainObj;
 
 var data = {
-id: args.context.domains[0].id,
-networkdomain: args.data.networkdomain
+id: args.context.domains[0].id 
   
 };
 
-if (args.data.name != null) {
+if (args.data.name != null) { //args.data.name == 
undefined means name field is not editable (when log in as normal user or 
domain admin)
 $.extend(data, {
 name: args.data.name
 });
 }
-
-$.ajax({
-url: createURL("updateDomain"),
-async: false,
-data: data,
-success: function(json) {
-domainObj = 
json.updatedomainresponse.domain;
-}
-});
+
+if (args.data.networkdomain != null) { 
//args.data.networkdomain == undefined means networkdomain field is not 
editable (when log in as normal user or domain admin)
+$.extend(data, {
+   networkdomain: args.data.networkdomain
+});
+}
+   
+if('name' in data || 'networkdomain' in data)  {   
 
+   $.ajax({
+   url: createURL("updateDomain"),
+   async: false,
+   data: data,
+   success: function(json) {
+   domainObj = 
json.updatedomainresponse.domain;
+   }
+   });
+}
 
 if (args.data.vmLimit != null) {
 $.ajax({
@@ -328,8 +335,8 @@
 fields: [{
 name: {
 label: 'label.name',
-isEditable: function(context) {
-if (context.domains[0].level != 0) //ROOT 
domain (whose level is 0) is not allowed to change domain name
+isEditable: function(args) {
+if (isAdmin() && args.domains[0].level != 
0) //ROOT domain (whose level is 0) is not allowed to change domain name
 return true;
 else
 return false;
@@ -346,96 +353,101 @@
 
 networkdomain: {
 label: 'label.network.domain',
-isEditable: true
+isEditable: function(args) {
+if (isAdmin()) 
+return true;
+else
+return false;
+}
 },
 vmLimit: {
 label: 'label.instance.limits',
-isEditable: function(context) {
-

[52/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-3803: Fix duplicate label causing validation error


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 76460637353c3ae040c1871a9db5adfdab9f7b76
Parents: 5586a22
Author: Brian Federle 
Authored: Tue Oct 8 15:47:48 2013 -0700
Committer: Brian Federle 
Committed: Tue Oct 8 15:48:19 2013 -0700

--
 client/WEB-INF/classes/resources/messages.properties | 2 ++
 ui/dictionary.jsp| 2 ++
 ui/scripts/zoneWizard.js | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76460637/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 f92b85a..7970369 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.s3.nfs.server=S3 NFS Server
+label.s3.nfs.path=S3 NFS Path
 label.delete.events=Delete events
 label.delete.alerts=Delete alerts
 label.archive.alerts=Archive alerts

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76460637/ui/dictionary.jsp
--
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index f93f9dc..3563376 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,8 @@ under the License.
 <% long now = System.currentTimeMillis(); %>

[63/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-4348: Fix quick view detail height


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 1f85124d701406a26ff5927551e6c5ab558933a9
Parents: c4084a7
Author: Brian Federle 
Authored: Thu Oct 10 11:42:47 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 11:42:59 2013 -0700

--
 ui/css/cloudstack3.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f85124d/ui/css/cloudstack3.css
--
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 6510d0e..49e35f3 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1356,7 +1356,7 @@ div.list-view td.state.off span {
 
 .quick-view-tooltip .detail-view .main-groups {
   width: 456px;
-  height: 132px;
+  height: 152px;
   position: absolute;
   top: 55px;
   padding-top: 7px;

[59/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

Revert change to ManagedContextTimerTask to unblock DB upgrade


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 2799ee3d4fb86f6db856985879a41e5dfc63ccc6
Parents: a5a6f58
Author: Darren Shepherd 
Authored: Wed Oct 9 20:51:05 2013 -0700
Committer: Darren Shepherd 
Committed: Wed Oct 9 20:51:05 2013 -0700

--
 .../src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2799ee3d/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
--
diff --git 
a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
index c36b3a8..69bde19 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
@@ -119,9 +119,9 @@ public class VmwareContextPool {
}

private TimerTask getTimerTask() {
-   return new ManagedContextTimerTask() {
+   return new TimerTask() {
 @Override
-protected void runInContext() {
+public void run() {
try {
// doIdleCheck();

[50/67] [abbrv] [partial] Removing docs from master

2013-10-10 Thread edison

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5586a221/docs/README.txt
--
diff --git a/docs/README.txt b/docs/README.txt
deleted file mode 100644
index e327fb9..000
--- a/docs/README.txt
+++ /dev/null
@@ -1,325 +0,0 @@
-Author: Jessica Tomechak
-
-Updated: August 8, 2012
-
-

-
-WHAT'S IN THIS REPOSITORY: WORK IN PROGRESS
-

-
-This repository contains the source files for CloudStack documentation. The 
files are currently incomplete as we are in the process of converting 
documentation from an outdated file format into XML files for this repo.
-The complete documentation can be seen at docs.cloudstack.org.
-
-
-
---
-
-DOCUMENTATION SUBDIRECTORIES
-
---
-
-United States English language source files are in the en-US subdirectory.
-Additional language subdirectories can be added.
-
-
-Each file in a language subdirectory contains one chunk of information that 
may be termed a section, module, or topic. The files are written in Docbook 
XML, using the Docbook version and tag supported by the Publican open-source 
documentation tool.
-
-
-
---
-
-VALID XML TAGS
-
---
-
-Certain tags are disallowed by Publican. Please consult their documentation 
for more details.
-http://jfearn.fedorapeople.org/en-US/Publican/2.7/html/Users_Guide/
-
-Your best bet is to copy an existing XML file and fill in your own content 
between the tags.
-
-At the bottom of this README, there is a fill-in-the-blanks XML template that 
you can go from. It shows the commonly used tags and explains a bit about how 
to use them.
-
-
---
-
-SECTIONS, CHAPTERS, AND BOOK FILES
-
---
-
-The files for every topic and audience are in a single directory. The content 
is not divided into separate subdirectories for each book, or separate 
repositories for each book. Therefore, the content can be flexibly and easily 
re-used. In most cases, a file contains a single section that can be assembled 
with other sections to build any desired set of information. These files 
contain  ...  tags.
-
-
-Some of the XML files contain only a series of include tags to pull in content 
from other files. Such an "include file" is either a major section, a chapter 
in a book, or the master book file. A chapter contains  ...  
tags.
-
-
-The master book file contains  ...  tags. This file is referred 
to in the Publican configuration file, and is used as the controlling file when 
building the book.
-
-
-Document names are derived from the docname setting in the appropriate .cfg 
file. 
-This should not have CloudStack in the name (which is redundant because of 
-the CloudStack brand that the documentation is built with. The docname variable
-sets the name in the doc site table of contents. This name also needs to exist
-as .xml and .ent in the en-US directory. Examples of appropriate docnames: 
-Admin_Guide
-API_Developers_Guide
-Installation_Guide
-
-
-
-
-A Publican book file must also have certain other tags that are expected by
-Publican when it builds the project. Copy an existing master book file to
-get these tags.
-
-
---
-
-CONFIG FILES
-
---
-
-For each book file, there must be a corresponding publican.cfg (or
-.cfg) file in order to build the book with Publican. The
-docname: attribute in the config file matches the name of the master book file;
-for example, docname: cloudstack corresponds to the master book file 
-cloudstack.xml.
-
-
-The .cfg files reside in the main directory, docs. To build a different book,
-just use the Publican command line flag --config=.cfg. (We also
-need per-book entities, Book_Info, Author_Info, and other Publican files.
-The technique for pulling these in is TBD.)
-
-
---
-
-TO BUILD A BOOK
-
---
-
-We will set up an automatic Publican job that generates new output whenever we
-check in changes to this repository. You can also build a book locally as 
-follows.
-
-
-First, install Publican, and get a local copy of the book source files.
-
-
-Put the desired publican.cfg in the docs directory. Go to the command line, cd
-to that directory, and run the publican build command. Specify what output 
-format(s) and what language(s) you want to build. Always start with a test 
-run. For example:
-
-
-publican build --formats test --langs en-US
-
-
-...followed by this command if the test is successful:
-
-
-publican build --formats html,pdf --langs en-US
-
-
-Output will be found in the tmp subdirectory of the docs directory.
-
-
-
---
-
-LOCALIZATION
-
---
-
-Localized versions of the doc

[65/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-3823: Show ICMP fields for protocolnumber


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 991f933492bde455649a5778aa010fa87770768f
Parents: 506520a
Author: Brian Federle 
Authored: Thu Oct 10 12:26:42 2013 -0700
Committer: Brian Federle 
Committed: Thu Oct 10 12:27:30 2013 -0700

--
 ui/scripts/vpc.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/991f9334/ui/scripts/vpc.js
--
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 8059d6b..f25e57d 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -137,7 +137,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $portFields.show();
 $protocolFields.show();
 $portFields.show();
@@ -191,7 +191,7 @@
 });
 
 if ($(this).val() == 'protocolnumber') {
-$icmpFields.hide();
+$icmpFields.show();
 $otherFields.hide();
 $protocolFields.show().addClass('required');
 
$inputs.filter('[name=startport],[name=endport]').show().attr('disabled', 
false);

[56/67] [abbrv] git commit: updated refs/heads/pluggable_vm_snapshot to d73f75a

2013-10-10 Thread edison

CLOUDSTACK-3154: UI > Infrastructure > zone detail > remove VMware datacenter 
action > fix a bug that incorrect property name was used to retrieve embedded 
object in API response.


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

Branch: refs/heads/pluggable_vm_snapshot
Commit: 0b69e890e07cb788e8475cdbcf3bb50e54e6e869
Parents: d1dd85a
Author: Jessica Wang 
Authored: Wed Oct 9 14:12:06 2013 -0700
Committer: Jessica Wang 
Committed: Wed Oct 9 14:16:17 2013 -0700

--
 ui/scripts/system.js | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b69e890/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f5ed9a2..d197d34 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5709,10 +5709,14 @@
 url: 
createURL('removeVmwareDc'),
 data: data,
 success: function(json) {
-var item = 
json.updatezoneresponse.zone;
-args.response.success({
-actionFilter: 
zoneActionfilter,
-data: item
+   delete 
args.context.physicalResources[0].vmwaredcName;
+   delete 
args.context.physicalResources[0].vmwaredcVcenter;
+   delete 
args.context.physicalResources[0].vmwaredcId;
+   
+   selectedZoneObj = 
args.context.physicalResources[0];
+   
+args.response.success({

+data: 
args.context.physicalResources[0]
 });
 }
 });

git commit: updated refs/heads/master to fa0c685

2013-10-10 Thread nitin

Updated Branches:
  refs/heads/master 90cc0d8f0 -> fa0c685bc


CLOUDSTACK-4854:
Add support for adding network details
Signed off by : nitin mehta


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

Branch: refs/heads/master
Commit: fa0c685bcb89c8d7a7cf8939f5237887a7c9f4ff
Parents: 90cc0d8
Author: Nitin Mehta 
Authored: Thu Oct 10 19:18:39 2013 -0700
Committer: Nitin Mehta 
Committed: Thu Oct 10 19:18:39 2013 -0700

--
 client/tomcatconf/applicationContext.xml.in |  1 +
 .../com/cloud/network/dao/NetworkDetailVO.java  | 90 +++
 .../cloud/network/dao/NetworkDetailsDao.java| 35 
 .../network/dao/NetworkDetailsDaoImpl.java  | 93 
 .../com/cloud/api/query/QueryManagerImpl.java   | 12 ++-
 .../metadata/ResourceMetaDataManagerImpl.java   | 12 ++-
 6 files changed, 240 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa0c685b/client/tomcatconf/applicationContext.xml.in
--
diff --git a/client/tomcatconf/applicationContext.xml.in 
b/client/tomcatconf/applicationContext.xml.in
index 6dda5c7..2a3520b 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -268,6 +268,7 @@
   
   
   
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa0c685b/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java
--
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java 
b/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java
new file mode 100644
index 000..6292397
--- /dev/null
+++ b/engine/schema/src/com/cloud/network/dao/NetworkDetailVO.java
@@ -0,0 +1,90 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.network.dao;
+
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.api.ResourceDetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="network_details")
+public class NetworkDetailVO implements InternalIdentity, ResourceDetail {
+@Id
+@GeneratedValue(strategy= GenerationType.IDENTITY)
+@Column(name="id")
+private long id;
+
+@Column(name="network_id")
+private long networkId;
+
+@Column(name="name")
+private String name;
+
+@Column(name="value", length=1024)
+private String value;
+
+public NetworkDetailVO() {}
+
+public NetworkDetailVO(long networkId, String name, String value) {
+this.networkId = networkId;
+this.name = name;
+this.value = value;
+}
+
+public long getId() {
+return id;
+}
+
+public long getNetworkId() {
+return networkId;
+}
+
+public String getName() {
+return name;
+}
+
+public String getValue() {
+return value;
+}
+
+public void setId(long id) {
+this.id = id;
+}
+
+public void setNetworkId(long networkId) {
+this.networkId = networkId;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+public void setValue(String value) {
+this.value = value;
+}
+
+@Override
+public long getResourceDetail() {
+return networkId;
+}
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa0c685b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java
--
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java 
b/engine/schema/src/com/cloud/network/dao/NetworkDetailsDao.java
new file mode 100644
index 000

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

2013-10-10 Thread Apache Jenkins Server

See 

Changes:

[nitin.mehta] CLOUDSTACK-4854:

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

Checkout:cloudstack-rat-master / 
 - 
hudson.remoting.Channel@4ad234f4:ubuntu2
Using strategy: Default
Last Built Revision: Revision 90cc0d8f0174f0c3c8e74a0b681459bc9286f199 
(origin/master)
Fetching changes from 1 remote Git repository
Fetching upstream changes from origin
Commencing build of Revision fa0c685bcb89c8d7a7cf8939f5237887a7c9f4ff 
(origin/master)
Checking out Revision fa0c685bcb89c8d7a7cf8939f5237887a7c9f4ff (origin/master)
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson4268984548770752152.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: *.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: deps/XenServerJava/src/com/xensource/xenapi/*.java
[INFO] Exclude: deps/XenServerJava/BSD
[INFO] Exclude: deps/XenServerJava/Makefile
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate64/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: waf
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/conf/environment.properties
[INFO] Exclude: systemvm/js/jquery.js
[INFO] Exclude: systemvm/patches/debian/systemvm.vmx
[INFO] Exclude: systemvm/patches/debian/config/root/.ssh/authorized_keys
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/httpd.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/ports.conf
[INFO] Exclude: 
systemvm/patches/debian/config/etc/apache2/sites-available/default
[INFO] Exclu

git commit: updated refs/heads/rbac to 00ad196

2013-10-10 Thread mchen

Updated Branches:
  refs/heads/rbac 6b8cee5fc -> 00ad19601


Fix a bug in building acl condition, now we get previous default list
behavior for admin,domain admin and user.

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

Branch: refs/heads/rbac
Commit: 00ad19601b8bfb78241195e6c30fbc9036749601
Parents: 6b8cee5
Author: Min Chen 
Authored: Thu Oct 10 23:02:49 2013 -0700
Committer: Min Chen 
Committed: Thu Oct 10 23:02:49 2013 -0700

--
 .../com/cloud/api/query/QueryManagerImpl.java   |  6 ++-
 .../src/com/cloud/user/AccountManagerImpl.java  | 51 ++--
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00ad1960/server/src/com/cloud/api/query/QueryManagerImpl.java
--
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 04d5964..80a2227 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -757,6 +757,8 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 // first search distinct vm id by using query criteria and pagination
 SearchBuilder sb = _userVmJoinDao.createSearchBuilder();
 sb.select(null, Func.DISTINCT, sb.entity().getId()); // select 
distinct ids
+
+// build acl search builder condition
 _accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, 
permittedAccounts,
 listProjectResourcesCriteria, grantedIds, revokedIds);
 
@@ -824,10 +826,12 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 sb.and("affinityGroupId", sb.entity().getAffinityGroupId(), 
SearchCriteria.Op.EQ);
 }
 
+
+
 // populate the search criteria with the values passed in
 SearchCriteria sc = sb.create();
 
-// building ACL condition
+// building ACL search criteria
 _accountMgr.buildACLViewSearchCriteria(sc, domainId, isRecursive, 
permittedAccounts,
 listProjectResourcesCriteria);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00ad1960/server/src/com/cloud/user/AccountManagerImpl.java
--
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java 
b/server/src/com/cloud/user/AccountManagerImpl.java
index db21b3d..03b51f4 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -2368,7 +2368,7 @@ public class AccountManagerImpl extends ManagerBase 
implements AccountManager, M
 if (rolePerm.getScope() == PermissionScope.ACCOUNT || 
!listAll) {
 // only resource owner can see it, only match account
 permittedAccounts.add(caller.getId());
-} else {
+} else if (rolePerm.getScope() == PermissionScope.DOMAIN) {
 // match domain tree based on cmd.isRecursive flag or not
 domainIdRecursiveListProject.first(caller.getDomainId());
 }
@@ -2403,29 +2403,52 @@ public class AccountManagerImpl extends ManagerBase 
implements AccountManager, M
 @Override
 public void buildACLViewSearchBuilder(SearchBuilder sb, Long domainId, boolean isRecursive, List 
permittedAccounts,
 ListProjectResourcesCriteria listProjectResourcesCriteria, 
List grantedIds, List revokedIds) {
-sb.and().op("accountIdIN", sb.entity().getAccountId(), 
SearchCriteria.Op.IN);
-sb.and("domainId", sb.entity().getDomainId(), SearchCriteria.Op.EQ);
 
-if (((permittedAccounts.isEmpty()) && (domainId != null) && 
isRecursive)) {
-// if accountId isn't specified, we can do a domain match for the
-// admin case if isRecursive is true
-sb.and("domainPath", sb.entity().getDomainPath(), 
SearchCriteria.Op.LIKE);
+if (!revokedIds.isEmpty()) {
+sb.and("idNIN", sb.entity().getId(), SearchCriteria.Op.NIN);
 }
+if (permittedAccounts.isEmpty() && domainId == null && 
listProjectResourcesCriteria == null) {
+// caller role authorize him to access everything matching query 
criteria
+return;
+
+}
+boolean hasOp = true;
+if (!permittedAccounts.isEmpty()) {
+sb.and().op("accountIdIN", sb.entity().getAccountId(), 
SearchCriteria.Op.IN);
+} else if (domainId != null) {
+if (isRecursiv

git commit: CLOUDSTACK-4845: GSLB: Add NetScaler SDX not an SRX

2013-10-10 Thread tsp

Updated Branches:
  refs/heads/master 35bf5941a -> ee513d261


CLOUDSTACK-4845: GSLB: Add NetScaler SDX not an SRX

Signed-off-by: Prasanna Santhanam 


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

Branch: refs/heads/master
Commit: ee513d2619520828fff8f6b1381b6e6b36614d22
Parents: 35bf594
Author: Prasanna Santhanam 
Authored: Fri Oct 11 11:38:30 2013 +0530
Committer: Prasanna Santhanam 
Committed: Fri Oct 11 11:39:19 2013 +0530

--
 en-US/gslb.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/ee513d26/en-US/gslb.xml
--
diff --git a/en-US/gslb.xml b/en-US/gslb.xml
index 968e8e2..3f832af 100644
--- a/en-US/gslb.xml
+++ b/en-US/gslb.xml
@@ -329,7 +329,7 @@
   For NetScaler:
   
 
-  IP Address: The IP 
address of the SRX.
+  IP Address: The IP 
address of the SDX.
 
 
   Username/Password: The 
authentication

git commit: updated refs/heads/hyperv to 3a5c7f1

2013-10-10 Thread rajeshbattala

Updated Branches:
  refs/heads/hyperv 0d424d152 -> 3a5c7f1e4


Fixed deletion on VM's on hyperv host when mgmt server gets restarted due to HA

Conflicts:

server/src/com/cloud/ha/HighAvailabilityManagerImpl.java


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

Branch: refs/heads/hyperv
Commit: 3a5c7f1e4a995a083790eb2e16c3a3d1cdcb2a8f
Parents: 0d424d1
Author: Rajesh Battala 
Authored: Fri Oct 11 11:54:53 2013 +0530
Committer: Rajesh Battala 
Committed: Fri Oct 11 11:58:20 2013 +0530

--
 server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a5c7f1e/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
--
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java 
b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index 464b952..d853b47 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -203,8 +203,8 @@ public class HighAvailabilityManagerImpl extends 
ManagerBase implements HighAvai
 return;
 }
 
-if(host.getHypervisorType() == HypervisorType.VMware) {
-s_logger.info("Don't restart for VMs on host " + host.getId() + " 
as the host is VMware host");
+if(host.getHypervisorType() == HypervisorType.VMware || 
host.getHypervisorType() == HypervisorType.Hyperv) {
+s_logger.info("Don't restart for VMs on host " + host.getId() + " 
as the host is VMware host or on Hyperv Host");
 return;
 }
 
@@ -299,6 +299,11 @@ public class HighAvailabilityManagerImpl extends 
ManagerBase implements HighAvai
 return;
 }
 
+if(vm.getHypervisorType() == HypervisorType.VMware || 
vm.getHypervisorType() == HypervisorType.Hyperv) {
+s_logger.info("Skip HA for VMware VM or Hyperv VM" + 
vm.getInstanceName());
+return;
+}
+
 if (!investigate) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("VM does not require investigation so I'm 
marking it as Stopped: " + vm.toString());

git commit: CLOUDSTACK-4839: wrong list of packages in debs

2013-10-10 Thread tsp

Updated Branches:
  refs/heads/master ee513d261 -> 4642759a1


CLOUDSTACK-4839: wrong list of packages in debs

Also removed the number 7 in the sentence preceding the packages. That
puts a dependency on the author correcting the package listing to count
the packages and correct this number. Just say, following packages.

Signed-off-by: Prasanna Santhanam 


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

Branch: refs/heads/master
Commit: 4642759a19b9a0727a62ca4531b5d7a0dc791b3d
Parents: ee513d2
Author: Prasanna Santhanam 
Authored: Fri Oct 11 12:12:04 2013 +0530
Committer: Prasanna Santhanam 
Committed: Fri Oct 11 12:12:04 2013 +0530

--
 en-US/build-deb.xml | 25 -
 en-US/build-rpm.xml | 13 +++--
 2 files changed, 19 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/4642759a/en-US/build-deb.xml
--
diff --git a/en-US/build-deb.xml b/en-US/build-deb.xml
index dca31d2..842554c 100644
--- a/en-US/build-deb.xml
+++ b/en-US/build-deb.xml
@@ -55,25 +55,16 @@
 
 
 
-This command will build 16 Debian packages. You should have all of the 
following:
+This command will build the following debian packages. You should have all 
of the following:
 
 
-cloud-agent_4.0.0-incubating_amd64.deb
-cloud-agent-deps_4.0.0-incubating_amd64.deb
-cloud-agent-libs_4.0.0-incubating_amd64.deb
-cloud-awsapi_4.0.0-incubating_amd64.deb
-cloud-cli_4.0.0-incubating_amd64.deb
-cloud-client_4.0.0-incubating_amd64.deb
-cloud-client-ui_4.0.0-incubating_amd64.deb
-cloud-core_4.0.0-incubating_amd64.deb
-cloud-deps_4.0.0-incubating_amd64.deb
-cloud-python_4.0.0-incubating_amd64.deb
-cloud-scripts_4.0.0-incubating_amd64.deb
-cloud-server_4.0.0-incubating_amd64.deb
-cloud-setup_4.0.0-incubating_amd64.deb
-cloud-system-iso_4.0.0-incubating_amd64.deb
-cloud-usage_4.0.0-incubating_amd64.deb
-cloud-utils_4.0.0-incubating_amd64.deb
+cloudstack-common-4.2.0.amd64.deb
+cloudstack-management-4.2.0.amd64.deb
+cloudstack-agent-4.2.0.amd64.deb
+cloudstack-usage-4.2.0.amd64.deb
+cloudstack-awsapi-4.2.0.amd64.deb
+cloudstack-cli-4.2.0.amd64.deb
+cloudstack-docs-4.2.0.amd64.deb
 
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/4642759a/en-US/build-rpm.xml
--
diff --git a/en-US/build-rpm.xml b/en-US/build-rpm.xml
index 100a06f..86cff1b 100644
--- a/en-US/build-rpm.xml
+++ b/en-US/build-rpm.xml
@@ -53,8 +53,17 @@ under the License.
 $./package.sh
 
 That will run for a bit and then place the finished packages in 
dist/rpmbuild/RPMS/x86_64/.
-You should see seven RPMs in that directory: 
cloudstack-agent-4.1.0-SNAPSHOT.el6.x86_64.rpm, 
cloudstack-awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm, 
cloudstack-cli-4.1.0-SNAPSHOT.el6.x86_64.rpm, 
cloudstack-common-4.1.0-SNAPSHOT.el6.x86_64.rpm, 
cloudstack-docs-4.1.0-SNAPSHOT.el6.x86_64.rpm, 
cloudstack-management-4.1.0-SNAPSHOT.el6.x86_64.rpm, and 
cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm.
-
+You should see the following RPMs in that directory: 
+
+cloudstack-agent-4.2.0.el6.x86_64.rpm
+cloudstack-awsapi-4.2.0.el6.x86_64.rpm
+cloudstack-cli-4.2.0.el6.x86_64.rpm
+cloudstack-common-4.2.0.el6.x86_64.rpm
+cloudstack-docs-4.2.0.el6.x86_64.rpm
+cloudstack-management-4.2.0.el6.x86_64.rpm
+cloudstack-usage-4.2.0.el6.x86_64.rpm
+
+
 Creating a yum repo
 
 While RPMs is a useful packaging format - it's most easily 
consumed from Yum repositories over a network. The next step is to create a Yum 
Repo with the finished packages:

git commit: CLOUDSTACK-4815: adding correct systemvm download links

2013-10-10 Thread tsp

Updated Branches:
  refs/heads/master 4642759a1 -> 6321f2b5f


CLOUDSTACK-4815: adding correct systemvm download links

Also adding no_subtree_check to get rid of warning during mount

Signed-off-by: Prasanna Santhanam 


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

Branch: refs/heads/master
Commit: 6321f2b5f26134fe4ebd6bfaee351efbb103434f
Parents: 4642759
Author: Travis Graham 
Authored: Fri Oct 4 16:46:12 2013 -0400
Committer: Prasanna Santhanam 
Committed: Fri Oct 11 12:23:11 2013 +0530

--
 en-US/management-server-install-db-external.xml  | 2 +-
 en-US/management-server-install-db-local.xml | 2 +-
 en-US/nfs-shares-on-management-server.xml| 4 ++--
 en-US/nfs-shares-on-separate-server.xml  | 4 ++--
 en-US/prepare-system-vm-template.xml | 6 +++---
 en-US/storage-setup.xml  | 6 +++---
 en-US/troublesht-dataloss-on-exp-primary-storage.xml | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6321f2b5/en-US/management-server-install-db-external.xml
--
diff --git a/en-US/management-server-install-db-external.xml 
b/en-US/management-server-install-db-external.xml
index 2950720..2c6c8bc 100644
--- a/en-US/management-server-install-db-external.xml
+++ b/en-US/management-server-install-db-external.xml
@@ -63,7 +63,7 @@ bind-address = 0.0.0.0
 manually.
   service mysqld start
   On Ubuntu, restart MySQL.
-  service mysqld restart
+  service mysql restart
 
 
   (CentOS and RHEL only; not required on Ubuntu)

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6321f2b5/en-US/management-server-install-db-local.xml
--
diff --git a/en-US/management-server-install-db-local.xml 
b/en-US/management-server-install-db-local.xml
index ff5ab60..ebade57 100644
--- a/en-US/management-server-install-db-local.xml
+++ b/en-US/management-server-install-db-local.xml
@@ -58,7 +58,7 @@ binlog-format = 'ROW'
 manually.
   service mysqld start
   On Ubuntu, restart MySQL.
-  service mysqld restart
+  service mysql restart
 
 
   (CentOS and RHEL only; not required on Ubuntu)

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6321f2b5/en-US/nfs-shares-on-management-server.xml
--
diff --git a/en-US/nfs-shares-on-management-server.xml 
b/en-US/nfs-shares-on-management-server.xml
index 881ca8d..0ce058a 100644
--- a/en-US/nfs-shares-on-management-server.xml
+++ b/en-US/nfs-shares-on-management-server.xml
@@ -38,10 +38,10 @@ $ sudo yum install nfs-utils
 # mkdir -p /export/secondary
 
 
-To configure the new directories as NFS exports, edit 
/etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For 
example:
+To configure the new directories as NFS exports, edit 
/etc/exports. Export the NFS share(s) with 
rw,async,no_root_squash,no_subtree_check. For example:
 # vi /etc/exports
 Insert the following line.
-/export  
*(rw,async,no_root_squash)
+/export  
*(rw,async,no_root_squash,no_subtree_check)
 
 Export the /export directory.
 # exportfs -a

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6321f2b5/en-US/nfs-shares-on-separate-server.xml
--
diff --git a/en-US/nfs-shares-on-separate-server.xml 
b/en-US/nfs-shares-on-separate-server.xml
index 947106d..6e20bb5 100644
--- a/en-US/nfs-shares-on-separate-server.xml
+++ b/en-US/nfs-shares-on-separate-server.xml
@@ -34,10 +34,10 @@
 # mkdir -p /export/secondary
 
 
-To configure the new directories as NFS exports, edit 
/etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For 
example:
+To configure the new directories as NFS exports, edit 
/etc/exports. Export the NFS share(s) with 
rw,async,no_root_squash,no_subtree_check. For example:
 # vi /etc/exports
 Insert the following line.
-/export  
*(rw,async,no_root_squash)
+/export  
*(rw,async,no_root_squash,no_subtree_check)
 
 Export the /export directory.
 # exportfs -a

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/6321f2b5/en-US/prepare-system-vm-template.xml
---

66 matches

Mail list logo