Commit Graph

609 Commits

Author SHA1 Message Date
Darren Shepherd
cba8e40e4b Add license headers to fix build 2013-09-30 09:51:45 -07:00
Laszlo Hornyak
c61997f022 basic test for ApiDispatcher
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-30 13:08:15 +02:00
Daan Hoogland
6f970c6ff9 static nat capabilities parsing cleanup and testing 2013-09-26 15:18:52 +02:00
Alena Prokharchyk
2fa5a5ae97 CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC
(cherry picked from commit 798f34a49c)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:18:41 +02:00
Daan Hoogland
2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Kelven Yang
832db1b398 Apply https://reviews.apache.org/r/14084/ 2013-09-17 16:29:48 -07:00
Alex Huang
a05ec6df33 Fixed up the agent separation. Added comments for config packaging. 2013-09-06 15:40:39 -07:00
Alex Huang
1f5699b29f Fixed unit tests 2013-09-06 15:40:39 -07:00
Alex Huang
b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang
435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang
2e5bb63f77 Moved NetworkManagerImpl to NetworkOrchestrator 2013-09-06 15:40:32 -07:00
Alex Huang
8e5249df62 Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
Prachi Damle
f31c318158 Changes required to merge to master:
- Replace UserContext by CallContext
2013-09-03 20:03:11 -07:00
Prachi Damle
5628153c59 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Adding mocks in unit tests for new injected components

Conflicts:

	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
2013-09-03 20:02:44 -07:00
Prachi Damle
a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Wei Zhou
a16fd4781c CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation
There are three issues in resource_count table
(1) expunge a vm, the public_ip decreases and becomes -1 in basic zone.
(2) recover a vm, the volume increase.
(3) restore a vm, the volume decrease.
2013-09-02 16:56:34 +02:00
Ian Duffy
bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Alex Huang
8113ebb08f Moved the csvtotags into StringUtils. It was there to begin with. No idea who copied it to ConfigurationManager 2013-08-26 20:27:27 -07:00
Alex Huang
abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Alex Huang
2d05fe40c0 Removed getPod, getCluster from ConfigurationManager 2013-08-26 17:31:09 -07:00
Alex Huang
ff6b3fd11a Removed getzone 2013-08-26 17:31:08 -07:00
Alex Huang
494ea5052f Made IpAddressManager a manager 2013-08-19 14:13:31 -07:00
Alex Huang
9f62df580e Fixed up the unit tests 2013-08-19 14:13:30 -07:00
Alex Huang
092e20204a Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl 2013-08-19 14:13:29 -07:00
Alex Huang
564502abd7 Moved the virtualmachine implementation into engine/orchestration 2013-08-19 14:13:28 -07:00
Alex Huang
4ba359c3fe Moved VirtualMachineManager into engine 2013-08-19 14:13:28 -07:00
Bharat Kumar
15c93ba9b7 =CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted
Nitin Mehta <nitin.mehta@citrix.com>
2013-08-16 17:27:00 +05:30
Alex Huang
3df5571d2e Resolved merge conflicts 2013-08-12 20:15:24 -07:00
Alex Huang
de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -07:00
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Bharat Kumar
5f2f5181e9 CLOUDSTACK-4083 if a failure occurs while adding VM to another network (this should be the first vm in the subnet). The ip alias created as a part of this process is not removed.
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-08-08 10:31:15 -07:00
Prasanna Santhanam
b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Min Chen
151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Chiradeep Vittal
9bb0eda5a1 Fix license 2013-08-02 14:05:01 -07:00
Daan Hoogland
afd5d555f6 Create Private Network Test
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-02 13:34:44 -07:00
Alex Huang
8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Bharat Kumar
21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -07:00
Alex Huang
46e644e134 Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used 2013-07-29 19:13:31 -07:00
Harikrishna Patnala
2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Harikrishna Patnala
8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
Harikrishna Patnala
a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on
Conflicts:
	server/test/com/cloud/vm/UserVmManagerTest.java
2013-07-27 19:52:30 +05:30
Alex Huang
395cbcc023 Move the rest of the generics out of virtualmachinemanager 2013-07-25 19:00:25 -07:00
Ian Duffy
eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Alex Huang
555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Nitin Mehta
8ee4e5ac14 =Disable the test and write a better one 2013-07-25 15:52:05 +05:30
Harikrishna Patnala
0010faee4b Fix for CLOUDSTACK-2536
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
2013-07-25 13:42:08 +05:30
Alex Huang
e99a1ef1d9 Moved the rest of VirtualMachineManager to be vm agnostic 2013-07-23 18:24:59 -07:00
Alex Huang
861be3063c Simplify the components that VirtualMachineManager uses 2013-07-23 18:24:57 -07:00
Alex Huang
5297a071d2 Changed virtual machine stop to use uuid 2013-07-22 20:06:04 -07:00