date:20150119

git commit: updated refs/heads/4.5 to 960d91e

2015-01-19 Thread aprateek

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 a1a601be5 -> 960d91e0d


CLOUDSTACK-8165: updating guest os id for xen template to corresponding 64 bit 
as default template is 64 bit


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

Branch: refs/heads/4.5
Commit: 960d91e0d54af13dccbc3ad0864b8630ac6d7082
Parents: a1a601b
Author: abhi 
Authored: Mon Jan 19 15:44:14 2015 +0530
Committer: abhi 
Committed: Mon Jan 19 15:44:14 2015 +0530

--
 setup/db/templates.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/960d91e0/setup/db/templates.sql
--
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 6a74633..c42de21 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
-VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2',
 '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 
183, 0, 1, 'XenServer' );
+VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2',
 '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 
184, 0, 1, 'XenServer' );
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, removed, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, 
extractable)
 VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI 
(XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 
'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2',
 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI 
(XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1);

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

2015-01-19 Thread aprateek

Repository: cloudstack
Updated Branches:
  refs/heads/master d8def3dc0 -> 6a20dd4ea


CLOUDSTACK-8165: updating guest os id for xen template to corresponding 64 bit 
as default template is 64 bit


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

Branch: refs/heads/master
Commit: 6a20dd4ead38ebd952cb15e24cbab43b38d4f0b8
Parents: d8def3d
Author: Abhinandan Prateek 
Authored: Mon Jan 19 15:44:14 2015 +0530
Committer: Abhinandan Prateek 
Committed: Mon Jan 19 16:03:56 2015 +0530

--
 setup/db/templates.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a20dd4e/setup/db/templates.sql
--
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 6a74633..c42de21 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
-VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2',
 '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 
183, 0, 1, 'XenServer' );
+VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2',
 '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 
184, 0, 1, 'XenServer' );
 
 INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, 
created, removed, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, 
extractable)
 VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI 
(XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 
'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2',
 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI 
(XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1);

Build failed in Jenkins: cloudstack-marvin #1597

2015-01-19 Thread Apache Jenkins Server

See 

Changes:

[abhinandan.prateek] CLOUDSTACK-8165: updating guest os id for xen template to 
corresponding 64 bit as default template is 64 bit

--
[...truncated 261 lines...]
[INFO] Apache CloudStack Framework - Configuration ... SKIPPED
[INFO] Apache CloudStack API . SKIPPED
[INFO] Apache CloudStack Framework - REST  SKIPPED
[INFO] Apache CloudStack Framework - IPC . SKIPPED
[INFO] Apache CloudStack Cloud Engine  SKIPPED
[INFO] Apache CloudStack Cloud Engine API  SKIPPED
[INFO] Apache CloudStack Framework - Security  SKIPPED
[INFO] Apache CloudStack Core  SKIPPED
[INFO] Apache CloudStack Agents .. SKIPPED
[INFO] Apache CloudStack Framework - Clustering .. SKIPPED
[INFO] Apache CloudStack Framework - Event Notification .. SKIPPED
[INFO] Apache CloudStack Cloud Engine Schema Component ... SKIPPED
[INFO] Apache CloudStack Framework - Jobs  SKIPPED
[INFO] Apache CloudStack Cloud Engine Internal Components API  SKIPPED
[INFO] Apache CloudStack Server .. SKIPPED
[INFO] Apache CloudStack Usage Server  SKIPPED
[INFO] Apache CloudStack Cloud Engine Orchestration Component  SKIPPED
[INFO] Apache CloudStack Cloud Services .. SKIPPED
[INFO] Apache CloudStack Secondary Storage ... SKIPPED
[INFO] Apache CloudStack Secondary Storage Service ... SKIPPED
[INFO] Apache CloudStack Engine Storage Component  SKIPPED
[INFO] Apache CloudStack Engine Storage Volume Component . SKIPPED
[INFO] Apache CloudStack Engine Storage Image Component .. SKIPPED
[INFO] Apache CloudStack Engine Storage Data Motion Component  SKIPPED
[INFO] Apache CloudStack Engine Storage Cache Component .. SKIPPED
[INFO] Apache CloudStack Engine Storage Snapshot Component  SKIPPED
[INFO] Apache CloudStack Cloud Engine API  SKIPPED
[INFO] Apache CloudStack Cloud Engine Service  SKIPPED
[INFO] Apache CloudStack Plugin POM .. SKIPPED
[INFO] Apache CloudStack Plugin - API Rate Limit . SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume default provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume SolidFire Provider  SKIPPED
[INFO] Apache CloudStack Plugin - API SolidFire .. SKIPPED
[INFO] Apache CloudStack Plugin - API Discovery .. SKIPPED
[INFO] Apache CloudStack Plugin - ACL Static Role Based .. SKIPPED
[INFO] Apache CloudStack Plugin - Host Anti-Affinity Processor  SKIPPED
[INFO] Apache CloudStack Plugin - Explicit Dedication Processor  SKIPPED
[INFO] Apache CloudStack Plugin - User Concentrated Pod Deployment Planner  
SKIPPED
[INFO] Apache CloudStack Plugin - User Dispersing Deployment Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Implicit Dedication Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Skip Heurestics Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Host Allocator Random .. SKIPPED
[INFO] Apache CloudStack Plugin - Dedicated Resources  SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor OracleVM  SKIPPED
[INFO] Apache CloudStack Plugin - Open vSwitch ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor XenServer ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor KVM . SKIPPED
[INFO] Apache CloudStack Plugin - RabbitMQ Event Bus . SKIPPED
[INFO] Apache CloudStack Plugin - In Memory Event Bus  SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor Baremetal ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor UCS . SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor Hyper-V . SKIPPED
[INFO] Apache CloudStack Plugin - Network Elastic Load Balancer  SKIPPED
[INFO] Apache CloudStack Plugin - Network Internal Load Balancer  SKIPPED
[INFO] Apache CloudStack Framework - Spring Life Cycle ... SKIPPED
[INFO] Apache CloudStack Plugin - Network Juniper Contrail  SKIPPED
[INFO] Apache CloudStack Plugin - Palo Alto .. SKIPPED
[INFO] Apache CloudStack Plugin - Network Netscaler .. SKIPPED
[INFO] Apache CloudStack Plugin - Network Nicira NVP . SKIPPED
[INFO] Apache CloudStack Plugin - BigSwitch Virtual Network Segment  SKIPPED
[INFO] Apache CloudStack Plugin - Network Brocade VCS  SKIPPED
[INFO] Apache CloudStack Plugin - Midokura Midonet ... SKIPPED
[INFO] Apache CloudStack Plugin - Stratosphere SSP ... SKIPPED
[INFO] Apache CloudStack Plugin - Network Opendaylight ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Allocator Random  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator LDAP  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator MD5 . SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator Plain Text  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator SAM

git commit: updated refs/heads/volume-upload to cd02ceb

2015-01-19 Thread koushik

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload ca0f9de6c -> cd02ceb7a


volume-upload: gc thread to clean partially uploaded files
Added state transitions from error/abandoned to destroyed


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

Branch: refs/heads/volume-upload
Commit: cd02ceb7a19eefad43cba41ad5cbb0cccdef13d7
Parents: ca0f9de
Author: Koushik Das 
Authored: Mon Jan 19 18:01:29 2015 +0530
Committer: Koushik Das 
Committed: Mon Jan 19 18:01:29 2015 +0530

--
 api/src/com/cloud/storage/Volume.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd02ceb7/api/src/com/cloud/storage/Volume.java
--
diff --git a/api/src/com/cloud/storage/Volume.java 
b/api/src/com/cloud/storage/Volume.java
index dbe370c..106e4c2 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -111,6 +111,8 @@ public interface Volume extends ControlledEntity, Identity, 
InternalIdentity, Ba
 s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationSucceeded, Uploaded, null));
 s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationFailed, UploadError, null));
 s_fsm.addTransition(new StateMachine2.Transition(UploadInProgress, Event.OperationTimeout, UploadError, null));
+s_fsm.addTransition(new StateMachine2.Transition(UploadError, Event.DestroyRequested, Destroy, null));
+s_fsm.addTransition(new StateMachine2.Transition(UploadAbandoned, Event.DestroyRequested, Destroy, null));
 }
 }

git commit: updated refs/heads/volume-upload to ad6b7b3

2015-01-19 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload cd02ceb7a -> ad6b7b30c


Volume upload: sending the nfsstore url in the metadata

decoding the metadata and deserialising it on receiving it


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

Branch: refs/heads/volume-upload
Commit: ad6b7b30cbbb68fd1b72dd5a2fe92143931d0220
Parents: cd02ceb
Author: Rajani Karuturi 
Authored: Mon Jan 19 18:03:00 2015 +0530
Committer: Rajani Karuturi 
Committed: Mon Jan 19 18:04:14 2015 +0530

--
 .../TemplateOrVolumePostUploadCommand.java  | 124 +++
 .../subsystem/api/storage/VolumeService.java|   3 +-
 .../storage/volume/VolumeServiceImpl.java   |   5 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |  21 ++--
 .../resource/NfsSecondaryStorageResource.java   |  20 ++-
 5 files changed, 158 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad6b7b30/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
--
diff --git 
a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
 
b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
index d2a9577..78cfccb 100644
--- 
a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
+++ 
b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
@@ -26,6 +26,130 @@ public class TemplateOrVolumePostUploadCommand {
 DataObject dataObject;
 EndPoint endPoint;
 
+long entityId;
+String entityUUID;
+String absolutePath;
+String checksum;
+String type;
+String name;
+//String installPathPrefix;
+String localPath;
+//String isHvm;
+String imageFormat;
+String dataTo;
+String dataToRole;
+
+public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, 
String absolutePath, String checksum, String type, String name,
+ String localPath, String 
imageFormat, String dataTo, String dataToRole) {
+this.entityId = entityId;
+this.entityUUID = entityUUID;
+this.absolutePath = absolutePath;
+this.checksum = checksum;
+this.type = type;
+this.name = name;
+//this.installPathPrefix = installPathPrefix;
+this.localPath = localPath;
+//this.isHvm = isHvm;
+this.imageFormat = imageFormat;
+this.dataTo = dataTo;
+this.dataToRole = dataToRole;
+}
+
+public String getDataTo() {
+return dataTo;
+}
+
+public void setDataTo(String dataTo) {
+this.dataTo = dataTo;
+}
+
+public String getDataToRole() {
+return dataToRole;
+}
+
+public void setDataToRole(String dataToRole) {
+this.dataToRole = dataToRole;
+}
+//public String getInstallPathPrefix() {
+//return installPathPrefix;
+//}
+//
+//public void setInstallPathPrefix(String installPathPrefix) {
+//this.installPathPrefix = installPathPrefix;
+//}
+
+public String getLocalPath() {
+return localPath;
+}
+
+public void setLocalPath(String localPath) {
+this.localPath = localPath;
+}
+
+//public String getIsHvm() {
+//return isHvm;
+//}
+
+//public void setIsHvm(String isHvm) {
+//this.isHvm = isHvm;
+//}
+
+public String getImageFormat() {
+return imageFormat;
+}
+
+public void setImageFormat(String imageFormat) {
+this.imageFormat = imageFormat;
+}
+
+public long getEntityId() {
+return entityId;
+}
+
+public void setEntityId(long entityId) {
+this.entityId = entityId;
+}
+
+public String getEntityUUID() {
+return entityUUID;
+}
+
+public void setEntityUUID(String entityUUID) {
+this.entityUUID = entityUUID;
+}
+
+public String getAbsolutePath() {
+return absolutePath;
+}
+
+public void setAbsolutePath(String absolutePath) {
+this.absolutePath = absolutePath;
+}
+
+public String getChecksum() {
+return checksum;
+}
+
+public void setChecksum(String checksum) {
+this.checksum = checksum;
+}
+
+public String getType() {
+return type;
+}
+
+public void setType(String type) {
+this.type = type;
+}
+
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
 publ

[2/2] git commit: updated refs/heads/volume-upload to e4d1049

2015-01-19 Thread bfederle

Add to storage->upload volume dialog


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

Branch: refs/heads/volume-upload
Commit: 8641de85d2da4d755cfe966ea5c6c3aaf4abc2b5
Parents: ad6b7b3
Author: Brian Federle 
Authored: Mon Jan 19 11:33:59 2015 -0800
Committer: Brian Federle 
Committed: Mon Jan 19 11:35:42 2015 -0800

--
 ui/scripts/storage.js | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8641de85/ui/scripts/storage.js
--
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 6585e1a..663fb9f 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -265,6 +265,22 @@
 }
 },
 createForm: {
+fileUpload: {
+getURL: function(args) {
+args.response.success({
+url: 
'http://10.223.183.3/test-upload.php'
+});
+},
+postUpload: function(args) {
+// Called when upload is done to do 
+// verification checks;
+// i.e., poll the server to verify 
successful upload
+//
+// success() will close the dialog and 
call standard action
+// error() will keep dialog open if 
user wants to re-submit
+args.response.success();
+}
+},
 title: 'label.upload.volume',
 fields: {
 name: {
@@ -274,6 +290,10 @@
 },
 docID: 'helpUploadVolumeName'
 },
+templateFileUpload: {
+label: 'Select a file',
+isFileUpload: true
+},
 availabilityZone: {
 label: 'label.availability.zone',
 docID: 'helpUploadVolumeZone',

[1/2] git commit: updated refs/heads/volume-upload to e4d1049

2015-01-19 Thread bfederle

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload ad6b7b30c -> e4d104909


Allow passing custom data in POST request


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

Branch: refs/heads/volume-upload
Commit: e4d1049096152cb9fcd4b937666c8dfe8a035392
Parents: 8641de8
Author: Brian Federle 
Authored: Mon Jan 19 11:35:17 2015 -0800
Committer: Brian Federle 
Committed: Mon Jan 19 11:35:42 2015 -0800

--
 ui/scripts/templates.js |  6 +-
 ui/scripts/ui/dialog.js | 11 +++
 2 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4d10490/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 1b6400a..faf0403 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -110,7 +110,11 @@
 fileUpload: {
 getURL: function(args) {
 args.response.success({
-url: 
'http://10.223.183.3/test-upload.php'
+url: 
'http://10.223.183.3/test-upload.php',
+data: {
+testData1: '1',
+testData2: '2'
+}
 });
 },
 postUpload: function(args) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4d10490/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 1c7904a..00d2303 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -701,6 +701,17 @@
 var $file = $form.find('input[type=file]');
 var $field = $file.closest('.form-item 
.value');
 
+// Add additional passed data
+$.map(successArgs.data, function(v, k) {
+var $hidden = $('').attr({
+type: 'hidden',
+name: k,
+value: v
+});
+
+$hidden.appendTo($frameForm);
+});
+
 $uploadFrame.css({ width: $field.outerWidth(), 
height: $field.height() }).show();
 $frameForm.append($file);
 $field.append($uploadFrame);

[2/3] git commit: updated refs/heads/volume-upload to cef4447

2015-01-19 Thread jessicawang

Revert "Add to storage->upload volume dialog"

This reverts commit 8641de85d2da4d755cfe966ea5c6c3aaf4abc2b5.


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

Branch: refs/heads/volume-upload
Commit: aa9a7f50b738a3e4acdcdcf2cf62c21e375242b9
Parents: f10709c
Author: Jessica Wang 
Authored: Mon Jan 19 15:56:48 2015 -0800
Committer: Jessica Wang 
Committed: Mon Jan 19 15:56:48 2015 -0800

--
 ui/scripts/storage.js | 20 
 1 file changed, 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa9a7f50/ui/scripts/storage.js
--
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 663fb9f..6585e1a 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -265,22 +265,6 @@
 }
 },
 createForm: {
-fileUpload: {
-getURL: function(args) {
-args.response.success({
-url: 
'http://10.223.183.3/test-upload.php'
-});
-},
-postUpload: function(args) {
-// Called when upload is done to do 
-// verification checks;
-// i.e., poll the server to verify 
successful upload
-//
-// success() will close the dialog and 
call standard action
-// error() will keep dialog open if 
user wants to re-submit
-args.response.success();
-}
-},
 title: 'label.upload.volume',
 fields: {
 name: {
@@ -290,10 +274,6 @@
 },
 docID: 'helpUploadVolumeName'
 },
-templateFileUpload: {
-label: 'Select a file',
-isFileUpload: true
-},
 availabilityZone: {
 label: 'label.availability.zone',
 docID: 'helpUploadVolumeZone',

[1/3] git commit: updated refs/heads/volume-upload to cef4447

2015-01-19 Thread jessicawang

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload e4d104909 -> cef4447fd


Revert "Allow passing custom data in POST request"

This reverts commit e4d1049096152cb9fcd4b937666c8dfe8a035392.


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

Branch: refs/heads/volume-upload
Commit: f10709c756c9d9569e215ff21724ee79fa43bc89
Parents: e4d1049
Author: Jessica Wang 
Authored: Mon Jan 19 15:56:13 2015 -0800
Committer: Jessica Wang 
Committed: Mon Jan 19 15:56:13 2015 -0800

--
 ui/scripts/templates.js |  6 +-
 ui/scripts/ui/dialog.js | 11 ---
 2 files changed, 1 insertion(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f10709c7/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index faf0403..1b6400a 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -110,11 +110,7 @@
 fileUpload: {
 getURL: function(args) {
 args.response.success({
-url: 
'http://10.223.183.3/test-upload.php',
-data: {
-testData1: '1',
-testData2: '2'
-}
+url: 
'http://10.223.183.3/test-upload.php'
 });
 },
 postUpload: function(args) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f10709c7/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 00d2303..1c7904a 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -701,17 +701,6 @@
 var $file = $form.find('input[type=file]');
 var $field = $file.closest('.form-item 
.value');
 
-// Add additional passed data
-$.map(successArgs.data, function(v, k) {
-var $hidden = $('').attr({
-type: 'hidden',
-name: k,
-value: v
-});
-
-$hidden.appendTo($frameForm);
-});
-
 $uploadFrame.css({ width: $field.outerWidth(), 
height: $field.height() }).show();
 $frameForm.append($file);
 $field.append($uploadFrame);

[3/3] git commit: updated refs/heads/volume-upload to cef4447

2015-01-19 Thread jessicawang

(1) Remove UploadFile button from Register Template dialog. (2) sync latest 
templates.js from master branch.


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

Branch: refs/heads/volume-upload
Commit: cef4447fd4c5b5a982098405721ac8e27c644859
Parents: aa9a7f5
Author: Jessica Wang 
Authored: Mon Jan 19 16:13:57 2015 -0800
Committer: Jessica Wang 
Committed: Mon Jan 19 16:13:57 2015 -0800

--
 ui/scripts/templates.js | 241 ++-
 1 file changed, 125 insertions(+), 116 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cef4447f/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 1b6400a..86f9159 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -43,6 +43,9 @@
 mine: {
 label: 'ui.listView.filters.mine'
 },
+shared: {
+label: 'Shared'
+},
 featured: {
 label: 'label.featured'
 },
@@ -107,22 +110,6 @@
 title: 'label.action.register.template',
 docID: 'helpNetworkOfferingName',
 preFilter: cloudStack.preFilter.createTemplate,
-fileUpload: {
-getURL: function(args) {
-args.response.success({
-url: 
'http://10.223.183.3/test-upload.php'
-});
-},
-postUpload: function(args) {
-// Called when upload is done to do 
-// verification checks;
-// i.e., poll the server to verify 
successful upload
-//
-// success() will close the dialog and 
call standard action
-// error() will keep dialog open if 
user wants to re-submit
-args.response.success();
-}
-},
 fields: {
 name: {
 label: 'label.name',
@@ -131,10 +118,6 @@
 required: true
 }
 },
-templateFileUpload: {
-label: 'Select a file',
-isFileUpload: true
-},
 description: {
 label: 'label.description',
 docID: 
'helpRegisterTemplateDescription',
@@ -342,11 +325,19 @@
 });
 items.push({
 id: "us",
-description: "US"
+description: "US Keboard"
+});
+items.push({
+id: "uk",
+description: "UK Keyboard"
 });
 items.push({
 id: "jp",
-description: "Japanese"
+description: "Japanese 
Keyboard"
+});
+items.push({
+id: "sc",
+description: "Simplified 
Chinese"
 });
 args.response.success({
 data: items
@@ -428,20 +419,18 @@
 osTypeId: {

git commit: updated refs/heads/volume-upload to f0b60c7

2015-01-19 Thread jessicawang

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload cef4447fd -> f0b60c742


volume-upload: UI > templates > add new action "Upload Template from Local".


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

Branch: refs/heads/volume-upload
Commit: f0b60c742b8573f3e41d1868a8095d8171d011b0
Parents: cef4447
Author: Jessica Wang 
Authored: Mon Jan 19 17:31:32 2015 -0800
Committer: Jessica Wang 
Committed: Mon Jan 19 17:31:32 2015 -0800

--
 ui/scripts/templates.js | 308 +++
 1 file changed, 308 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0b60c74/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 86f9159..16d057d 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -578,6 +578,314 @@
 args.complete();
 }
 }
+},
+
+uploadTemplateFromLocal: {
+isHeader: true,
+label: 'Upload Template from Local',
+messages: {
+notification: function(args) {
+return 'Upload Template from Local';
+}
+},
+createForm: {
+title: 'Upload Template from Local',
+preFilter: cloudStack.preFilter.createTemplate,
+fileUpload: {
+getURL: function(args) {   
 
+args.data = args.formData;
+
+var data = {
+name: args.data.name,
+displayText: args.data.description,
+zoneid: args.data.zone,
+format: args.data.format,
+isextractable: 
(args.data.isExtractable == "on"),
+passwordEnabled: 
(args.data.isPasswordEnabled == "on"),
+isdynamicallyscalable: 
(args.data.isdynamicallyscalable == "on"),
+osTypeId: args.data.osTypeId,
+hypervisor: args.data.hypervisor
+};
+
+
+debugger;
+//Brian, please extend args to include 
$form 
+/*
+if 
(args.$form.find('.form-item[rel=isPublic]').css("display") != "none") {
+$.extend(data, {
+ispublic: (args.data.isPublic 
== "on")
+});
+}
+
+if 
(args.$form.find('.form-item[rel=requireshvm]').css("display") != "none") {
+$.extend(data, {
+requireshvm: 
(args.data.requireshvm == "on")
+});
+}
+
+if 
(args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") {
+$.extend(data, {
+isfeatured: 
(args.data.isFeatured == "on")
+});
+}
+
+if 
(args.$form.find('.form-item[rel=isrouting]').is(':visible')) {
+$.extend(data, {
+isrouting: 
(args.data.isrouting === 'on')
+});
+}
+*/
+
+$.ajax({
+url: 
createURL('

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

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 960d91e0d -> f702097b3


CID 1264632: Rely on a known and widely available encoding UTF8

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: 0763b5576dde92b1c4ecfbce3b3b593ed0ca90bc
Parents: 960d91e
Author: Rohit Yadav 
Authored: Tue Jan 20 07:47:34 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:47:34 2015 +0530

--
 utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0763b557/utils/src/com/cloud/utils/ConstantTimeComparator.java
--
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java 
b/utils/src/com/cloud/utils/ConstantTimeComparator.java
index 4d4a595..baf2bc2 100644
--- a/utils/src/com/cloud/utils/ConstantTimeComparator.java
+++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java
@@ -19,6 +19,8 @@
 
 package com.cloud.utils;
 
+import java.nio.charset.Charset;
+
 public class ConstantTimeComparator {
 
 public static boolean compareBytes(byte[] b1, byte[] b2) {
@@ -34,6 +36,7 @@ public class ConstantTimeComparator {
 }
 
 public static boolean compareStrings(String s1, String s2) {
-return compareBytes(s1.getBytes(), s2.getBytes());
+final Charset encoding = Charset.forName("UTF-8");
+return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding));
 }
 }

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

2015-01-19 Thread bhaisaab

packaging: fix rpm package warning, fix day/date

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: f702097b3ebf72d5b2b0725e07330f75a3657f81
Parents: 0763b55
Author: Rohit Yadav 
Authored: Tue Jan 20 07:48:26 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:48:26 2015 +0530

--
 packaging/centos63/cloud.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f702097b/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 072a0b9..6624647 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -712,5 +712,5 @@ fi
 * Fri Jul 04 2014 Hugo Trippaers  4.5.0
 - Add a package for the mysql ha module
 
-* Fri Oct 03 2012 Hugo Trippaers  4.1.0
+* Wed Oct 03 2012 Hugo Trippaers  4.1.0
 - new style spec file

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

2015-01-19 Thread bhaisaab

packaging: fix rpm package warning, fix day/date

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


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

Branch: refs/heads/master
Commit: 240e8ef8ac6366ffd8268257db94976b9a81f7dd
Parents: 60f18cc
Author: Rohit Yadav 
Authored: Tue Jan 20 07:48:26 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:49:19 2015 +0530

--
 packaging/centos63/cloud.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/240e8ef8/packaging/centos63/cloud.spec
--
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 4702be3..dff5dcb 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -700,5 +700,5 @@ fi
 * Fri Jul 04 2014 Hugo Trippaers  4.5.0
 - Add a package for the mysql ha module
 
-* Fri Oct 03 2012 Hugo Trippaers  4.1.0
+* Wed Oct 03 2012 Hugo Trippaers  4.1.0
 - new style spec file

[1/2] git commit: updated refs/heads/master to 240e8ef

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/master 6a20dd4ea -> 240e8ef8a


CID 1264632: Rely on a known and widely available encoding UTF8

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


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

Branch: refs/heads/master
Commit: 60f18cc7133743c2a411280090ea1e4b79791993
Parents: 6a20dd4
Author: Rohit Yadav 
Authored: Tue Jan 20 07:47:34 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:49:09 2015 +0530

--
 utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60f18cc7/utils/src/com/cloud/utils/ConstantTimeComparator.java
--
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java 
b/utils/src/com/cloud/utils/ConstantTimeComparator.java
index 4d4a595..baf2bc2 100644
--- a/utils/src/com/cloud/utils/ConstantTimeComparator.java
+++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java
@@ -19,6 +19,8 @@
 
 package com.cloud.utils;
 
+import java.nio.charset.Charset;
+
 public class ConstantTimeComparator {
 
 public static boolean compareBytes(byte[] b1, byte[] b2) {
@@ -34,6 +36,7 @@ public class ConstantTimeComparator {
 }
 
 public static boolean compareStrings(String s1, String s2) {
-return compareBytes(s1.getBytes(), s2.getBytes());
+final Charset encoding = Charset.forName("UTF-8");
+return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding));
 }
 }

git commit: updated refs/heads/4.4 to 70f9db3

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 7699c70ad -> 70f9db34c


CID 1264632: Rely on a known and widely available encoding UTF8

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


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

Branch: refs/heads/4.4
Commit: 70f9db34cb1a9b0dafbf985e9a590cb73528e598
Parents: 7699c70
Author: Rohit Yadav 
Authored: Tue Jan 20 07:47:34 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:49:56 2015 +0530

--
 utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70f9db34/utils/src/com/cloud/utils/ConstantTimeComparator.java
--
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java 
b/utils/src/com/cloud/utils/ConstantTimeComparator.java
index 4d4a595..baf2bc2 100644
--- a/utils/src/com/cloud/utils/ConstantTimeComparator.java
+++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java
@@ -19,6 +19,8 @@
 
 package com.cloud.utils;
 
+import java.nio.charset.Charset;
+
 public class ConstantTimeComparator {
 
 public static boolean compareBytes(byte[] b1, byte[] b2) {
@@ -34,6 +36,7 @@ public class ConstantTimeComparator {
 }
 
 public static boolean compareStrings(String s1, String s2) {
-return compareBytes(s1.getBytes(), s2.getBytes());
+final Charset encoding = Charset.forName("UTF-8");
+return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding));
 }
 }

git commit: updated refs/heads/4.3 to bd5fe46

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 969bbb02a -> bd5fe46e5


CID 1264632: Rely on a known and widely available encoding UTF8

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


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

Branch: refs/heads/4.3
Commit: bd5fe46e537b455e484bd0e30b3cd1b9f563a11c
Parents: 969bbb0
Author: Rohit Yadav 
Authored: Tue Jan 20 07:47:34 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 07:50:12 2015 +0530

--
 utils/src/com/cloud/utils/ConstantTimeComparator.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd5fe46e/utils/src/com/cloud/utils/ConstantTimeComparator.java
--
diff --git a/utils/src/com/cloud/utils/ConstantTimeComparator.java 
b/utils/src/com/cloud/utils/ConstantTimeComparator.java
index 4d4a595..baf2bc2 100644
--- a/utils/src/com/cloud/utils/ConstantTimeComparator.java
+++ b/utils/src/com/cloud/utils/ConstantTimeComparator.java
@@ -19,6 +19,8 @@
 
 package com.cloud.utils;
 
+import java.nio.charset.Charset;
+
 public class ConstantTimeComparator {
 
 public static boolean compareBytes(byte[] b1, byte[] b2) {
@@ -34,6 +36,7 @@ public class ConstantTimeComparator {
 }
 
 public static boolean compareStrings(String s1, String s2) {
-return compareBytes(s1.getBytes(), s2.getBytes());
+final Charset encoding = Charset.forName("UTF-8");
+return compareBytes(s1.getBytes(encoding), s2.getBytes(encoding));
 }
 }

Build failed in Jenkins: cloudstack-marvin #1598

2015-01-19 Thread Apache Jenkins Server

See 

Changes:

[rohit.yadav] CID 1264632: Rely on a known and widely available encoding UTF8

[rohit.yadav] packaging: fix rpm package warning, fix day/date

--
[...truncated 331 lines...]
[INFO] Apache CloudStack Plugin - Dns Notifier Example ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image S3 ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image Swift provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image default provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image sample provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume Nexenta Provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume CloudByte Provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume sample provider  SKIPPED
[INFO] Apache CloudStack Plugin - SNMP Alerts  SKIPPED
[INFO] Apache CloudStack Plugin - Syslog Alerts .. SKIPPED
[INFO] Apache CloudStack Plugin - Network VXLAN .. SKIPPED
[INFO] Apache CloudStack Plugin - GloboDNS ... SKIPPED
[INFO] Apache CloudStack Framework - Spring Module ... SKIPPED
[INFO] Apache CloudStack Secondary Storage Controller  SKIPPED
[INFO] Apache CloudStack Client UI ... SKIPPED
[INFO] Apache CloudStack Console Proxy - RDP Client .. SKIPPED
[INFO] Apache CloudStack Console Proxy ... SKIPPED
[INFO] Apache CloudStack Console Proxy - Server .. SKIPPED
[INFO] Apache CloudStack Framework - QuickCloud .. SKIPPED
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 8.725s
[INFO] Finished at: Tue Jan 20 02:57:06 UTC 2015
[INFO] Final Memory: 48M/439M
[INFO] 
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
Waiting for Jenkins to finish collecting data
[ERROR] Failed to execute goal 
org.apache.maven.plugins:maven-compiler-plugin:3.2:compile (default-compile) on 
project cloud-framework-managed-context: Compilation failure
[ERROR] javac: invali

git commit: updated refs/heads/volume-upload to 15ae33a

2015-01-19 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload f0b60c742 -> 15ae33a5b


volume upload: refactored post upload command and used it during template 
registration


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

Branch: refs/heads/volume-upload
Commit: 15ae33a5b6a1838ab346754545d2ebb28b5345b5
Parents: f0b60c7
Author: Rajani Karuturi 
Authored: Tue Jan 20 09:23:20 2015 +0530
Committer: Rajani Karuturi 
Committed: Tue Jan 20 09:24:14 2015 +0530

--
 .../TemplateOrVolumePostUploadCommand.java  | 108 ++-
 ...ateOrVolumePostUploadCommandTypeAdapter.java |  52 -
 .../com/cloud/storage/VolumeApiServiceImpl.java |   7 +-
 .../template/HypervisorTemplateAdapter.java |   6 +-
 .../com/cloud/template/TemplateManagerImpl.java |   7 +-
 .../resource/NfsSecondaryStorageResource.java   |   2 -
 6 files changed, 43 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15ae33a5/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
--
diff --git 
a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
 
b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
index 78cfccb..8872798 100644
--- 
a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
+++ 
b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
@@ -19,42 +19,56 @@
 
 package org.apache.cloudstack.storage.command;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
-
 public class TemplateOrVolumePostUploadCommand {
-DataObject dataObject;
-EndPoint endPoint;
 
 long entityId;
+
 String entityUUID;
+
 String absolutePath;
+
 String checksum;
+
 String type;
+
 String name;
-//String installPathPrefix;
+
 String localPath;
-//String isHvm;
+
+boolean requiresHvm;
+
 String imageFormat;
+
 String dataTo;
+
 String dataToRole;
 
-public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, 
String absolutePath, String checksum, String type, String name,
- String localPath, String 
imageFormat, String dataTo, String dataToRole) {
+String remoteEndPoint;
+
+public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, 
String absolutePath, String checksum, String type, String name, String 
imageFormat, String dataTo,
+String dataToRole) {
 this.entityId = entityId;
 this.entityUUID = entityUUID;
 this.absolutePath = absolutePath;
 this.checksum = checksum;
 this.type = type;
 this.name = name;
-//this.installPathPrefix = installPathPrefix;
-this.localPath = localPath;
-//this.isHvm = isHvm;
 this.imageFormat = imageFormat;
 this.dataTo = dataTo;
 this.dataToRole = dataToRole;
 }
 
+public TemplateOrVolumePostUploadCommand() {
+}
+
+public String getRemoteEndPoint() {
+return remoteEndPoint;
+}
+
+public void setRemoteEndPoint(String remoteEndPoint) {
+this.remoteEndPoint = remoteEndPoint;
+}
+
 public String getDataTo() {
 return dataTo;
 }
@@ -70,13 +84,6 @@ public class TemplateOrVolumePostUploadCommand {
 public void setDataToRole(String dataToRole) {
 this.dataToRole = dataToRole;
 }
-//public String getInstallPathPrefix() {
-//return installPathPrefix;
-//}
-//
-//public void setInstallPathPrefix(String installPathPrefix) {
-//this.installPathPrefix = installPathPrefix;
-//}
 
 public String getLocalPath() {
 return localPath;
@@ -86,13 +93,13 @@ public class TemplateOrVolumePostUploadCommand {
 this.localPath = localPath;
 }
 
-//public String getIsHvm() {
-//return isHvm;
-//}
+public boolean getRequiresHvm() {
+return requiresHvm;
+}
 
-//public void setIsHvm(String isHvm) {
-//this.isHvm = isHvm;
-//}
+public void setRequiresHvm(boolean requiresHvm) {
+this.requiresHvm = requiresHvm;
+}
 
 public String getImageFormat() {
 return imageFormat;
@@ -149,55 +156,4 @@ public class TemplateOrVolumePostUploadCommand {
 public void setName(String name) {
 this.name = name;
 }
-
-public TemplateOrVolumePostUploadCommand(DataObject dat

[02/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8132: Fixed issue related to secondary storage count of template

Signed-off-by: SrikanteswaraRao Talluri 
(cherry picked from commit f938a5e1c352971aa61e75a60935c735c3d3920c)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: 9a75a0cd221efc85a9d2b27fafdbf60995aa57eb
Parents: fc502a9
Author: Ashutosh K 
Authored: Mon Dec 29 03:34:37 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:18:24 2015 +0530

--
 test/integration/component/test_ss_limits.py | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a75a0cd/test/integration/component/test_ss_limits.py
--
diff --git a/test/integration/component/test_ss_limits.py 
b/test/integration/component/test_ss_limits.py
index c498302..d5ee063 100644
--- a/test/integration/component/test_ss_limits.py
+++ b/test/integration/component/test_ss_limits.py
@@ -126,7 +126,7 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 except Exception as e:
 return [FAIL, e]
 return [PASS, None]
-
+ 
 @data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
 @attr(tags = ["advanced"], required_hardware="true")
 def test_01_register_template(self, value):
@@ -143,24 +143,28 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 response = self.setupAccount(value)
 self.assertEqual(response[0], PASS, response[1])
 
+apiclient = self.testClient.getUserApiClient(
+UserName=self.account.name,
+DomainName=self.account.domain)
+
 builtin_info = get_builtin_template_info(self.apiclient, self.zone.id)
 self.services["template_2"]["url"] = builtin_info[0]
 self.services["template_2"]["hypervisor"] = builtin_info[1]
 self.services["template_2"]["format"] = builtin_info[2]
 
 try:
-template = Template.register(self.apiclient,
+template = Template.register(apiclient,
  self.services["template_2"],
  zoneid=self.zone.id,
  account=self.account.name,
  domainid=self.account.domainid,
  hypervisor=self.hypervisor)
 
-template.download(self.apiclient)
+template.download(apiclient)
 except Exception as e:
 self.fail("Failed to register template: %s" % e)
 
-templates = Template.list(self.apiclient,
+templates = Template.list(apiclient,
   templatefilter=\
   
self.services["template_2"]["templatefilter"],
   id=template.id)
@@ -170,19 +174,19 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 templateSize = (templates[0].size / (1024**3))
 expectedCount = templateSize
 response = matchResourceCount(
-self.apiclient, expectedCount,
+apiclient, expectedCount,
 RESOURCE_SECONDARY_STORAGE,
 accountid=self.account.id)
 self.assertEqual(response[0], PASS, response[1])
 
 try:
-template.delete(self.apiclient)
+template.delete(apiclient)
 except Exception as e:
 self.fail("Failed to delete template: %s" % e)
 
 expectedCount = 0
 response = matchResourceCount(
-self.apiclient, expectedCount,
+apiclient, expectedCount,
 RESOURCE_SECONDARY_STORAGE,
 accountid=self.account.id)
 self.assertEqual(response[0], PASS, response[1])

[06/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

bug-id:CLOUDSTACK-8055cleaned up test tags, removed unecessary tags.

reviewed-by: SrikanteswaraRao Talluri 

Signed-off-by: SrikanteswaraRao Talluri 
(cherry picked from commit b6bac7f67335454b6146ebf56b1c6a47842107c1)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: cc3157130759909487aad17e6467b309cdebf132
Parents: e6620b1
Author: SrikanteswaraRao Talluri 
Authored: Wed Dec 17 18:50:39 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:23:15 2015 +0530

--
 test/integration/component/test_portable_ip.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc315713/test/integration/component/test_portable_ip.py
--
diff --git a/test/integration/component/test_portable_ip.py 
b/test/integration/component/test_portable_ip.py
index 83ef6b5..32e7b75 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -407,7 +407,7 @@ class TestListPortablePublicIpRanges(cloudstackTestCase):
  "Listed netmask not matching with the netmask of 
created public ip range")
 return
 
-@attr(tags=["advanced","swamy"], required_hardware="false")
+@attr(tags=["advanced"], required_hardware="false")
 def test_list_portable_ip_range_non_root_admin(self):
 """Test list portable ip ranges with non admin root account
 """
@@ -1288,7 +1288,7 @@ class 
TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
 raise Exception("Warning: Exception during cleanup : %s" % e)
 return
 
-@attr(tags=["advanced","swamy"], required_hardware="true")
+@attr(tags=["advanced"], required_hardware="true")
 def test_list_portable_ip_range_non_root_admin(self):
 """Test list portable ip ranges with non admin root account
 """

[08/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8007: Fixed the script 'test_vm_passwdenabled.py' - Template created 
by Admin should have public access to be used for regular User VM Deployment

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

Conflicts:
test/integration/component/test_vm_passwdenabled.py


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

Branch: refs/heads/4.5
Commit: 535c037428b038d0d4b5e80e4c4a0e1c5d24d6b7
Parents: 37cdb4e
Author: Chandan Purushothama 
Authored: Tue Dec 2 14:37:11 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:28:57 2015 +0530

--
 test/integration/component/test_vm_passwdenabled.py | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/535c0374/test/integration/component/test_vm_passwdenabled.py
--
diff --git a/test/integration/component/test_vm_passwdenabled.py 
b/test/integration/component/test_vm_passwdenabled.py
index 64e549b..77d3013 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -221,8 +221,6 @@ class TestVMPasswordEnabled(cloudstackTestCase):
 cls.api_client,
 cls.services["template"],
 cls.volume.id,
-account=cls.account.name,
-domainid=cls.account.domainid
 )
 # Delete the VM - No longer needed
 cls.virtual_machine.delete(cls.api_client, expunge=True)

[10/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

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

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


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

Branch: refs/heads/4.5
Commit: 3cb4358270497d4db22d19647a4c2820ed544f04
Parents: 1b7a100
Author: amoghvk 
Authored: Wed Nov 26 15:08:48 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:31:05 2015 +0530

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


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

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

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

[01/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 f702097b3 -> 30598e958


CLOUDSTACK-8152: Adding delay before creating snapshot/template from root disk 
after writing data to disk - test_vm_passwordenabled.py

Signed-off-by: SrikanteswaraRao Talluri 
(cherry picked from commit d79837b67a481e618c8291152a9ecec299ff02dd)
Signed-off-by: Rohit Yadav 

Conflicts:
test/integration/component/test_vm_passwdenabled.py


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

Branch: refs/heads/4.5
Commit: fc502a97c2a80c57bcee9084a4247d20b439f295
Parents: f702097
Author: Gaurav Aradhye 
Authored: Tue Jan 13 13:56:41 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:16:26 2015 +0530

--
 .../component/test_vm_passwdenabled.py  | 98 
 1 file changed, 60 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc502a97/test/integration/component/test_vm_passwdenabled.py
--
diff --git a/test/integration/component/test_vm_passwdenabled.py 
b/test/integration/component/test_vm_passwdenabled.py
index 1b556da..64e549b 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -14,24 +14,33 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (Account,
+ ServiceOffering,
+ VirtualMachine,
+ EgressFireWallRule,
+ Template)
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template,
+   list_virtual_machines,
+   list_volumes)
 from nose.plugins.attrib import attr
+import time
 
 
 _multiprocess_shared_ = True
+
+
 class Services:
+
 """Test VM Life Cycle Services
 """
 
 def __init__(self):
 self.services = {
-"disk_offering":{
+"disk_offering": {
 "displaytext": "Small",
 "name": "Small",
 "disksize": 1
@@ -44,26 +53,26 @@ class Services:
 # Random characters are appended in create account to
 # ensure unique username generated each time
 "password": "password",
-},
+},
 "small":
 # Create a small virtual machine instance with disk offering
 {
 "displayname": "testserver",
-"username": "root", # VM creds for SSH
+"username": "root",  # VM creds for SSH
 "password": "password",
 "ssh_port": 22,
 "hypervisor": 'XenServer',
 "privateport": 22,
 "publicport": 22,
 "protocol": 'TCP',
-},
+},
 "egress": {
 "name": 'web',
 "protocol": 'TCP',
 "startport": 80,
 "endport": 80,
 "cidrlist": '0.0.0.0/0',
-},
+},
 "service_offerings":
 {
 "small":
@@ -75,19 +84,20 @@ class Services:
 "cpunumber": 1,
 "cpuspeed": 100,
 "memory": 256,
-},
-},
+},
+},
 "template": {
 "displaytext": "Cent OS Template",
 "name": "Cent OS Template",
 "passwordenabled": True,
-},
+},
 "sleep": 60,
 "timeout": 10,
 "ostype": 'CentOS 5.3 (64-bit)',
 # CentOS 5.3 (64-bit)
 }
 
+
 class TestVMPasswordEnabled(cloudstackTestCase):
 
 @classmethod
@@ -132,33 +142,39 @@ class TestVMPasswordEnabled(cloudstackTestCase):
 
 networkid = cls.virtual_machine.nic[0].networkid
 
-# create egress rule to a

[05/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8056: EN: Miss SC and UK keyboard option for VMware hypervisor when 
register a template.

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


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

Branch: refs/heads/4.5
Commit: e6620b12e36a4dc95629435e77970d91727fd929
Parents: 899bb8b
Author: Sanjay Tripathi 
Authored: Wed Dec 10 14:16:48 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:22:42 2015 +0530

--
 ui/scripts/templates.js | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6620b12/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index b95bb7d..1cb613b 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -325,11 +325,19 @@
 });
 items.push({
 id: "us",
-description: "US"
+description: "US Keboard"
+});
+items.push({
+id: "uk",
+description: "UK Keyboard"
 });
 items.push({
 id: "jp",
-description: "Japanese"
+description: "Japanese 
Keyboard"
+});
+items.push({
+id: "sc",
+description: "Simplified 
Chinese"
 });
 args.response.success({
 data: items

[11/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

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

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

Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java


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

Branch: refs/heads/4.5
Commit: 57f5d51a11e3b147432f88bcd2ba144bb9e6cdf7
Parents: 3cb4358
Author: amoghvk 
Authored: Wed Nov 26 14:54:42 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:36:11 2015 +0530

--
 .../com/cloud/configuration/ConfigurationManagerImpl.java | 10 ++
 1 file changed, 10 insertions(+)
--


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

[09/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-7996: Fixed the script test_tags.py - Tags and Template should 
belong to the User Account to test the case

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


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

Branch: refs/heads/4.5
Commit: 1b7a10068877c7bcd997029c5ef3ba8884d49f18
Parents: 535c037
Author: Chandan Purushothama 
Authored: Mon Dec 1 14:33:29 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:29:41 2015 +0530

--
 test/integration/component/test_tags.py | 28 +++-
 1 file changed, 15 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b7a1006/test/integration/component/test_tags.py
--
diff --git a/test/integration/component/test_tags.py 
b/test/integration/component/test_tags.py
index 824cf01..2b05fbb 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -212,6 +212,12 @@ class TestResourceTags(cloudstackTestCase):
 cls.services["account"],
 admin=True,
 )
+
+cls.user_api_client = cls.testClient.getUserApiClient(
+UserName=cls.account.name,
+DomainName=cls.account.domain
+)
+
 # Create service offerings, disk offerings etc
 cls.service_offering = ServiceOffering.create(
 cls.api_client,
@@ -943,14 +949,14 @@ class TestResourceTags(cloudstackTestCase):
 try:
 self.debug("Stopping the virtual machine: %s" % self.vm_1.name)
 #Stop virtual machine
-self.vm_1.stop(self.apiclient)
+self.vm_1.stop(self.user_api_client)
 except Exception as e:
 self.fail("Failed to stop VM: %s" % e)
 
 timeout = self.services["timeout"]
 while True:
 list_volume = Volume.list(
-   self.apiclient,
+   self.user_api_client,
virtualmachineid=self.vm_1.id,
type='ROOT',
listall=True
@@ -969,18 +975,18 @@ class TestResourceTags(cloudstackTestCase):
 self.vm_1.name)
 #Create template from volume
 template = Template.create(
-self.apiclient,
+self.user_api_client,
 self.services["template"],
 self.volume.id
 )
 self.cleanup.append(template)
 self.debug("Created the template(%s). Now restarting the userVm: %s" %
 (template.name, self.vm_1.name))
-self.vm_1.start(self.apiclient)
+self.vm_1.start(self.user_api_client)
 
 self.debug("Creating a tag for the template")
 tag = Tag.create(
- self.apiclient,
+ self.user_api_client,
  resourceIds=template.id,
  resourceType='Template',
  tags={'OS': 'CentOS'}
@@ -988,11 +994,9 @@ class TestResourceTags(cloudstackTestCase):
 self.debug("Tag created: %s" % tag.__dict__)
 
 tags = Tag.list(
-self.apiclient,
+self.user_api_client,
 listall=True,
 resourceType='Template',
-account=self.account.name,
-domainid=self.account.domainid,
 key='OS',
 value='CentOS'
 )
@@ -1008,7 +1012,7 @@ class TestResourceTags(cloudstackTestCase):
  )
 
 Template.list(
-  self.apiclient,
+  self.user_api_client,
   templatefilter=\
   self.services["template"]["templatefilter"],
   listall=True,
@@ -1019,7 +1023,7 @@ class TestResourceTags(cloudstackTestCase):
 self.debug("Deleting the created tag..")
 try:
 tag.delete(
-   self.apiclient,
+   self.user_api_client,
resourceIds=template.id,
resourceType='Template',

[04/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8115: Update default ordering of HA investigators
Moved HV specific investigators before PingInvestigator in default ordering

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


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

Branch: refs/heads/4.5
Commit: 899bb8b2e92598228a1432760b02e6dfd5a4c8f0
Parents: 345fd54
Author: Koushik Das 
Authored: Tue Dec 23 16:12:39 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:19:05 2015 +0530

--
 .../META-INF/cloudstack/core/spring-core-registry-core-context.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/899bb8b2/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
--
diff --git 
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml 
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 3263e92..939cffe 100644
--- 
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ 
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -68,7 +68,7 @@
 
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
 
 
+
value="SimpleInvestigator,XenServerInvestigator,KVMInvestigator,HypervInvestigator,VMwareInvestigator,PingInvestigator,ManagementIPSysVMInvestigator"
 />

[03/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8130: Fixed test_escalations_templates.py - Removed test case 
dependency on each other

Signed-off-by: SrikanteswaraRao Talluri 
(cherry picked from commit 17da2e9ce9894b67c32306fb36d02786d34ad0d0)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: 345fd54fc141e6dab48ba2d3c99ea38417d9087f
Parents: 9a75a0c
Author: Ashutosh K 
Authored: Fri Dec 26 12:24:29 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:18:39 2015 +0530

--
 .../component/test_escalations_templates.py | 1001 +-
 1 file changed, 509 insertions(+), 492 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/345fd54f/test/integration/component/test_escalations_templates.py
--
diff --git a/test/integration/component/test_escalations_templates.py 
b/test/integration/component/test_escalations_templates.py
index 3dc24c1..a7787c7 100644
--- a/test/integration/component/test_escalations_templates.py
+++ b/test/integration/component/test_escalations_templates.py
@@ -16,15 +16,23 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.utils import (cleanup_resources,
+  validateList)
+from marvin.lib.base import (Account,
+ Zone,
+ Template,
+ Hypervisor)
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template,
+   list_os_types,
+   get_builtin_template_info)
 from marvin.codes import PASS
 from nose.plugins.attrib import attr
 import time
 
+
 class TestTemplates(cloudstackTestCase):
 
 @classmethod
@@ -36,23 +44,21 @@ class TestTemplates(cloudstackTestCase):
 cls.services = cls.testClient.getParsedTestDataConfig()
 # Get Domain, Zone, Template
 cls.domain = get_domain(cls.api_client)
-cls.zone = get_zone(cls.api_client, 
cls.testClient.getZoneForTests())
+cls.zone = get_zone(
+cls.api_client,
+cls.testClient.getZoneForTests())
 cls.template = get_template(
-cls.api_client,
-cls.zone.id,
-cls.services["ostype"]
-)
+cls.api_client,
+cls.zone.id,
+cls.services["ostype"]
+)
 cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
-cls.account = Account.create(
-cls.api_client,
-cls.services["account"],
-domainid=cls.domain.id
-)
-# Getting authentication for user in newly created Account
-cls.user = cls.account.user[0]
-cls.userapiclient = 
cls.testClient.getUserApiClient(cls.user.username, cls.domain.name)
-cls._cleanup.append(cls.account)
+
+builtin_info = get_builtin_template_info(cls.api_client, 
cls.zone.id)
+cls.services["privatetemplate"]["url"] = builtin_info[0]
+cls.services["privatetemplate"]["hypervisor"] = builtin_info[1]
+cls.services["privatetemplate"]["format"] = builtin_info[2]
 except Exception as e:
 cls.tearDownClass()
 raise Exception("Warning: Exception in setup : %s" % e)
@@ -62,6 +68,17 @@ class TestTemplates(cloudstackTestCase):
 
 self.apiClient = self.testClient.getApiClient()
 self.cleanup = []
+self.account = Account.create(
+self.apiClient,
+self.services["account"],
+domainid=self.domain.id
+)
+# Getting authentication for user in newly created Account
+self.user = self.account.user[0]
+self.userapiclient = self.testClient.getUserApiClient(
+self.user.username,
+self.domain.name)
+self.cleanup.append(self.account)
 
 def tearDown(self):
 # Clean up, terminate the created resources
@@ -102,10 +119,9 @@ class TestTemplates(cloudstack

[12/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

setup/db: Fix database blunders

- Make schema-442to450.sql same as on master branch
- Make schema-430to440.sql same as on 4.4 branch

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: 30598e958bf50b9c5d3742a6f36553b1f825c598
Parents: 57f5d51
Author: Rohit Yadav 
Authored: Tue Jan 20 11:21:10 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:24:20 2015 +0530

--
 setup/db/db/schema-430to440.sql |  7 ---
 setup/db/db/schema-442to450.sql | 19 +--
 2 files changed, 17 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30598e95/setup/db/db/schema-430to440.sql
--
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 0943518..ec10a3a 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -686,13 +686,6 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` 
(hypervisor_type, guest_os_name
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, 
guest_os_name, guest_os_id) VALUES  ("VmWare", 'CentOS 6.5 (64-bit)', 228);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, 
guest_os_name, guest_os_id) VALUES  ("XenServer", 'CentOS 6.5 (64-bit)', 228);
 
-CREATE TABLE `cloud`.`baremetal_rct` (
-  `id` bigint unsigned UNIQUE AUTO_INCREMENT,
-  `uuid` varchar(40) UNIQUE NOT NULL,
-  `url` varchar(2048) NOT NULL,
-  `rct` text NOT NULL,
-   PRIMARY KEY (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `cloud`.`op_router_monitoring_services` (
   `vm_id` bigint unsigned UNIQUE NOT NULL COMMENT 'Primary Key',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30598e95/setup/db/db/schema-442to450.sql
--
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index b268eca..9498481 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -770,6 +770,8 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, 
category_id, display_name, crea
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (247, UUID(), 3, 'Oracle Linux 7', utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (248, UUID(), 1, 'CentOS 6 (32-bit)', utc_timestamp());
 INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (249, UUID(), 1, 'CentOS 6 (64-bit)', utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (250, UUID(), 3, 'Oracle Enterprise Linux 6.5 (32-bit)', 
utc_timestamp());
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, 
created) VALUES (251, UUID(), 3, 'Oracle Enterprise Linux 6.5 (64-bit)', 
utc_timestamp());
 
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.5 (32-bit)', 1, utc_timestamp(), 
0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'CentOS 4.6 (32-bit)', 2, utc_timestamp(), 
0);
@@ -852,6 +854,8 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` 
(uuid,hypervisor_type, hypervis
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (64-bit)', 220, 
utc_timestamp(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (32-bit)', 235, 
utc_timestamp(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (64-bit)', 236, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'Xenserver', '6.5.0', 'Oracle Enterprise Linux 6 (32-bit)', 250, 
utc_timestamp(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest

[07/12] git commit: updated refs/heads/4.5 to 30598e9

2015-01-19 Thread bhaisaab

CLOUDSTACK-8054: No event generated on host maintenance mode is completed
Added events for host maintenance start and completion

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


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

Branch: refs/heads/4.5
Commit: 37cdb4eccacca005bc8a301921da96bec2f0838d
Parents: cc31571
Author: Koushik Das 
Authored: Wed Dec 10 10:18:34 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 10:23:37 2015 +0530

--
 server/src/com/cloud/resource/ResourceManagerImpl.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37cdb4ec/server/src/com/cloud/resource/ResourceManagerImpl.java
--
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java 
b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 77f6041..5a1b8ce 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -31,6 +31,7 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import com.cloud.vm.VirtualMachine;
+
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
@@ -93,7 +94,9 @@ import com.cloud.dc.dao.HostPodDao;
 import com.cloud.deploy.PlannerHostReservationVO;
 import com.cloud.deploy.dao.PlannerHostReservationDao;
 import com.cloud.event.ActionEvent;
+import com.cloud.event.ActionEventUtils;
 import com.cloud.event.EventTypes;
+import com.cloud.event.EventVO;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InvalidParameterValueException;
@@ -1188,6 +1191,7 @@ public class ResourceManagerImpl extends ManagerBase 
implements ResourceManager,
 throw new CloudRuntimeException(err + e.getMessage());
 }
 
+
ActionEventUtils.onStartedActionEvent(CallContext.current().getCallingUserId(), 
CallContext.current().getCallingAccountId(), 
EventTypes.EVENT_MAINTENANCE_PREPARE, "starting maintenance for host " + 
hostId, true, 0);
 _agentMgr.pullAgentToMaintenance(hostId);
 
 /* TODO: move below to listener */
@@ -1270,6 +1274,7 @@ public class ResourceManagerImpl extends ManagerBase 
implements ResourceManager,
 if (vos.isEmpty() && vosMigrating.isEmpty()) {
 resourceStateTransitTo(host, 
ResourceState.Event.InternalEnterMaintenance, _nodeId);
 hostInMaintenance = true;
+
ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(),
 CallContext.current().getCallingAccountId(), EventVO.LEVEL_INFO, 
EventTypes.EVENT_MAINTENANCE_PREPARE, "completed maintenance for host " + 
hostId, 0);
 }
 }
 } catch (NoTransitionException e) {

[07/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7950: AttachIsoCmd shoud give correct messge when trying to attach 
vmwaretools installer iso on non supported guestvm deployed by ISO

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


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

Branch: refs/heads/4.5
Commit: dca38d3fa87b99b603f98be3ee38a702efc7ed28
Parents: b5ef7de
Author: Saksham Srivastava 
Authored: Tue Nov 18 15:16:37 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:31:33 2015 +0530

--
 .../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dca38d3f/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
 
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 1933649..7578261 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1452,10 +1452,12 @@ public class VmwareStorageProcessor implements 
StorageProcessor {
 
 if (isAttach) {
 String msg = "AttachIsoCommand(attach) failed due to " + 
VmwareHelper.getExceptionMessage(e);
+msg = msg + " Also check if your guest os is a supported 
version";
 s_logger.error(msg, e);
 return new AttachAnswer(msg);
 } else {
 String msg = "AttachIsoCommand(detach) failed due to " + 
VmwareHelper.getExceptionMessage(e);
+msg = msg + " Also check if your guest os is a supported 
version";
 s_logger.warn(msg, e);
 return new AttachAnswer(msg);
 }

[10/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to not connect, 
fix it and also make sure that template/volume sync are robust that exceptions 
do not cause ssvm agent disconnect issues.

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

Conflicts:

engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java


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

Branch: refs/heads/4.5
Commit: 1aeaf4dcc9b0c34f6ed98f90dc7d059bf9cf05e2
Parents: 8790b84
Author: Nitin Mehta 
Authored: Fri Nov 14 16:19:10 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:39:34 2015 +0530

--
 .../storage/datastore/db/VolumeDataStoreDao.java|  2 ++
 .../storage/image/db/VolumeDataStoreDaoImpl.java| 16 
 .../storage/volume/VolumeServiceImpl.java   |  3 ++-
 .../cloud/storage/download/DownloadListener.java| 12 
 4 files changed, 28 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1aeaf4dc/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
index 625cc29..a056152 100644
--- 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
+++ 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java
@@ -46,4 +46,6 @@ public interface VolumeDataStoreDao extends 
GenericDao,
 List listVolumeDownloadUrls();
 
 void expireDnldUrlsForZone(Long dcId);
+
+List listUploadedVolumesByStoreId(long id);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1aeaf4dc/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
--
diff --git 
a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
 
b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
index 2e29ad7..b71eb2c 100644
--- 
a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
+++ 
b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java
@@ -52,6 +52,7 @@ public class VolumeDataStoreDaoImpl extends 
GenericDaoBase cacheSearch;
 private SearchBuilder storeVolumeSearch;
 private SearchBuilder downloadVolumeSearch;
+private SearchBuilder uploadVolumeSearch;
 private static final String EXPIRE_DOWNLOAD_URLS_FOR_ZONE = "update 
volume_store_ref set download_url_created=? where store_id in (select id from 
image_store where data_center_id=?)";
 
 
@@ -95,6 +96,12 @@ public class VolumeDataStoreDaoImpl extends 
GenericDaoBase listUploadedVolumesByStoreId(long id) {
+SearchCriteria sc = uploadVolumeSearch.create();
+sc.setParameters("store_id", id);
+sc.setParameters("destroyed", false);
+return listIncludingRemovedBy(sc);
+}
+
+
+@Override
 public void expireDnldUrlsForZone(Long dcId){
 TransactionLegacy txn = TransactionLegacy.currentTxn();
 PreparedStatement pstmt = null;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1aeaf4dc/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 6a66ea3..88f098c 100644
--- 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -26,6 +26,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.RegisterVolumePayload;
 import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
 import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
@@ -1382,7 +1383,7 @@ public class VolumeServiceImpl implements VolumeService {
 return;
 }
 
-List dbVolumes = 
_volumeStoreDao.listByStoreId(storeId);
+List dbVolumes = 
_volumeStoreDao.listUplo

[05/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7956: Fixed the script 'test_project_usage.py' - Register Template 
in the Project to test the Template limits on the project

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


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

Branch: refs/heads/4.5
Commit: d1d288522de08fe014e91ed8744e38c96e3b0ed1
Parents: 6e5b9da
Author: Chandan Purushothama 
Authored: Thu Nov 20 13:45:35 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:30:49 2015 +0530

--
 .../integration/component/test_project_usage.py | 79 +---
 1 file changed, 67 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1d28852/test/integration/component/test_project_usage.py
--
diff --git a/test/integration/component/test_project_usage.py 
b/test/integration/component/test_project_usage.py
index 2627504..29d381a 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -39,7 +39,9 @@ from marvin.lib.base import (Project,
 from marvin.lib.common import (get_domain,
get_zone,
get_template,
-   list_volumes)
+   list_volumes,
+   get_builtin_template_info)
+import time
 
 class Services:
 """Test Snapshots Services
@@ -784,23 +786,76 @@ class TestTemplateUsage(cloudstackTestCase):
 """
 # Validate the following
 # 1. Create a account
-# 2. Upload a template from this account. template.create event is
+# 2. Register template in the project. template.create event is
 #recorded in cloud.usage_event table for this account
 # 3. Delete the template. template.delete event is recorded in
 #cloud.usage_event tables for this account
 # 4. Destroy the account
 
-#Create template from Virtual machine and Volume ID
-self.template = Template.create(
-self.userapiclient,
-self.services["templates"],
-self.volume.id,
-projectid=self.project.id
-)
-self.debug("Created template with ID: %s" % self.template.id)
+# Register the First Template in the project
+self.debug("Register a Template in the project")
+builtin_info = get_builtin_template_info(self.apiclient, self.zone.id)
+self.services["templates"]["url"] = builtin_info[0]
+self.services["templates"]["hypervisor"] = builtin_info[1]
+self.services["templates"]["format"] = builtin_info[2]
+
+# Register new template
+template = Template.register(
+self.userapiclient,
+self.services["templates"],
+zoneid=self.zone.id,
+projectid=self.project.id
+)
+self.debug(
+"Registered a template of format: %s with ID: %s" % (
+
self.services["templates"]["format"],
+template.id
+))
+
+# Wait for template status to be changed across
+time.sleep(self.services["sleep"])
+timeout = self.services["timeout"]
+while True:
+list_template_response = Template.list(
+self.apiclient,
+templatefilter='all',
+id=template.id,
+zoneid=self.zone.id,
+projectid=self.project.id,
+)
+if list_template_response[0].isready is True:
+break
+elif timeout == 0:
+raise Exception("Template state is not ready, it is %s" % 
list_template_response[0].isready)
+
+time.sleep(self.services["sleep"])
+timeout = timeout - 1
+
+#Verify template response to check whether template added successfully
+self.assertEqual(
+isinstance(list_template_response, l

[04/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7962: Change state to Volume State

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


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

Branch: refs/heads/4.5
Commit: 6e5b9da7d48919496929a8da2f7f1ebd897156f7
Parents: f88a34d
Author: Saksham Srivastava 
Authored: Mon Nov 24 12:08:58 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:30:05 2015 +0530

--
 server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e5b9da7/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java 
b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 0268727..b49db9b 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -61,6 +61,7 @@ import 
com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.SnapshotVO;
+import com.cloud.storage.Volume;
 import com.cloud.storage.Volume.Type;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.GuestOSDao;
@@ -420,7 +421,7 @@ public class VMSnapshotManagerImpl extends ManagerBase 
implements VMSnapshotMana
 }
 
 VolumeVO rootVolume = volumeVos.get(0);
-if(!rootVolume.getState().equals(State.Running)) {
+if(!rootVolume.getState().equals(Volume.State.Ready)) {
 throw new CloudRuntimeException("Create vm to snapshot failed due 
to vm: " + vmId + " has root disk in " + rootVolume.getState() + " state");
 }

[09/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7940: Exception printed completely on the UI. Not in a readable 
format.

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


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

Branch: refs/heads/4.5
Commit: 8790b84b20dcf347459b5a69cb338a2f65af1414
Parents: 6715c6c
Author: Sanjay Tripathi 
Authored: Wed Nov 19 15:57:13 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:34:48 2015 +0530

--
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java   | 2 +-
 .../cloudstack/engine/orchestration/VolumeOrchestrator.java   | 2 +-
 .../hypervisor/xenserver/resource/CitrixResourceBase.java | 7 +++
 .../storage/motion/XenServerStorageMotionStrategy.java| 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8790b84b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index b992ed9..0051cff 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1919,7 +1919,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 Answer ma = _agentMgr.send(vm.getLastHostId(), mc);
 if (ma == null || !ma.getResult()) {
 String details = (ma != null) ? ma.getDetails() : "null 
answer returned";
-throw new CloudRuntimeException("Unable to migrate due to 
" + details);
+throw new CloudRuntimeException(details);
 }
 } catch (OperationTimedoutException e) {
 if (e.isActive()) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8790b84b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 0895e84..fd4883b 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -988,7 +988,7 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 CommandResult result = future.get();
 if (result.isFailed()) {
 s_logger.debug("Failed to migrated vm " + vm + " along with 
its volumes. " + result.getResult());
-throw new CloudRuntimeException("Failed to migrated vm " + vm 
+ " along with its volumes. " + result.getResult());
+throw new CloudRuntimeException("Failed to migrated vm " + vm 
+ " along with its volumes. ");
 }
 } catch (InterruptedException e) {
 s_logger.debug("Failed to migrated vm " + vm + " along with its 
volumes.", e);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8790b84b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index b4e5cbc..ee4e3d5 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -2956,9 +2956,8 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 }
 return new MigrateAnswer(cmd, true, "migration succeeded", null);
 } catch (Exception e) {
-String msg = "Catch Exception " + e.getClass().getName() + ": 
Migration failed due to " + e.toString();
-s_logger.warn(msg, e);
-return new MigrateAnswer(cmd, false, msg, null);
+s_logger.warn(e.getMessage(), e);
+return new MigrateAnswer(cmd, false, e.getMessage(), null);
 }
 
 }
@@ -3363,7 +3362,7 @@ public abstract class CitrixResourceBase imp

[02/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7964: listAccounts API is not listing correct value of resource 
limits.

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


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

Branch: refs/heads/4.5
Commit: b77cbea0f35b2bcdbbd41f742032207c4aefbf1b
Parents: bc4dca7
Author: Sanjay Tripathi 
Authored: Mon Nov 24 13:37:18 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:29:34 2015 +0530

--
 server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b77cbea0/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java 
b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
index 31d5a2c..fadaed5 100755
--- a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java
@@ -75,7 +75,7 @@ public class AccountJoinDaoImpl extends 
GenericDaoBase impl
 accountResponse.setBytesReceived(account.getBytesReceived());
 accountResponse.setBytesSent(account.getBytesSent());
 
-boolean fullView = (view == ResponseView.Full);
+boolean fullView = (view == ResponseView.Full && 
_acctMgr.isRootAdmin(account.getId()));
 setResourceLimits(account, fullView, accountResponse);
 
 //get resource limits for projects

[03/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also

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


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

Branch: refs/heads/4.5
Commit: f88a34dabe1f3a18cd508e31fdc1da8077866a27
Parents: b77cbea
Author: Saksham Srivastava 
Authored: Fri Nov 21 17:28:06 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:29:59 2015 +0530

--
 .../com/cloud/vm/snapshot/VMSnapshotManagerImpl.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f88a34da/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java 
b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index e7df088..0268727 100644
--- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -29,7 +29,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd;
 import org.apache.cloudstack.context.CallContext;
 import 
org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory;
@@ -62,6 +61,7 @@ import 
com.cloud.projects.Project.ListProjectResourcesCriteria;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.Snapshot;
 import com.cloud.storage.SnapshotVO;
+import com.cloud.storage.Volume.Type;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.storage.dao.SnapshotDao;
@@ -413,6 +413,17 @@ public class VMSnapshotManagerImpl extends ManagerBase 
implements VMSnapshotMana
 if (userVm == null) {
 throw new InvalidParameterValueException("Create vm to snapshot 
failed due to vm: " + vmId + " is not found");
 }
+
+List volumeVos = _volumeDao.findByInstanceAndType(vmId, 
Type.ROOT);
+if(volumeVos == null ||volumeVos.isEmpty()) {
+throw new CloudRuntimeException("Create vm to snapshot failed due 
to no root disk found");
+}
+
+VolumeVO rootVolume = volumeVos.get(0);
+if(!rootVolume.getState().equals(State.Running)) {
+throw new CloudRuntimeException("Create vm to snapshot failed due 
to vm: " + vmId + " has root disk in " + rootVolume.getState() + " state");
+}
+
 VMSnapshotVO vmSnapshot = _vmSnapshotDao.findById(vmSnapshotId);
 if (vmSnapshot == null) {
 throw new CloudRuntimeException("VM snapshot id: " + vmSnapshotId 
+ " can not be found");

[12/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

engine: remove redundant import

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/4.5
Commit: 4e01d61f87104ba877a8c7059ed484cda963f372
Parents: ff70ef7
Author: Rohit Yadav 
Authored: Tue Jan 20 11:45:34 2015 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:45:34 2015 +0530

--
 .../src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e01d61f/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 1dd2a86..b17031c 100644
--- 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -26,7 +26,6 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import com.cloud.storage.RegisterVolumePayload;
 import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity;
 import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;

[08/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a 
ReverseProxy is there

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


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

Branch: refs/heads/4.5
Commit: 6715c6ccfa68b53a3891f49ec98b568511c9cfb9
Parents: dca38d3
Author: Saksham Srivastava 
Authored: Mon Nov 17 16:28:49 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:32:09 2015 +0530

--
 server/src/com/cloud/api/ApiServlet.java | 94 +--
 1 file changed, 73 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6715c6cc/server/src/com/cloud/api/ApiServlet.java
--
diff --git a/server/src/com/cloud/api/ApiServlet.java 
b/server/src/com/cloud/api/ApiServlet.java
index c7d0609..3d2e843 100644
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -16,35 +16,38 @@
 // under the License.
 package com.cloud.api;
 
-import org.apache.cloudstack.api.auth.APIAuthenticationManager;
-import org.apache.cloudstack.api.auth.APIAuthenticationType;
-import org.apache.cloudstack.api.auth.APIAuthenticator;
-import com.cloud.user.Account;
-import com.cloud.user.AccountService;
-import com.cloud.user.User;
-import com.cloud.utils.HttpUtils;
-import com.cloud.utils.StringUtils;
-import com.cloud.utils.db.EntityManager;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiServerService;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.auth.APIAuthenticationManager;
+import org.apache.cloudstack.api.auth.APIAuthenticationType;
+import org.apache.cloudstack.api.auth.APIAuthenticator;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.managed.context.ManagedContext;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
-import javax.inject.Inject;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
+import com.cloud.user.Account;
+import com.cloud.user.AccountService;
+import com.cloud.user.User;
+import com.cloud.utils.HttpUtils;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.net.NetUtils;
 
 @Component("apiServlet")
 @SuppressWarnings("serial")
@@ -120,7 +123,7 @@ public class ApiServlet extends HttpServlet {
 }
 
 void processRequestInContext(final HttpServletRequest req, final 
HttpServletResponse resp) {
-final String remoteAddress = req.getRemoteAddr();
+final String remoteAddress = getClientAddress(req);
 final StringBuilder auditTrailSb = new StringBuilder(128);
 auditTrailSb.append(" ").append(remoteAddress);
 auditTrailSb.append(" -- ").append(req.getMethod()).append(' ');
@@ -304,4 +307,53 @@ public class ApiServlet extends HttpServlet {
 CallContext.unregister();
 }
 }
+
+//This method will try to get login IP of user even if servlet is behind 
reverseProxy or loadBalancer
+private String getClientAddress(HttpServletRequest request) {
+String ip = null;
+ip = request.getHeader("X-Forwarded-For");
+ip = getCorrectIPAddress(ip);
+if (ip != null) {
+return ip;
+}
+
+ip = request.getHeader("HTTP_CLIENT_IP");
+ip = getCorrectIPAddress(ip);
+if (ip != null) {
+return ip;
+}
+
+ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+ip = getCorrectIPAddress(ip);
+if (ip != null) {
+return ip;
+}
+
+ip = request.getHeader("Remote_Addr");
+ip = getCorrectIPAddress(ip);
+if (ip != null) {
+retur

[06/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-7955: Fixed the script test_project_limits.py - Register Template in 
the Project to test the Template limits on the project

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


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

Branch: refs/heads/4.5
Commit: b5ef7de29096bf222685ab29e3e4ae18083eba58
Parents: d1d2885
Author: Chandan Purushothama 
Authored: Thu Nov 20 11:03:23 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:30:59 2015 +0530

--
 .../component/test_project_limits.py| 109 +++
 1 file changed, 61 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5ef7de2/test/integration/component/test_project_limits.py
--
diff --git a/test/integration/component/test_project_limits.py 
b/test/integration/component/test_project_limits.py
index 5d37f0b..d4fb92d 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -42,7 +42,8 @@ from marvin.lib.common import (get_domain,
list_volumes,
list_configurations,
list_resource_limits,
-   update_resource_limit
+   update_resource_limit,
+   get_builtin_template_info
)
 from marvin.codes import PASS
 import time
@@ -109,7 +110,7 @@ class Services:
 "ostype": 'CentOS 5.3 (64-bit)',
 "templatefilter": 'self',
 },
-"network_offering": {
+ "network_offering": {
 "name": 'Network offering-VR services',
 "displaytext": 'Network offering-VR 
services',
 "guestiptype": 'Isolated',
@@ -904,65 +905,77 @@ class TestResourceLimitsProject(cloudstackTestCase):
   max=1,
   projectid=self.project.id
   )
-
-self.debug("Deploying VM for account: %s" % self.account.name)
-virtual_machine_1 = VirtualMachine.create(
-self.apiclient,
-self.services["server"],
-templateid=self.template.id,
-serviceofferingid=self.service_offering.id,
-projectid=self.project.id
-)
-self.cleanup.append(virtual_machine_1)
-# Verify VM state
-self.assertEqual(
-virtual_machine_1.state,
-'Running',
-"Check VM state is Running or not"
-)
-virtual_machine_1.stop(self.apiclient)
-# Get the Root disk of VM
-volumes = list_volumes(
-self.apiclient,
-virtualmachineid=virtual_machine_1.id,
-projectid=self.project.id,
-type='ROOT'
-)
+
+# Register the First Template in the project
+self.debug("Register the First Template in the project")
+builtin_info = get_builtin_template_info(self.apiclient, self.zone.id)
+self.services["template"]["url"] = builtin_info[0]
+self.services["template"]["hypervisor"] = builtin_info[1]
+self.services["template"]["format"] = builtin_info[2]
+
+# Register new template
+template = Template.register(
+self.userapiclient,
+self.services["template"],
+zoneid=self.zone.id,
+projectid=self.project.id
+)
+self.debug(
+"Registered a template of format: %s with ID: %s" % (
+
self.services["template"]["format"],
+template.id
+))
+self.cleanup.append(template)
+
+# Wait for template status to be changed across
+time.sleep(self.services["sleep"

[11/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

CLOUDSTACK-8101: volume sync not working as expected - MS restart during upload 
volume leaves volume in hung state.

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

Conflicts:

engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java


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

Branch: refs/heads/4.5
Commit: ff70ef797caac3cdaa71bb82c360c6b8f2ab83b9
Parents: 1aeaf4d
Author: Min Chen 
Authored: Fri Dec 19 16:48:45 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:43:36 2015 +0530

--
 .../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff70ef79/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
diff --git 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 88f098c..1dd2a86 100644
--- 
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ 
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -1383,7 +1383,8 @@ public class VolumeServiceImpl implements VolumeService {
 return;
 }
 
-List dbVolumes = 
_volumeStoreDao.listUploadedVolumesByStoreId(storeId);
+// find all the db volumes including those with NULL url 
column to avoid accidentally deleting volumes on image store later.
+List dbVolumes = 
_volumeStoreDao.listByStoreId(storeId);
 List toBeDownloaded = new 
ArrayList(dbVolumes);
 for (VolumeDataStoreVO volumeStore : dbVolumes) {
 VolumeVO volume = 
volDao.findById(volumeStore.getVolumeId());

[01/12] git commit: updated refs/heads/4.5 to 4e01d61

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 30598e958 -> 4e01d61f8


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

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


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

Branch: refs/heads/4.5
Commit: bc4dca71c871fa5e57794b9552a18233b7f114fc
Parents: 30598e9
Author: Sanjay Tripathi 
Authored: Wed Nov 26 13:28:25 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:28:08 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc4dca71/ui/index.jsp
--
diff --git a/ui/index.jsp b/ui/index.jsp
index 83d5d54..fc2a742 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -440,6 +440,7 @@
 Standard 
(US) keyboard
 UK 
keyboard
 Japanese 
keyboard
+Simplified 
Chinese keyboard

[8/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7754: Templates source_template_id is null when it is created from 
Snapshot with its corresponding volume removed. Fix it by searching for volumes 
including removed. Also bring the logic of setting source template id to 
create() method than execute which was wrongly put in.

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


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

Branch: refs/heads/4.5
Commit: 31a6517402d2007a4857d3ae9be2da8a697892b1
Parents: a6f9411
Author: Nitin Mehta 
Authored: Tue Oct 21 09:57:02 2014 -0700
Committer: Rohit Yadav 
Committed: Tue Jan 20 12:07:42 2015 +0530

--
 .../com/cloud/template/TemplateManagerImpl.java | 40 +++-
 1 file changed, 6 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31a65174/server/src/com/cloud/template/TemplateManagerImpl.java
--
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java 
b/server/src/com/cloud/template/TemplateManagerImpl.java
index 5641f57..a498dc7 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1412,29 +1412,6 @@ public class TemplateManagerImpl extends ManagerBase 
implements TemplateManager,
 }
 
 privateTemplate = _tmpltDao.findById(templateId);
-if (snapshotId != null) {
-//getting the parent volume
-long parentVolumeId = 
_snapshotDao.findById(snapshotId).getVolumeId();
-//Volume can be removed
-VolumeVO parentVolume = 
_volumeDao.findByIdIncludingRemoved(parentVolumeId);
-
-if (parentVolume != null && parentVolume.getIsoId() != 
null && parentVolume.getIsoId() != 0) {
-
privateTemplate.setSourceTemplateId(parentVolume.getIsoId());
-_tmpltDao.update(privateTemplate.getId(), 
privateTemplate);
-} else if (parentVolume != null && 
parentVolume.getTemplateId() != null) {
-
privateTemplate.setSourceTemplateId(parentVolume.getTemplateId());
-_tmpltDao.update(privateTemplate.getId(), 
privateTemplate);
-}
-} else if (volumeId != null) {
-VolumeVO parentVolume = _volumeDao.findById(volumeId);
-if (parentVolume.getIsoId() != null && 
parentVolume.getIsoId() != 0) {
-
privateTemplate.setSourceTemplateId(parentVolume.getIsoId());
-_tmpltDao.update(privateTemplate.getId(), 
privateTemplate);
-} else if (parentVolume.getTemplateId() != null) {
-
privateTemplate.setSourceTemplateId(parentVolume.getTemplateId());
-_tmpltDao.update(privateTemplate.getId(), 
privateTemplate);
-}
-}
 TemplateDataStoreVO srcTmpltStore = 
_tmplStoreDao.findByStoreTemplate(store.getId(), templateId);
 UsageEventVO usageEvent =
 new UsageEventVO(EventTypes.EVENT_TEMPLATE_CREATE, 
privateTemplate.getAccountId(), zoneId, privateTemplate.getId(), 
privateTemplate.getName(), null,
@@ -1570,8 +1547,8 @@ public class TemplateManagerImpl extends ManagerBase 
implements TemplateManager,
 if (snapshot == null) {
 throw new InvalidParameterValueException("Failed to create 
private template record, unable to find snapshot " + snapshotId);
 }
-
-volume = _volumeDao.findById(snapshot.getVolumeId());
+// Volume could be removed so find including removed to record 
source template id.
+volume = 
_volumeDao.findByIdIncludingRemoved(snapshot.getVolumeId());
 
 // check permissions
 _accountMgr.checkAccess(caller, null, true, snapshot);
@@ -1612,15 +1589,10 @@ public class TemplateManagerImpl extends ManagerBase 
implements TemplateManager,
 if (volume != null) {
 VMTemplateVO template = 
ApiDBUtils.findTemplateById(volume.getTemplateId());
 isExtractable = template != null && template.isExtractable() && 
template.getTemplateType() != Storage.TemplateType.SYSTEM;
-if (template != null) {
-sourceTemplateId = template.getId();
-} else if (volume.getVolumeType() == Volume.Type.ROOT) { // vm
-// created
-// out
-

[6/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7774 Description field is missing in Health policy API's

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


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

Branch: refs/heads/4.5
Commit: 1288d533efe1c49c9dd0dbebee84b275b9f61f78
Parents: 1998217
Author: Rajesh Battala 
Authored: Thu Oct 23 14:14:14 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 12:04:53 2015 +0530

--
 .../apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1288d533/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java 
b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
index 8ce7b3d..df3a7a0 100644
--- 
a/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
+++ 
b/api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java
@@ -101,6 +101,7 @@ public class LBHealthCheckPolicyResponse extends 
BaseResponse {
 this.healthcheckthresshold = 
healthcheckpolicy.getHealthcheckThresshold();
 this.unhealthcheckthresshold = 
healthcheckpolicy.getUnhealthThresshold();
 this.forDisplay = healthcheckpolicy.isDisplay();
+this.description = healthcheckpolicy.getDescription();
 setObjectName("healthcheckpolicy");
 }

[5/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7840: UI control tip for 'Add Primary Storage' -> 'Provider' seems 
wrong

-Removed the invalid help text.

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


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

Branch: refs/heads/4.5
Commit: 1998217f6a4d00d27c88e559bd5889a003b39060
Parents: b3e84ca
Author: Gabor Apati-Nagy 
Authored: Tue Nov 4 18:32:32 2014 +
Committer: Rohit Yadav 
Committed: Tue Jan 20 12:02:07 2015 +0530

--
 ui/scripts/system.js | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1998217f/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index fdaaed4..f55807a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -17010,7 +17010,6 @@
 },
 provider: {
 label: 'label.provider',
-docID: 'helpPrimaryStorageZone',
 validation: {
 required: true
 },

[7/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7771: Throw exception while restoring vm if the template is already 
deleted. Also fix the usage event being generated from the right template id 
and fix the log message which sometime showed incorrect template id.
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take 
virtualmachineid of SystemVM and return service offerings available for the vm 
to change service offering

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


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

Branch: refs/heads/4.5
Commit: a6f9411b1eb46739c9b47fc16ad7796cc0e3d221
Parents: 1288d53
Author: Nitin Mehta 
Authored: Wed Oct 22 15:03:25 2014 -0700
Committer: Rohit Yadav 
Committed: Tue Jan 20 12:05:25 2015 +0530

--
 server/src/com/cloud/api/query/QueryManagerImpl.java |  7 ++-
 server/src/com/cloud/vm/UserVmManagerImpl.java   | 12 ++--
 server/test/com/cloud/vm/UserVmManagerTest.java  |  8 
 3 files changed, 24 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6f9411b/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 a5e7d5c..62714ea 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -27,6 +27,8 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 
 import com.cloud.utils.StringUtils;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -248,6 +250,9 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 private UserVmDao _userVmDao;
 
 @Inject
+private VMInstanceDao _vmInstanceDao;
+
+@Inject
 private SecurityGroupJoinDao _securityGroupJoinDao;
 
 @Inject
@@ -2576,7 +2581,7 @@ public class QueryManagerImpl extends ManagerBase 
implements QueryService {
 }
 
 if (vmId != null) {
-UserVmVO vmInstance = _userVmDao.findById(vmId);
+VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId);
 if ((vmInstance == null) || (vmInstance.getRemoved() != null)) {
 InvalidParameterValueException ex = new 
InvalidParameterValueException("unable to find a virtual machine with specified 
id");
 ex.addProxyObject(vmId.toString(), "vmId");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6f9411b/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 3f539b2..22f2769 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -35,6 +35,8 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
@@ -303,6 +305,8 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 @Inject
 protected VMTemplateZoneDao _templateZoneDao = null;
 @Inject
+protected TemplateDataStoreDao _templateStoreDao;
+@Inject
 protected DomainDao _domainDao = null;
 @Inject
 protected UserVmCloneSettingDao _vmCloneSettingDao = null;
@@ -4762,6 +4766,10 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 throw ex;
 }
 }
+TemplateDataStoreVO tmplStore = 
_templateStoreDao.findByTemplateZoneReady(template.getId(), 
vm.getDataCenterId());
+if (tmplStore == null) {
+throw new InvalidParameterValueException("Cannot restore the 
vm as the template " + template.getUuid() + " isn't available in the zone");
+}
 
 if (needRestart) {
 try {
@@ -4794,7 +4802,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 }
 
 // Create Usage event for

[1/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 4e01d61f8 -> 31a651740


CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.

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


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

Branch: refs/heads/4.5
Commit: a12ab8a2b3a14d2fed2bca287823bb558d0501fb
Parents: 4e01d61
Author: Nitin Mehta 
Authored: Fri Nov 14 13:18:27 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:55:36 2015 +0530

--
 .../cloud/alert/ConsoleProxyAlertAdapter.java   |  12 +-
 .../alert/SecondaryStorageVmAlertAdapter.java   |  11 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |  74 +++--
 .../SecondaryStorageManagerImpl.java| 110 ++-
 4 files changed, 112 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a12ab8a2/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
--
diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java 
b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
index df4f5ba..4ca5f4a 100644
--- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
+++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
@@ -53,7 +53,8 @@ public class ConsoleProxyAlertAdapter extends AdapterBase 
implements AlertAdapte
 
 DataCenterVO dc = _dcDao.findById(args.getZoneId());
 ConsoleProxyVO proxy = args.getProxy();
-if (proxy == null)
+//FIXME - Proxy can be null in case of creation failure. Have a better 
fix than checking for != 0
+if (proxy == null && args.getProxyId() != 0)
 proxy = _consoleProxyDao.findById(args.getProxyId());
 
 switch (args.getType()) {
@@ -98,12 +99,9 @@ public class ConsoleProxyAlertAdapter extends AdapterBase 
implements AlertAdapte
 
 case ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE:
 if (s_logger.isDebugEnabled())
-s_logger.debug("Console proxy creation failure, zone: " + 
dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
-proxy.getPublicIpAddress() + ", private IP: " + 
(proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()));
-
-
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, 
args.getZoneId(), proxy.getPodIdToDeployIn(),
-"Console proxy creation failure. zone: " + dc.getName() + 
", proxy: " + proxy.getHostName() + ", public IP: " + 
proxy.getPublicIpAddress() +
-", private IP: " + (proxy.getPrivateIpAddress() == 
null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + 
args.getMessage(),
+s_logger.debug("Console proxy creation failure, zone: " + 
dc.getName());
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, 
args.getZoneId(), null,
+"Console proxy creation failure. zone: " + dc.getName() + 
", error details: " + args.getMessage(),
 "Console proxy creation failure (zone " + dc.getName() + 
")");
 break;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a12ab8a2/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
--
diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java 
b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
index b7834bb..3bfedce 100644
--- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
+++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
@@ -53,7 +53,7 @@ public class SecondaryStorageVmAlertAdapter extends 
AdapterBase implements Alert
 
 DataCenterVO dc = _dcDao.findById(args.getZoneId());
 SecondaryStorageVmVO secStorageVm = args.getSecStorageVm();
-if (secStorageVm == null)
+if (secStorageVm == null && args.getSecStorageVmId() != 0)
 secStorageVm = _ssvmDao.findById(args.getSecStorageVmId());
 
 switch (args.getType()) {
@@ -103,13 +103,10 @@ public class SecondaryStorageVmAlertAdapter extends 
AdapterBase implements Alert
 
 case SecStorageVmAlertEventArgs.SSVM_CREATE_FAILURE:
 if (s_logger.isDebugEnabled())
-s_logger.debug("Secondary Storage Vm creation failure, 
zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", 
public IP: " +
-secStorageVm.getP

[3/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity table only on 
explicit enabling/disabling of the host and remove the logic for changing it 
when cluster/pod/zone is enabled/disabled. Also add the logic in capacity 
checker thread so that previous  changes finally get consistent with this new 
model and also its good to have it for sanity reasons.

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

Conflicts:
server/src/com/cloud/capacity/CapacityManagerImpl.java


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

Branch: refs/heads/4.5
Commit: be0882b19e16b72cacc1a38b6bb72953b9053c5a
Parents: 665aa6b
Author: Nitin Mehta 
Authored: Thu Nov 13 13:54:45 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:58:04 2015 +0530

--
 .../com/cloud/capacity/CapacityManagerImpl.java | 25 
 .../configuration/ConfigurationManagerImpl.java |  6 ++---
 .../com/cloud/resource/ResourceManagerImpl.java | 15 
 3 files changed, 21 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be0882b1/server/src/com/cloud/capacity/CapacityManagerImpl.java
--
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java 
b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index e5b7d19..5ea7e3e 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -27,6 +27,8 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.resource.ResourceState;
+
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
@@ -49,7 +51,6 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
-import com.cloud.api.ApiDBUtils;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
@@ -67,7 +68,6 @@ import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
 import com.cloud.offering.ServiceOffering;
-import com.cloud.org.Grouping.AllocationState;
 import com.cloud.resource.ResourceListener;
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ServerResource;
@@ -597,6 +597,7 @@ public class CapacityManagerImpl extends ManagerBase 
implements CapacityManager,
 long usedMemory = 0;
 long reservedMemory = 0;
 long reservedCpu = 0;
+final CapacityState capacityState = (host.getResourceState() == 
ResourceState.Enabled) ? CapacityState.Enabled : CapacityState.Disabled;
 
 List vms = _vmDao.listUpByHostId(host.getId());
 if (s_logger.isDebugEnabled()) {
@@ -680,6 +681,12 @@ public class CapacityManagerImpl extends ManagerBase 
implements CapacityManager,
 cpuCap.setTotalCapacity(hostTotalCpu);
 
 }
+// Set the capacity state as per the host allocation state.
+if(capacityState != cpuCap.getCapacityState()){
+s_logger.debug("Calibrate cpu capacity state for host: " + 
host.getId() + " old capacity state:" + cpuCap.getTotalCapacity() + " new 
capacity state:" + hostTotalCpu);
+cpuCap.setCapacityState(capacityState);
+}
+memCap.setCapacityState(capacityState);
 
 if (cpuCap.getUsedCapacity() == usedCpu && 
cpuCap.getReservedCapacity() == reservedCpu) {
 s_logger.debug("No need to calibrate cpu capacity, host:" + 
host.getId() + " usedCpu: " + cpuCap.getUsedCapacity() + " reservedCpu: " +
@@ -702,6 +709,11 @@ public class CapacityManagerImpl extends ManagerBase 
implements CapacityManager,
 memCap.setTotalCapacity(host.getTotalMemory());
 
 }
+// Set the capacity state as per the host allocation state.
+if(capacityState != memCap.getCapacityState()){
+s_logger.debug("Calibrate memory capacity state for host: " + 
host.getId() + " old capacity state:" + cpuCap.getTotalCapacity() + " new 
capacity state:" + hostTotalCpu);
+memCap.setCapacityState(capacityState);
+}
 
 if (memCap.getUsedCapacity() == usedMemory && 
memCap.getReservedCapacity() == reservedMemory) {
 s_logger.debug("No need to calibrate m

[4/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for some  EN- UK 
keyboard keys.

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


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

Branch: refs/heads/4.5
Commit: b3e84cad2d37ef1d266bf49c0367dabe8589ace0
Parents: be0882b
Author: Sanjay Tripathi 
Authored: Thu Nov 13 18:56:29 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:59:32 2015 +0530

--
 systemvm/js/ajaxkeys.js   | 43 +++---
 systemvm/js/ajaxviewer.js |  4 +++-
 2 files changed, 14 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3e84cad/systemvm/js/ajaxkeys.js
--
diff --git a/systemvm/js/ajaxkeys.js b/systemvm/js/ajaxkeys.js
index 26c2996..3053b7d 100644
--- a/systemvm/js/ajaxkeys.js
+++ b/systemvm/js/ajaxkeys.js
@@ -289,47 +289,26 @@ var   keyboardTables = [
 ]
}
}, {tindex: 2, keyboardType: KEYBOARD_TYPE_UK, mappingTable:
- {X11: [
-  //[223 = `Â¬Â¦]
-  {keycode: 223,   entry : 0x60,   
browser: "IE"},
-  ],
+ {X11: [],
   keyPress: [
- //[34 = "]
-  {keycode: 34, entry:
-  [{type : KEY_DOWN, code : 0x40, modifiers : 64, 
shift : true}]
-  },
+  //[34 = "]
+  {keycode: 34,entry: 0x40,
guestos: "windows"},
   //[35 = #]
-  {keycode: 35, entry:
-  [{type : KEY_DOWN, code : 0x5c, modifiers : 0, 
shift : false}]
-  },
+  {keycode: 35,entry: 0x5c,
guestos: "windows"},
   // [64 = @]
-  {keycode: 64, entry:
-  [{type : KEY_DOWN, code : 0x22, modifiers : 64, 
shift : true}]
-  },
+  {keycode: 64,entry: 0x22,
guestos: "windows"},
   // [92 = \]
-  {keycode: 92, entry:
-  [{type : KEY_DOWN, code : 0xa6, modifiers : 0, 
shift : false}]
-  },
+  {keycode: 92,entry: 0xa6,
guestos: "windows"},
   // [124 = |]
-  {keycode: 124, entry:
-  [{type : KEY_DOWN, code : 0xa6, modifiers : 64, 
shift : true}]
-  },
+  {keycode: 124,   entry: 0xa6,guestos: 
"windows"},
   // [126 = ~]
-  {keycode: 126, entry:
-  [{type : KEY_DOWN, code : 0x7c, modifiers : 64, 
shift : true}]
-  },
+  {keycode: 126,   entry: 0x7c,guestos: 
"windows"},
   // [163 = Â£]
-  {keycode: 163, entry:
-  [{type : KEY_DOWN, code : 0x23, modifiers : 64, 
shift : true}]
-  },
+  {keycode: 163,   entry: 0x23,guestos: 
"windows"},
   // [172 = Â¬]
-  {keycode: 172, entry:
-  [{type : KEY_DOWN, code : 0x7e, modifiers : 64, 
shift : true}]
-  },
+  {keycode: 172,   entry: 0x7e,guestos: 
"windows"},
   // [166 = Â¦]
-  {keycode: 166, entry:
-  [{type : KEY_DOWN, code : 0x60, modifiers : 896, 
shift : false}]
-  }
+  {keycode: 166,   entry: [{type : KEY_DOWN, code 
: 0x60, modifiers : 896, shift : false}],guestos: "windows"}
   ]
}
}]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3e84cad/systemvm/js/ajaxviewer.js
--
diff --git a/systemvm/js/ajaxviewer.js b/systemvm/js/ajaxviewer.js
index 123f182..db5ed45 100644
--- a/systemvm/js/ajaxviewer.js
+++ b/systemvm/js/ajaxviewer.js
@@ -761,7 +761,9 @@ AjaxViewer.prototype = {

[2/8] git commit: updated refs/heads/4.5 to 31a6517

2015-01-19 Thread bhaisaab

CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.

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


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

Branch: refs/heads/4.5
Commit: 665aa6b52289306c3085868d0ec2dfe1837bc13e
Parents: a12ab8a
Author: Nitin Mehta 
Authored: Fri Nov 14 13:35:40 2014 -0800
Committer: Rohit Yadav 
Committed: Tue Jan 20 11:55:47 2015 +0530

--
 server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java  | 1 +
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java| 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/665aa6b5/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
--
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index a527160..bb64fa3 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -924,6 +924,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 }
 }catch (Exception e){
errorString = e.getMessage();
+   throw e;
 }finally {
 // TODO - For now put all the alerts as creation failure. 
Distinguish between creation vs start failure in future.
 // Also add failure reason since startvm masks some of them.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/665aa6b5/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
--
diff --git 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 9edd600..cc7eb25 100755
--- 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -722,6 +722,7 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
 }
 }catch (Exception e){
 errorString = e.getMessage();
+throw e;
 }finally{
 // TODO - For now put all the alerts as creation failure. 
Distinguish between creation vs start failure in future.
 // Also add failure reason since startvm masks some of them.

git commit: updated refs/heads/volume-upload to b0a96c4

2015-01-19 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload 15ae33a5b -> b0a96c4c8


volume upload: fixed nio server blocking thread issue


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

Branch: refs/heads/volume-upload
Commit: b0a96c4c85f2d6dfe57ce3474ce95ebb3cec6d2a
Parents: 15ae33a
Author: Rajani Karuturi 
Authored: Tue Jan 20 12:27:26 2015 +0530
Committer: Rajani Karuturi 
Committed: Tue Jan 20 12:27:26 2015 +0530

--
 .../resource/NfsSecondaryStorageResource.java   | 44 
 1 file changed, 26 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0a96c4c/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
--
diff --git 
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
 
b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index cb12dc5..c600135 100755
--- 
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ 
b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -88,6 +88,7 @@ import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
 import org.apache.http.nio.protocol.HttpAsyncService;
 import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
 import org.apache.http.nio.reactor.IOEventDispatch;
+import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.nio.reactor.ListeningIOReactor;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
@@ -1341,13 +1342,18 @@ public class NfsSecondaryStorageResource extends 
ServerResourceBase implements S
 }
 
 savePostUploadPSK(cmd.getPostUploadKey());
-startNioServerForPostUpload();
+try {
+startNioServerForPostUpload();
+} catch (IOException e) {
+//returning TRUE even if this fails as this will only disable post 
upload functionality
+s_logger.error("exception while starting the nio server for post 
upload.", e);
+}
 return answer;
 }
 
-private void startNioServerForPostUpload() {
+private void startNioServerForPostUpload() throws IOException {
 //TODO: make port configurable.
-int port = 8210;
+final int port = 8210;
 // Create HTTP protocol processing chain
 HttpProcessor httpproc = HttpProcessorBuilder.create()
 .add(new ResponseDate())
@@ -1380,7 +1386,7 @@ public class NfsSecondaryStorageResource extends 
ServerResourceBase implements S
 connFactory = new DefaultNHttpServerConnectionFactory(
 ConnectionConfig.DEFAULT);
 // Create server-side I/O event dispatch
-IOEventDispatch ioEventDispatch = new 
DefaultHttpServerIODispatch(protocolHandler, connFactory);
+final IOEventDispatch ioEventDispatch = new 
DefaultHttpServerIODispatch(protocolHandler, connFactory);
 // Set I/O reactor defaults
 IOReactorConfig config = IOReactorConfig.custom()
 .setIoThreadCount(15)
@@ -1388,20 +1394,22 @@ public class NfsSecondaryStorageResource extends 
ServerResourceBase implements S
 .setConnectTimeout(3000)
 .build();
 
-try {
-// Create server-side I/O reactor
-ListeningIOReactor ioReactor = new 
DefaultListeningIOReactor(config);
-
-// Listen of the given port
-ioReactor.listen(new InetSocketAddress(port));
-// Ready to go!
-ioReactor.execute(ioEventDispatch);
-} catch (InterruptedIOException ex) {
-s_logger.info("Interrupted");
-} catch (IOException e) {
-s_logger.info("I/O error: " + e.getMessage());
-}
-s_logger.info("Shutdown");
+// Create server-side I/O reactor
+final ListeningIOReactor ioReactor = new 
DefaultListeningIOReactor(config);
+new Thread() {
+@Override public void run() {
+// Listen of the given port
+ioReactor.listen(new InetSocketAddress(port));
+// Ready to go!
+try {
+ioReactor.execute(ioEventDispatch);
+} catch (IOException e) {
+throw new RuntimeException("Exception while starting the 
post upload server on port: " + port);
+}
+

git commit: updated refs/heads/volume-upload to a31e1bf

2015-01-19 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload b0a96c4c8 -> a31e1bff3


volume upload: fixed build error from the commit 
b0a96c4c85f2d6dfe57ce3474ce95ebb3cec6d2a


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

Branch: refs/heads/volume-upload
Commit: a31e1bfffcfc6b5888b199d04397f7769c38
Parents: b0a96c4
Author: Rajani Karuturi 
Authored: Tue Jan 20 12:44:05 2015 +0530
Committer: Rajani Karuturi 
Committed: Tue Jan 20 12:44:05 2015 +0530

--
 .../cloudstack/storage/resource/NfsSecondaryStorageResource.java   | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a31e1bff/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
--
diff --git 
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
 
b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index c600135..246138d 100755
--- 
a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ 
b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -35,7 +35,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.net.InetAddress;
@@ -88,7 +87,6 @@ import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
 import org.apache.http.nio.protocol.HttpAsyncService;
 import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
 import org.apache.http.nio.reactor.IOEventDispatch;
-import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.nio.reactor.ListeningIOReactor;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;

53 matches

Mail list logo