22069 Commits

Author SHA1 Message Date
Jessica Wang
b090acacfa CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing).
SourceNAT IP, VPC tier IP should not show Configuration tab(firewall/portforwarding/loadbalancing).
2014-01-10 10:49:56 -08:00
Jessica Wang
598628f517 CLOUDSTACK-5840: UI > Snapshots > create volume from snapshot dialog > add zone dropdown if region-wide secondary storage exists. 2014-01-10 10:49:18 -08:00
Jessica Wang
a2b3e3a60d CLOUDSTACK-5840: UI > Secondary Storages > remove "prepareObjectStoreMigration" action (since prepareSecondaryStorageForMigration API has been removed from server-side). 2014-01-10 10:45:19 -08:00
Harikrishna Patnala
5bf78b82c0 CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
2014-01-10 10:26:10 -08:00
Bharat Kumar
7053c222f9 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-01-10 10:01:43 -08:00
Murali Reddy
be49a2fa6d CLOUDSTACK-5647 Adding F5 device to network service provider fails with
NoClassDefFoundError

adding back missing (removed from 4.3) dependency 'commons-discovery'
2014-01-10 22:05:22 +05:30
Kishan Kavala
9486a9652e CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
SrikanteswaraRao Talluri
c98ac9aae0 CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype
2014-01-10 19:56:38 +05:30
Devdeep Singh
641f85cf6f CLOUDSTACK-5657: Run the service as an account (hyper-v admin on host) so
that migration can work across hosts.
2014-01-10 17:08:01 +05:30
Devdeep Singh
db2b025608 CLOUDSTACK-5639: If path field in the TO already has the complete path, do
not try to generate the path.
2014-01-10 16:37:43 +05:30
Mike Tutkowski
68fda5a8dd Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 23:36:36 -07:00
Mike Tutkowski
a354d969ce Merge from 4.3: CLOUDSTACK-5823: Taking a VMware snapshot doesn't work 2014-01-09 23:10:40 -07:00
Mike Tutkowski
929838c8eb Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:42:14 -07:00
Mike Tutkowski
7ef78aac40 Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:37:39 -07:00
Mike Tutkowski
6944bf9bba Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:02:43 -07:00
Mike Tutkowski
ae35782ccd Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 21:36:34 -07:00
Alex Huang
bc1eec9f70 Fixed a missing package name 2014-01-09 16:48:19 -08:00
Alex Huang
5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang
ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Min Chen
64b8d1044d CLOUDSTACK-5819:extractTemplate fails with Vmware host on migration of
NFS to S3.
2014-01-09 15:08:23 -08:00
Mike Tutkowski
8b6e89c012 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:44:02 -07:00
Kelven Yang
1e2e1ea051 CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-09 14:29:13 -08:00
Kelven Yang
a05d71a80c CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow 2014-01-09 14:29:13 -08:00
Kelven Yang
0965adb003 CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic 2014-01-09 14:29:12 -08:00
Kelven Yang
87381d4236 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-09 14:29:12 -08:00
Kelven Yang
ad6454d2bf CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic. 2014-01-09 14:29:12 -08:00
Kelven Yang
69f49839d3 CLOUDSTACK-5726: Using runtime discovered dao (in AsyncJobManagerImpl.submitAsyncJob) to persist record has a problem to locate the right DAO instance, it causes corrupted field value be stored in database. Put in a work-around fix first to always initialize record fields in all cases 2014-01-09 14:29:12 -08:00
Kelven Yang
832c8e4728 CLOUDSTACK-5669: Always retrieve the most recent job result in OutComeImpl 2014-01-09 14:29:12 -08:00
Kelven Yang
737a382c38 Fix a typo caused problem in attach-volume process 2014-01-09 14:29:12 -08:00
Kelven Yang
ac0faeb091 Fix auto-merge caused issues 2014-01-09 14:29:12 -08:00
Kelven Yang
0587382265 CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement 2014-01-09 14:29:12 -08:00
Kelven Yang
a6f126d24e Fix a style-check problem after cherry-pick 2014-01-09 14:29:12 -08:00
Kelven Yang
8c93bd6080 CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Kelven Yang
bf9a554522 CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Mike Tutkowski
a298f6fce9 Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional 2014-01-09 15:16:18 -07:00
Mike Tutkowski
caf87ac5d9 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:06:25 -07:00
Mike Tutkowski
03118c2969 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 14:44:35 -07:00
Brian Federle
09da5153df Update infrastructure 'socket' icon 2014-01-09 10:51:32 -08:00
Min Chen
c69a412c43 Remove old prepareSecondaryStorageForMigration from gen_toc.py. 2014-01-09 10:12:22 -08:00
Kishan Kavala
0e315f16c0 CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. 2014-01-09 22:01:59 +05:30
Hugo Trippaers
7c8facf3c9 Change checkstyle to run on every sub project, so it will also run when you build an individual module 2014-01-09 17:00:11 +01:00
Hugo Trippaers
1b5f8e21a9 Fix typo 2014-01-09 14:42:34 +01:00
SrikanteswaraRao Talluri
3baf61161a CLOUDSTACK-5846: added updateCloudToUseObjectStore to known_category dict in gen_toc.py
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 18:44:04 +05:30
Wei Zhou
f012a2655d CLOUDSTACK-5404: Fix timezone bug in network usage
(cherry picked from commit d5277a81e644c6db30cff12878cd3708aa28cc86)

Conflicts:

	engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java
2014-01-09 14:07:53 +01:00
Hugo Trippaers
d56a962445 Radvd is needed in the template so we can start testing with IPv6 2014-01-09 12:33:55 +01:00
Rajani Karuturi
f741d99c80 CLOUDSTACK-5790: decrypted ldap hostname and port during upgrade as they are not encrypted now.
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 15:50:53 +05:30
Rajani Karuturi
001e67ab02 Revert "CLOUDSTACK-5435 enabled encryption for ldap params"
This reverts commit 1d5051f60e0b302287f4fd806a84e65afc7494d0.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-01-09 15:50:53 +05:30
Devdeep Singh
7dc4c5cb5d CLOUDSTACK-5795: Template.properties file wasn't created when a template
was created from a volume. Added a post creation change to create the file
with the necessary information.
2014-01-09 10:52:34 +05:30
Nitin Mehta
5c1d639bc4 CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
2014-01-08 18:32:51 -08:00
Min Chen
ac8bc74269 CLOUDSTACK-5840:Remove old API method. 2014-01-08 18:11:12 -08:00