etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,033 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

25033 Commits

Author SHA1 Message Date
sanjeev a1b913db2a Adding new test which would verify the fix for issue "The ISO/Template is automatically deleted after URL expires" 
Signed-off-by: sanjeev <sanjeev@apache.org>
 2014-10-17 18:04:35 +05:30
Daan Hoogland 622041b513 rats 2014-10-17 11:56:07 +02:00
Daan Hoogland 1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Jessica Wang c10f8a10ef CLOUDSTACK-7744: UI > Instances > detailView > Change Service Offering > show generic notification. 2014-10-16 14:50:04 -07:00
Jessica Wang 6239447f05 CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view > listView > detailView > add View All link > show read-only text "group by zone/pod/cluster/account" in select view area. 2014-10-16 12:35:25 -07:00
Jessica Wang 7004deb528 CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view > listView > detailView > add View All link > not show "group by XXXXXXX" in select view dropdown. 2014-10-16 12:34:55 -07:00
Jessica Wang a3eaff8bb6 CLOUDSTACK-7736: UI - listView widget - select view dropdown on top of listView - prefilter() - include original args.context when passing it to prefilter(). 2014-10-16 12:34:26 -07:00
Jessica Wang 8fb7cfae0c CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by account view > listView > detailView > add View All link (i.e. "View all Virtual Routers"). 2014-10-16 12:33:49 -07:00
Jessica Wang 314a7fe62b CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by zone/pod/cluster view > listView > detailView > add View All link (i.e. "View all Virtual Routers"). 2014-10-16 12:33:08 -07:00
Rohit Yadav 7072d8d701 PR: #23 Merge 4.5 back into master from 'DaanHoogland/merge-master' 
Fixes #23

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-10-16 18:54:06 +05:30
Alex Brett 20d3cf1acc CLOUDSTACK-7727 Skip various BVT tests on LXC 
A number of BVT tests are not valid for LXC (e.g. migrating a VM), so this patch
ensures they skip if LXC is in use.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-16 17:23:04 +05:30
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 2014-10-16 12:29:37 +02:00
Sanjay Tripathi 1f8cf0bee4 CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI. 2014-10-16 14:38:33 +05:30
Sanjay Tripathi ec6a666855 Config value having different category in SQL and Config.java. 2014-10-16 14:38:23 +05:30
Sanjay Tripathi 420d4e0da0 CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI. 2014-10-16 14:25:30 +05:30
Sanjay Tripathi 5025071954 Config value having different category in SQL and Config.java. 2014-10-16 14:01:23 +05:30
Sanjay Tripathi 80e0c99189 Removed duplicate code and unused imports which was causing build failure. 2014-10-16 13:53:32 +05:30
Santhosh Edukulla efe1e0a544 Fixed coverity and other resource leak issues 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-16 12:19:51 +05:30
Jayapal 53ee4cd794 CLOUDSTACK-7728: Removed duplicate import 2014-10-16 10:05:06 +05:30
Damodar 7fe3c45142 CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response 2014-10-16 09:43:04 +05:30
Jayapal e257c13f16 CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot 2014-10-16 09:38:21 +05:30
Jayapal f488a8f72c CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes 2014-10-16 09:38:21 +05:30
Bharat Kumar 080bc2e2e9 CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2014-10-16 09:38:21 +05:30
Jayapal 55e11cddca CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot 2014-10-16 09:37:43 +05:30
Jayapal 7cd3438580 CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes 2014-10-16 09:37:42 +05:30
Bharat Kumar 6967c6c229 CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2014-10-16 09:37:42 +05:30
Nitin Mehta 3b442acdd7 CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller 
(cherry picked from commit 42f628c61c)
 2014-10-15 13:58:22 -07:00
Nitin Mehta 42f628c61c CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller 2014-10-15 13:53:39 -07:00
Gaurav Aradhye bd9d57e20c CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py 
fixed pep8 issues

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 11:02:33 +05:30
Gaurav Aradhye ac820a3230 CLOUDSTACK-7690: Added missing unittest import to test_escalations_volumes.py 
fixed pep8 issues

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 11:01:39 +05:30
Gaurav Aradhye 159a372fdd CLOUDSTACK-7693: Fixing pep8 issues 
pep8 fixes for test_routers.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 10:58:15 +05:30
Gaurav Aradhye 35e05a69a5 CLOUDSTACK-7693: Fixing pep8 issues 
pep8 fixes for test_routers.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-10-15 10:56:55 +05:30
sailajamada 58cfbcdf98 vGPU VMSnapshot Test Automation 2014-10-15 10:32:34 +05:30
Mike Tutkowski e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06:00
amoghvk 71c9804165 Fixing possible formatting issue with license header, causing builds to fail. Works well locally 2014-10-14 14:37:38 -07:00
Jessica Wang 26f3e8499a CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field. 2014-10-14 14:17:39 -07:00
Jessica Wang 340bcc60c0 CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field. 2014-10-14 14:02:29 -07:00
Mike Tutkowski 35a8b70799 Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage) 2014-10-14 12:26:40 -06:00
Min Chen e7fa3a2959 CLOUDSTACK-7563: Fix potential NPE from FingBugs. 2014-10-14 11:21:01 -07:00
Min Chen 4b8bfe2627 CLOUDSTACK-7563: Fix potential NPE from FingBugs. 2014-10-14 11:19:39 -07:00
Daan Hoogland 771d052381 Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack 2014-10-14 20:14:50 +02:00
wilderrodrigues 1e87d7b266 Fixing checkstyle. 
Making local variable compatible with our checkstyle settings.
 2014-10-14 15:25:50 +02:00
wilderrodrigues 2ed64b2356 Applying fix from commit id 6b8e0baa21 
Changes by Edilson Su: if vpc public network with snat enabled, then will triger this issue.
 2014-10-14 15:10:14 +02:00
Wilder Rodrigues db86bdfb2c Applygin fix from commit ID aaeadc5c44 
Sheng Yang changed 2 classes, ut only one was related to the bug CLOUDSTACK-7605.
I applied the changed on the routerslist, used during the deployment of the virtual routers.

Tested Advanced Zone against the simulator. 69 happy tests in place
 2014-10-14 15:08:13 +02:00
Wilder Rodrigues c81b3380df Applying the latest chances from the VPC Refactor branch onto the new one. 
We will keep this branch as clean as possible to avoid problems with merge.
 2014-10-14 15:08:13 +02:00
wrodrigues 3ac2e222e8 CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2 by Frank Zhang 
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
 2014-10-14 15:08:13 +02:00
wrodrigues 4e21948f5c Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap. 
When the refactor took place, we should have changed first structure, then behaviour. By refactoring the deployRouter method
we changed how the templateName was retrieved.
Fixed and tested using the simulator and the following Marvin tests

test_privategateway_acl
test_routers
test_vpc_vpn
test_service_offerings
test_volumes
test_reset_vm_on_reboot
test_multipleips_per_nic

Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
 2014-10-14 15:08:12 +02:00
wrodrigues 025ff72410 fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 15:08:12 +02:00
Wilder Rodrigues 9f801d1f3a Changing the way the DAOs were being injected in the RuleApplier; 
Making code clearer and simple.

Conflicts:
	server/src/com/cloud/network/rules/PrivateGatewayRules.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
 2014-10-14 15:08:12 +02:00
Wilder Rodrigues 60eea3bb1a Adding fixes for the add user data and vpn rules 2014-10-14 15:08:11 +02:00