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

8954 Commits

Author SHA1 Message Date
Hugo Trippaers 8560cc3b01 CID-1254835 proxy can only be null in a special case 2014-11-18 09:30:37 +01:00
Anshul Gangwar 31876fb588 CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited 
This closes #40
 2014-11-18 13:39:08 +05:30
Anshul Gangwar b008d78b57 CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float 
This closes #41
 2014-11-18 13:36:21 +05:30
Daan Hoogland 7b9e4a820b CID-1254842 use boxed constant instead of true 2014-11-17 14:59:47 +01:00
Daan Hoogland bb1ab33bb4 CID-1254841 removed unused var 2014-11-17 14:55:13 +01:00
Daan Hoogland 3dc12f7b48 CID-1254843: var name changed to saolve c&p issue 2014-11-17 14:45:48 +01:00
Anshul Gangwar efe47b0704 CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue 
This closes #28
 2014-11-17 16:34:26 +05:30
Anshul Gangwar e8a47594da CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful 
This closes #29
 2014-11-17 16:31:35 +05:30
Anshul Gangwar 2898f7d8d6 CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. If we create VM with shared service offering and attach disk with local disk offering, and one of storage pool is full(cannot be allocated) and other is not full then we are not putting the cluster in avoid list which is causing this infinite loop. 
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
This closes #30
 2014-11-17 16:17:15 +05:30
Rajesh Battala 3a4d70e696 Revert "Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1" 
This reverts commit d5b6fc4f04, reversing
changes made to 91ffaaa5a2.
 2014-11-17 16:05:32 +05:30
Rajesh Battala d5b6fc4f04 Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1 
This closes #30
 2014-11-17 15:55:17 +05:30
Nitin Mehta 5213401ace 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. 2014-11-14 16:19:10 -08:00
Nitin Mehta 39a671dfd8 CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured. 2014-11-14 14:30:46 -08:00
Nitin Mehta e87bb20d0c CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. 2014-11-14 13:35:40 -08:00
Nitin Mehta 3907bc6f9d CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started. 2014-11-14 13:18:27 -08:00
Jayapal 7fd1e8e239 Merge branch '4.5' 2014-11-14 12:12:07 +05:30
Devdeep Singh cffae8eef0 CLOUDSTACK-6924. To attach a volume if a volume needs to be moved to another storage 
pool, the source and destination pools cannot be local and cluster/zone and vice versa.
Cloudstack detects it and throws a exception. However, the end user only sees an
unexpected exception and not the reason for failure. Fixed it by making sure the
reason for the failure is correctly captured and shown to the end user.
 2014-11-14 11:19:19 +05:30
Damodar 7e6ec2ce82 CLOUDSTACK-7877: The NET.IPRELEASE events are not added to usage_event on IP range deletion from Physical Networks. 
Signed-off-by: Jayapal <jayapal@apache.org>
 2014-11-14 10:31:46 +05:30
Nitin Mehta ade305be20 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. 2014-11-13 13:54:45 -08:00
Will Stevens 92d4a41a69 CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 2014-11-13 09:55:49 -05:00
Santhosh Edukulla ef6ec7b276 Fixed few coverity issues like invalid boxing unboxing issues, resource leaks, null dereferences 2014-11-13 17:26:24 +05:30
Saksham Srivastava fc4dceaa99 CLOUDSTACK-7582: Update Storage Pool API does not update tags correctly 2014-11-13 17:01:06 +05:30
Koushik Das f585dd2661 CLOUDSTACK-7902: Account creation results in exception in logs 
Event publish code was wrapped in transaction, moved it out
 2014-11-13 16:11:53 +05:30
Koushik Das 03e63a67e0 CLOUDSTACK-7902: Account creation results in exception in logs 
Event publish code was wrapped in transaction, moved it out
 2014-11-13 14:41:33 +05:30
Mike Tutkowski 2042660a68 Added a "long getUsedIops(StoragePool)" method to the PrimaryDataStoreDriver interface 2014-11-12 13:38:58 -07:00
Wido den Hollander 95daa14e2a CLOUDSTACK-7583: Fix NPE caused by previous commit 2014-11-12 16:54:20 +01:00
Damodar f1361796bf CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-11-12 10:24:56 +05:30
Damodar 50a3c0b2e3 CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are failing if CS fail to contact rabbit mq server. This is happening in case of Async API calls. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-11-12 10:12:15 +05:30
Harikrishna Patnala edf1047a20 CLOUDSTACK-7706: Coverity defects 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-11-11 20:58:45 +05:30
Wido den Hollander 840c2fda85 CLOUDSTACK-7583: Send VmStats to Graphite host when configured 
This allows external processing of VmStats information without using
the usage server of CloudStack

Statistics are being send to Graphite using UDP and not TCP.

UDP is used to prevent the management server waiting for TCP timeouts
when the Graphite server is unavailable
 2014-11-11 13:04:43 +01:00
Koushik Das 2685ed36cc CLOUDSTACK-7880: Creating shared network results in exception 
This is due to event publish being wrapped in a transaction, moved it outside of transaction scope.
 2014-11-11 16:35:20 +05:30
Koushik Das 6d268db217 CLOUDSTACK-7880: Creating shared network results in exception 
This is due to event publish being wrapped in a transaction, moved it outside of transaction scope.
 2014-11-11 16:32:20 +05:30
Daan Hoogland d2f28ea3ae CID-1251369: not null check changed to null check 2014-11-11 09:32:09 +01:00
Santhosh Edukulla c916f30574 CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events 2014-11-10 21:22:47 +05:30
Rohit Yadav c401dbc8f9 CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 97fa4a023e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-10 17:53:26 +05:30
Rohit Yadav 97fa4a023e CLOUDSTACK-7871: allow VM and template details update using update APIs 
Allows updating details (key/value) pair which updatse entries
invm_template_details and user_vm_details tables using updateVM and updateTemplate
APIs. This allows sys admins to update nics, controllers etc without DB hacking.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-10 17:51:57 +05:30
Jayapal 709bf074de CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network 2014-11-10 16:06:58 +05:30
Jayapal 0bd34d389f CLOUDSTACK-7872: network getting shutdown inspite of running VM's in the network 2014-11-10 15:26:48 +05:30
Damodar 781648fb10 CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine 2014-11-10 15:19:02 +05:30
Bharat Kumar 310bb255ac CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check 2014-11-10 15:07:13 +05:30
Bharat Kumar 991d783e03 CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check 2014-11-10 14:30:42 +05:30
Nitin Mehta a8b89bea4f CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented 2014-11-09 23:01:28 -08:00
Koushik Das 54ec268b7e CLOUDSTACK-7869: Add simulator support for findHostsForMigration API 2014-11-08 13:50:43 +05:30
Koushik Das e25de54b4c CLOUDSTACK-7421 
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
 2014-11-08 13:50:15 +05:30
Koushik Das 8378485e56 CLOUDSTACK-7869: Add simulator support for findHostsForMigration API 2014-11-08 13:46:54 +05:30
Sanjay Tripathi 1c9775b0df CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS. 2014-11-07 17:34:16 +05:30
Sanjay Tripathi 330bd2748e CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS. 2014-11-07 17:32:25 +05:30
Mike Tutkowski 9338abb6f3 Check to see if the Map<String, String> of capabilities passed back from the storage driver is null. 2014-11-06 19:49:44 -07:00
Mike Tutkowski ebb96f5e2f Handle the case where the volume a snapshot was created from is removed from the database 2014-11-06 19:44:46 -07:00
Edison Su 812b0122e2 CLOUDSTACK-7683: hold a db lock during vm expunge 2014-11-06 15:37:15 -08:00
Edison Su ffdb38c496 there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min 2014-11-06 15:30:19 -08:00
Edison Su 1fb28c2959 CS-21296: hidden snapshot.backup.rightafter, as it's not needed 2014-11-06 15:29:56 -08:00
Edison Su 103a4dd54d CLOUDSTACK-7683: hold a db lock during vm expunge 2014-11-06 15:22:34 -08:00
Mike Tutkowski 92d9ef9c17 Handle the case where a snapshot is associated with a deleted volume 2014-11-06 15:34:39 -07:00
Pierre-Luc Dion f5c3a71ef9 commented unit tests for CertService until certs issues fixed 2014-11-06 09:39:45 -05:00
pdion891 b532e4f52c CLOUDSTACK-7822: fix tests CA cert 2014-11-05 10:54:21 -05:00
pdion891 f86eb522e2 commented broken unit test 2014-11-05 10:46:36 -05:00
pdion891 ddb2d9c60e CLOUDSTACK-7822: merge, test sslcert ca 2014-11-05 08:49:42 -05:00
Sanjay Tripathi 5a67fe7369 CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table. 
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
 2014-11-05 16:44:54 +05:30
Sanjay Tripathi b844155240 CLOUDSTACK-7842: Wrong size column is getting updated with snapshot physical size in snapshot_store_ref table. 
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
 2014-11-05 16:42:28 +05:30
Rajani Karuturi 4c5f792ca9 Merge branch '4.5' 2014-11-05 15:20:34 +05:30
Rajani Karuturi c3e5964dcb Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work 
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35
 2014-11-05 11:49:38 +05:30
Koushik Das 0327c2b13e CLOUDSTACK-7421 
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
 2014-11-04 17:34:07 +05:30
Sanjay Tripathi 9168d826da CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs 
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
 2014-11-04 17:28:22 +05:30
Sanjay Tripathi 7a8f511014 CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs 
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
 2014-11-04 16:46:28 +05:30
Min Chen 07ba078ee6 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 11:19:06 -08:00
Min Chen 684889f0b5 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 10:52:47 -08:00
Kishan Kavala e427d0004c CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume 2014-11-03 17:20:21 +05:30
Kishan Kavala 99010f463b CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot 2014-11-03 17:20:00 +05:30
Kishan Kavala d6fdb7c6bc CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access 2014-11-03 17:19:15 +05:30
Santhosh Edukulla 1aef5cba66 Fixed Coverity Issues 2014-11-03 16:45:30 +05:30
Santhosh Edukulla 1c01da3e08 CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events 2014-11-03 12:40:13 +05:30
amoghvk efc9632c1b CLOUDSTACK:6915 search including removed 2014-10-31 15:47:18 -07:00
amoghvk 6df396c9c0 Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5 2014-10-31 15:29:40 -07:00
amoghvk 0c153966e6 CLOUDSTACK:6915 search including removed 2014-10-31 15:29:07 -07:00
Nitin Mehta 138366804d CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event. 2014-10-31 15:25:06 -07:00
Nitin Mehta 2652195010 CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event. 2014-10-31 15:24:32 -07:00
pdion891 aaa561a283 Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests" 
This reverts commit 0d1fa9102d.
 2014-10-31 17:14:59 -04:00
pdion891 f28ade56f2 Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests" 
This reverts commit 0d1fa9102d.
 2014-10-31 17:12:54 -04:00
pdion891 5b1cbc442a CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests 2014-10-31 16:43:57 -04:00
pdion891 0d1fa9102d CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests 2014-10-31 16:42:31 -04:00
Rohit Yadav f543d86eff saml: Use camelCase api names for SAML login/logout apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-10-31 01:24:39 +05:30
Rohit Yadav cd52bed477 saml: Use camelCase api names for SAML login/logout apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-10-31 00:32:29 +05:30
Rohit Yadav 62f9bf0fff PR #26 CLOUDSTACK-7688, CLOUDSTACK-7747 
Restricted various operations for VM with VM Snapshots #26

This closes #26
 2014-10-30 15:11:57 +05:30
Anshul Gangwar 4705933a64 CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. 
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.

Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
 2014-10-30 13:36:01 +05:30
Anshul Gangwar d8b46b81b9 CLOUDSTACK-7767: fixed events are not generated for snapshot creation 2014-10-30 13:25:06 +05:30
Anshul Gangwar a4d8215ebb CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots. 
Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM.
 2014-10-30 12:37:50 +05:30
Anthony Xu c78f14cbc2 fixed NPE 2014-10-29 17:05:42 -07:00
Edison Su b6d8ceda3d there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min 2014-10-30 02:21:29 -07:00
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Min Chen 055901acda CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to 
complete, slow compared to previous 4.3 release.
 2014-10-27 17:00:42 -07:00
Sheng Yang dd7026b20e CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone 
In basic network, the correct network id associate with IP is source network id
rather than network id.
 2014-10-27 16:49:30 -07:00
Sheng Yang 307a35a618 CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone 
In basic network, the correct network id associate with IP is source network id
rather than network id.
 2014-10-27 16:46:01 -07:00
Min Chen 4f43839dae CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to 
complete, slow compared to previous 4.3 release.
 2014-10-27 16:27:17 -07:00
Sanjay Tripathi db6a0d65aa No need to log discrepancy resource count message for Primary and secondary storage. 2014-10-27 15:26:06 +05:30
Sanjay Tripathi 4f4595cef8 No need to log discrepancy resource count message for Primary and secondary storage. 2014-10-27 15:23:36 +05:30
Sanjay Tripathi c5fa7cc494 Correct the error message when tried created VM Snapshot with memory on a vGPU Instance. 
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
 2014-10-27 13:59:59 +05:30
Sanjay Tripathi 9bcf0e1bf6 Correct the error message when tried created VM Snapshot with memory on a vGPU Instance. 
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
 2014-10-27 13:52:28 +05:30
Frank Zhang 88561e154f fix expried certificate in unit test 2014-10-24 11:10:24 -07:00
Anthony Xu 32dc09f2c3 even xenserverinvestigator returns true, that means host is up, but XAPI may not work 2014-10-23 16:10:18 -07:00
Edison Su 10cc7f86af CS-21296: hidden snapshot.backup.rightafter, as it's not needed 2014-10-22 15:36:35 -07:00
Anthony Xu 4a13f81485 when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:14:46 -07:00
Anthony Xu c52e14730e when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:07:40 -07:00
Nitin Mehta ee0f0a1cff 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
 2014-10-22 15:03:25 -07:00
Mike Tutkowski 97aa02ceb0 Commits related to taking snapshots that live on primary storage 2014-10-22 12:44:33 -06:00
Anthony Xu 0141b37784 CLOUDSTACK-7761: 
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
 2014-10-21 17:21:17 -07:00
Anthony Xu 70112bd145 CLOUDSTACK-7761: 
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
 2014-10-21 17:19:57 -07:00
Frank Zhang ccf4c66ef1 fix expried certificate in unit test 2014-10-21 16:20:54 -07:00
Mike Tutkowski 57dacf99a2 Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)" 
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
 2014-10-21 16:01:14 -06:00
Mike Tutkowski 06f6b00cd1 Snapshot support 2014-10-21 16:01:13 -06:00
Nitin Mehta e1a993d37b 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. 2014-10-21 09:57:02 -07:00
Nitin Mehta a72580def0 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. 
(cherry picked from commit 287ff83552)
 2014-10-20 16:50:22 -07:00
Nitin Mehta 287ff83552 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. 2014-10-20 16:49:48 -07:00
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
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
Mike Tutkowski e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06: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
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
Wilder Rodrigues f2f4732854 Removing the VirtualNetworkStatus, it was not being used properly; 
fixing the injection of the network DAO in the PrivateGatewayRules;
all tests that were failing in Travis have been tested before the commit.

Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 15:08:11 +02:00
Wilder Rodrigues dc5fefc018 making sure the instance variable _router in the Rules is being used instead of the parameter 
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
 2014-10-14 15:08:11 +02:00
Antonio Fornie 64eed6c6ab Fix: VpcRouter has always PublicIp setup as it did before refactoring 2014-10-14 15:08:10 +02:00
Wilder Rodrigues ee9068b5b2 merging cmd-visitor into cmd-visitor-rebase, with the upstream from ACS repo 
Conflicts:
	server/src/com/cloud/network/rules/DhcpRules.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
 2014-10-14 15:08:10 +02:00
wrodrigues b7c193a88d fixing nic plug unplug rule 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-14 15:08:10 +02:00
wrodrigues 5f51a06e3c fix dhcp subnet rules. we can create VMs again. 2014-10-14 15:08:10 +02:00
Antonio Fornie 02c75251b3 Fixing NPE due to use of dependencies before Spring injection 2014-10-14 15:08:09 +02:00
Antonio Fornie cd8cadaf9c Refactor hypervisor retrieval from VpcNwHelper and NwHelper 
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-14 15:08:09 +02:00
Wilder Rodrigues 65fb21647a auto wire the network helper 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:08:09 +02:00
Wilder Rodrigues 546e563c27 refactor all private methods in the virtual router appliance and VPC appliance 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/DhcpEntryRules.java
	server/src/com/cloud/network/rules/LoadBalancingRules.java
	server/src/com/cloud/network/rules/RuleApplier.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
 2014-10-14 15:08:09 +02:00
Antonio Fornie b5e96af4e2 Missing license headers 2014-10-14 15:02:14 +02:00
Antonio Fornie 2802d3b75b Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers 2014-10-14 15:02:14 +02:00
Wilder Rodrigues e08cb11fc0 fixing check style issues 
Conflicts:
	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
	server/src/com/cloud/network/rules/AdvancedVpnRules.java
	server/src/com/cloud/network/rules/RuleApplier.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
 2014-10-14 15:02:14 +02:00
wrodrigues 01edc8e394 adding setupPrivateGateway to new style; 
removing methods from Vpc appliance;
changing the way VpcElement calls the command;

there is still work tob e done with the destroyPrivateGateway rule.

Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
 2014-10-14 15:02:13 +02:00
Antonio Fornie b9bff843c6 Whole router.deployment package got 97% coverage 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-14 15:02:13 +02:00
Antonio Fornie 3d4ddb7251 DeployRouter includes nw creation following TellDontAsk principle 
Also factor out NicProfile specific methods and fix some DI config.

Conflicts:
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-14 15:02:13 +02:00
wrodrigues adebaf2bd0 adding applyStaticRoutes to the new visitor pattern. 2014-10-14 15:02:13 +02:00
Wilder Rodrigues b96035f356 adding applyStaticRoutes method to the network topology/visitor. it will be used by the VPC virtual net manager appliance. 
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
 2014-10-14 15:02:12 +02:00
Antonio Fornie 2da3ceda31 Refactor to include network creation as actual deployment 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
	server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
	server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 2014-10-14 15:02:12 +02:00
Wilder Rodrigues 00dc8a7b24 fixing check styles 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:02:12 +02:00
wrodrigues 16ad4122b4 moving sendCommand to the NetworkGeneralHelper; 
adding handle single network method to the NetworkGeneralHelper;
moving getRealPriority to the NetworkGeneralHelper;
making priority constants part of the VirtualNetworkApplianceManager;
changing the network topology implementation in order to use the NetworkGeneralManager instead of the appliance

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:02:11 +02:00
Antonio Fornie 95d32b4d0d Fix unnecessary changes Spring contexts 2014-10-14 15:01:17 +02:00
Antonio Fornie 0d81cf09f6 Increasing test coverage for Vpc Deployment 2014-10-14 15:01:16 +02:00
Antonio Fornie 240a539d43 Factor out prepareDeployment and update tests 2014-10-14 15:01:16 +02:00
Antonio Fornie d2d9157ab0 Complete tests for normal deployment and start vpc one 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-14 15:01:16 +02:00
Wilder Rodrigues 12b0d188cb Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones; 
Implement the missing commands related to DHCP PV Lan and DHCP SubNet

Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/DhcpRules.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
 2014-10-14 15:01:16 +02:00
Antonio Fornie a83f5790eb License headers 2014-10-14 15:01:15 +02:00
Antonio Fornie 6fac12675d More refactoring and testing in the same classes 
Conflicts:
	server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 2014-10-14 15:01:15 +02:00
Antonio Fornie f3c04172a4 RouterDeployment and VPC. Improving code and Unit Testing 2014-10-14 15:01:14 +02:00
Antonio Fornie 8852153d0c Splitting Vpc and NonVpc deployment into phases & testing it 2014-10-14 15:01:14 +02:00
Wilder Rodrigues 325026de3f fixing VPC IP Association and ACL rules. Have to rewrite in a better why the apply rules method in the Advanced Topology 2014-10-14 15:01:14 +02:00
Wilder Rodrigues b97f2b05c7 apply network acls; acls items to pvt gw; vpc ip association 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:01:14 +02:00
Antonio Fornie f23ba91ed1 Fixing null pointers during vpc router deployment 2014-10-14 15:01:13 +02:00
Wilder Rodrigues bfd4316b58 adding new bean to spring context file; renaming package from "com" to "org" 2014-10-14 15:01:13 +02:00
Wilder Rodrigues 8437c2fda0 removing bean from the xml 2014-10-14 15:01:13 +02:00
Wilder Rodrigues e35fded401 commenting broken code in tests in order to run build adn tests other changes via the UI 
Conflicts:
	server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
 2014-10-14 15:01:12 +02:00
Wilder Rodrigues 0b78731bc7 fixing import in virtual router element and checkstyle in dhcp entry related changes 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/rules/DhcpEntryRules.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-14 15:01:12 +02:00
Antonio Fornie 95395f9574 Deployment more OO - Objects with data and behavior 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 15:01:12 +02:00
wrodrigues e99b5b0760 fixing the injection of the networkDao 
Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
 2014-10-14 15:00:33 +02:00
Daan Hoogland c76952b5ff whitespace 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
 2014-10-14 15:00:33 +02:00
wrodrigues d15329679b fixing injection of beans with a relationship 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:00:33 +02:00
Wilder Rodrigues 8f313ca5d3 adding user data pwd rules 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:00:32 +02:00
Wilder Rodrigues b9ffe2329e making instance variables compliant with ACS convention 
Conflicts:
	server/src/com/cloud/network/rules/LoadBalancingRules.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 15:00:32 +02:00
Wilder Rodrigues f0189ac3c3 adding userdata to router and ssh pub key to router rules. 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-14 15:00:32 +02:00
Antonio Fornie 631b561d9c Unify and encapsulate deployment flow methods and params 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 15:00:31 +02:00
Wilder Rodrigues 299c42c336 adding password to router rules; moving the advance code to the advance net topology. 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
 2014-10-14 14:55:26 +02:00
Wilder Rodrigues 87f0e68983 fixing the classes relationship; adding beans properly in the spring context; using the right basic/advance stuff; testing ip and port forwarding rules 
Conflicts:
	server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
 2014-10-14 14:55:25 +02:00
Antonio Fornie a98253296a Temporary put state info in a state object 2014-10-14 14:55:25 +02:00
Daan Hoogland e1866bf90d package rename 
Conflicts:
	server/src/com/cloud/network/rules/DhcpEntryRules.java
	server/src/com/cloud/network/rules/DhcpSubNetRules.java
 2014-10-14 14:55:25 +02:00
Antonio Fornie 563f853d59 Fix offering setup 2014-10-14 14:55:24 +02:00
Wilder Rodrigues 6b2d35c8c2 adding Ip Association and VPN Rules 
Conflicts:
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
	server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
 2014-10-14 14:55:24 +02:00
Wilder Rodrigues f965fb9672 adding apache license headers 2014-10-14 14:55:24 +02:00
Wilder Rodrigues 7e98e3e132 we have to check if VPC is null bfore calling it. VPC is not used in gest networks, so deploying a new VM was broken. 2014-10-14 14:55:23 +02:00
Wilder Rodrigues fb8973f1e2 adding static nat rules. Deploying new VMs is not working due to the appliance refactory, will check the changes with Antonio tomorrow. 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
 2014-10-14 14:55:23 +02:00
Daan Hoogland f17a0b835c TODO 2014-10-14 14:55:23 +02:00
Wilder Rodrigues 4b1112af28 finished firewall rules and load balancing rules; fixed all the injection problems; added VirtualMachineManager to the appliance factory to be injected. 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
 2014-10-14 14:55:23 +02:00