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

8594 Commits

Author SHA1 Message Date
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
Wilder Rodrigues bbce7d944b fixing checkstyles 
Conflicts:
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
 2014-10-14 14:55:22 +02:00
Wilder Rodrigues 3457d0fbaf changing accessor modifier in instance variables 2014-10-14 14:55:22 +02:00
Wilder Rodrigues 65d7e0756d Adding Firewall Rules to comply with the Visitor pattern implementation; refactoring the applyRules so we can reuse it. 
Conflicts:
	server/src/com/cloud/network/rules/LoadBalancingRules.java
	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
	server/src/com/cloud/network/topology/BasicNetworkTopology.java
	server/src/com/cloud/network/topology/NetworkTopology.java
 2014-10-14 14:55:22 +02:00
Antonio Fornie 24b230d11b Fix dependency problem. Extract and unify router deployment stuff 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 14:55:22 +02:00
Antonio Fornie f28426e1a2 Extract general behavior to Router and Vpc delegates 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-10-14 14:51:02 +02:00
Antonio Fornie 1a85213bbf Rules and visitors for Load Balance Rules 
Conflicts:
	server/src/com/cloud/network/element/VirtualRouterElement.java
 2014-10-14 14:46:38 +02:00
Santhosh Edukulla 350ac4c4b0 Fixed Resource Leaks 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
 2014-10-13 17:51:02 +05:30
Rajesh Battala 0f528df228 CLOUDSTACK-7313 Fixed issues in provisioning vpx in SDX from CS 2014-10-13 15:57:13 +05:30
Damodar 50185b7c3a CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 2014-10-13 14:42:00 +05:30
Kishan Kavala b6cacb3d67 change dos line ending to unix format 2014-10-13 12:34:32 +05:30
Edison Su 6b8e0baa21 if vpc public network with snat enabled, then will triger this issue; 2014-10-09 16:48:09 -07:00
amoghvk fbcab01ff0 Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect" 
This reverts commit d910b4ff14 since it is causing encryption/decryption issues with RPM builds
 2014-10-09 15:39:19 -07:00
Kishan Kavala 63109a97b1 CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead 2014-10-09 10:27:49 +05:30
Sanjay Tripathi 123ec8b3d3 CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is failing. 
VM snapshot with memory is not supported for VGPU VMs, so putting checks
for same.
 2014-10-08 19:21:12 +05:30
Sanjay Tripathi d910b4ff14 CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect 
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
 2014-10-07 16:49:38 +05:30
Santhosh Edukulla 45597766a5 Fixed few coverity issues 2014-10-07 12:19:39 +05:30
Anthony Xu 3201251256 ccp should not check public ip resource when deploy a vm on shared network 2014-10-02 16:03:34 -07:00
amoghvk 0ef6cd36c4 Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect" 
This reverts commit 39fe766c2b.
 2014-10-02 13:28:52 -07:00
Sanjay Tripathi 39fe766c2b CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect 
GPU enabled hosts from non-GPU VM deployment.
Cluster reordering is based on the number of unique host tags in a cluster,
cluster with most number of unique host tags will put at the end of list.
Hosts with GPU capability will get tagged with implicit tags defined by
global config param 'implicit.host.tags' at the time os host discovery.

Also added FirstFitPlannerTest unit test file.
 2014-10-01 17:25:41 +05:30
Likitha Shetty bca71ec169 CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception". 2014-10-01 15:41:50 +05:30
Kishan Kavala ce5c35b193 For network stats aggregation job, get the most recent mgmt server id to do the aggregation. Set dao filter to descending. 2014-10-01 14:24:50 +05:30
Anthony Xu 847e1e47ae when system VM ping times out, stop system VM 2014-09-30 12:35:44 -07:00
Jayapal 1d01ee3a60 CLOUDSTACK-7615: Update log msg to print error msg rather than exception 2014-09-29 17:15:42 +05:30
Devdeep Singh ec1123aca1 CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware and xenserver. If 
the operation is tried on other hypervisors it fails but logs a stack trace. We
should just log a message that the operation isn't supported.
 2014-09-26 13:15:31 +05:30
Rohit Yadav f74446a195 CID-1192810: Remove useless control flow 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-25 17:02:13 +02:00
Rohit Yadav 92858afd55 CID-1192822: ids is a List<Long>, the cast to List<?> is removed 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-25 16:59:47 +02:00
Rohit Yadav 59482b3eba CID-1211005: Fix comparison, Class<?> is always instance of Class 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-25 16:52:09 +02:00
Rohit Yadav 60e492aeb9 CID-1223274: Remove dead local storage code from VolumeApiServiceImpl 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-09-25 16:43:48 +02:00
Harikrishna Patnala c55bc0b2d1 CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false 
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
 2014-09-24 16:35:23 +05:30
Hugo Trippaers 3a5401f8f9 Merge branch 'bugfix/CID-1240106' 2014-09-24 09:07:20 +02:00
Sheng Yang aaeadc5c44 CLOUDSTACK-7605: Fix basic zone multiple pod network restart with cleanup=true 
1. getRouters() doesn't handle RestartNetwork with cleanup=true for basic zone,
because pod wouldn't be specific at the time.

2. The regression caused by the following fix. The variable "routers" was
overrided with some local values, result in only one of the routers in multiple
pods would return, thus only one router would be started.

commit 6dd5c3fd42
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Thu Oct 11 18:30:00 2012 +0530
CLOUDSTACK-70: Improve restart network behaviour for basic network
 2014-09-23 14:17:42 -07:00
Hugo Trippaers 9ead2046d4 CID-1240106 Remove unused variable 2014-09-23 11:02:40 +02:00
Koushik Das a6ee4112a5 CLOUDSTACK-7595: Config parameters "job.expire.minutes" and "job.cancel.threshold.minutes" incorrectly getting multiplied by a factor of 60 
Removed the unnecessary multiply factor for both the config parameters. Also removed the duplicate entries from Config.java as these are not required
 2014-09-22 16:45:37 +05:30
Nitin Mehta 082aed3d33 CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors. 2014-09-19 13:40:17 -07:00
Hugo Trippaers 2df41e857e CID-1114592 Replaced duplicate code with a call to super 2014-09-19 14:47:13 +02:00