Commit Graph

13 Commits

Author SHA1 Message Date
Alena Prokharchyk
56d94fc074 Merge branch 'master' into internallb1
Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2013-05-09 10:21:34 -07:00
Rajesh Battala
2e21060028 CLOUDSTACK-869 nTier Apps 2.0 : Support NetScalar as external LB provider 2013-05-09 15:23:00 +05:30
Alex Huang
e9953cd1a8 Fixed up unit testing to use only an in class TestConfiguration 2013-05-07 13:16:43 -07:00
Likitha Shetty
d5cd3f7e00 Dedicate guest vlan range to account 2013-05-07 13:13:54 -07:00
Alex Huang
3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Likitha Shetty
c8d843241e Dedicate guest vlan range to account 2013-05-06 10:02:41 +05:30
Alena Prokharchyk
7b24a7640c Merge branch 'master' into internallb1
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-04-29 16:12:10 -07:00
Harikrishna Patnala
deaf9106ca CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
Alena Prokharchyk
a4fc1d7d65 Internal LB:
1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB
2013-04-15 14:42:20 -07:00
Kelven Yang
370a7fdfd6 CLOUDSTACK-1884: fix the unit test issue 2013-04-11 17:23:49 -07:00
Kelven Yang
5782abf8f8 Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
Alena Prokharchyk
34a59fc3a7 Fixed createNetworkOfferingUnittest 2013-03-28 12:16:05 -07:00
Alena Prokharchyk
37cdb5d74b CLOUDSTACK-766 - allow Vlan assignment to Isolated network. The network with Vlan assigned, gets created with Setup state, and will never get picked up by the GC thread meaning its vlan will never get released 2013-03-21 16:05:48 -07:00