569 Commits

Author SHA1 Message Date
Darren Shepherd
efbfae723e Switch to setter injection for extensibility
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00
Daan Hoogland
6f970c6ff9 static nat capabilities parsing cleanup and testing 2013-09-26 15:18:52 +02:00
Abhinandan Prateek
77bec4f2ad Cloudstack-2997: the maxconn setting is masked by wrong conditions 2013-09-25 21:09:24 +05:30
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
1f5699b29f Fixed unit tests 2013-09-06 15:40:39 -07:00
Alex Huang
8f556e6d88 Made changes to configuration. Eliminated ConfigValue and only use ConfigKey 2013-09-06 15:40:38 -07:00
Alex Huang
b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang
6e8ca99466 Got all of the config stuff out of the way 2013-09-06 15:40:36 -07:00
Alex Huang
47afae8112 Merged conflicts resolved 2013-09-06 15:40:36 -07:00
Alex Huang
435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -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
012afceed2 CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table

updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table

listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.

DedicateZone API:
- set domainid in the data_center table

ReleaseDedicatedZone API:
- remove zoneid from the data_center table
2013-09-03 20:02:56 -07:00
Prachi Damle
96ca70e2da CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API
Changes:
- Block API from creating this type of group
2013-09-03 20:02:53 -07:00
Prachi Damle
ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
Ian Duffy
bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Chiradeep Vittal
4a9b2fb584 Since some config values moved to individual ConfigKey<T> from Config.java, validation is broken for those keys. Workaround the issue so that updateConfiguration API still works 2013-08-27 18:04:30 -07: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
092e20204a Divided NetworkManagerImpl into two files: NetworkManagerImpl and IpAddressManagerImpl 2013-08-19 14:13:29 -07:00
Alena Prokharchyk
ae617b6a35 Revert "fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user"
This reverts commit 94254e3c2bd38573adac22d0c66817db3cfa1873.

Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java

Regular user should be able to list the network offering with specifyVlan=true. He just can't use when create the network as he is unaware of the physical network topology. But as the admin can create the network on the user's behalf using this kind of offering, so the user should be able to see the offering's details
2013-08-14 15:22:36 -07:00
Murali Reddy
5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
Alex Huang
5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387.
2013-08-08 15:02:40 -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
5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
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
Bharat Kumar
c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
Thomas O'Dowd
5552d26872 Fix a few typos in ConfigurationManager.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c78ed39b2f53a3544b93515e6bb4889eef8c5888)
2013-07-30 11:25:15 +05:30
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
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
Anthony Xu
04cdd90a84 in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan. 2013-07-22 14:29:38 -07:00
Bharat Kumar
d73bb22802 Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Rebased with master.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 12:35:06 +05:30
Abhinandan Prateek
954e197813 Cloudstack-2997: maxconn missing param 2013-07-17 10:06:11 +05:30
Bharat Kumar
dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Bharat Kumar
6b549074fa Cloudstack-3313 Cannot deploy vm in ipv6 network
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
ahuang
11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Murali Reddy
f53db88bae CLOUDSTACK-2960: [portableIPrange] CS should check the portable ip range, vlan with
existing public ip ranges and vlans

adds a validation check to ensure there is no VLAN in the zones with
same id
2013-07-15 16:16:47 +05:30
Edison Su
0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Alena Prokharchyk
54c2133590 CLOUDSTACK-2984: createNetwork call - when vlan is specified, check that its not coming from the physical network vnet range as this range is used for dynamic vlan allocation during the network implementation stage 2013-07-01 16:17:43 -07:00
Mike Tutkowski
99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Bharat Kumar
974245991c Cloudstack-2732 [Multiple_IP_Ranges] Deleting guest IP range is not throwing any error message to user while the ip addresses are being used
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Bharat Kumar
6b0df2566d Cloudstack-3106 Delete all ips except ipAlias. Cloudstack-3119 Shared network removal doesn't cleanup corresponding IP ranges
Signed-off-by: Jayapal <jayapal@apache.org>
2013-06-28 19:05:55 +05:30
Likitha Shetty
55f0e167ec CLOUDSTACK-3206. CreateVlanIpRange fails with IndexOutOfBoundsException. 2013-06-26 14:59:36 +05:30
Mice Xia
94254e3c2b fix CLOUDSTACK-2989, do not list network offering with specifyvlan=true for non-root-admin user 2013-06-26 15:55:32 +08:00
Likitha Shetty
8a1fefc7aa CLOUDSTACK-3192. When a dedicated public ip range is released, don't generate usage event EVENT_NET_IP_RELEASE
for ips in the range that are in use becauase these ips are not disassociated from the account.
2013-06-26 10:51:39 +05:30