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

456 Commits

Author SHA1 Message Date
kishan 8f2cf82b24 Bug 12996: Removed createConfiguration API command 
Status 12996: resolved fixed
Reviewed-By: Nitin
 2012-01-30 14:36:50 +05:30
frank c40a421eb6 Bug 13250 - Not able to start System Vms when 2 physical networks are configured 
if admin didn't specify storage traffic type before enabling zone, create default
storage traffic type with the same configuration of mgmt traffic type.

UI need a warning to admin, will file another bug for this

status 13250: resolved fixed
 2012-01-26 14:06:34 -08:00
prachi 03653b936e NAAS Changes: Before enabling a Zone, Check if the zone has: 
- For Advance zone,  a physical Network with Public/Management trafficType
- For Basic zone,  a physical Network with Management trafficType
 2012-01-20 17:21:53 -08:00
Alena Prokharchyk 8bcf30da85 bug 12869: more changes to NAAS feature 2012-01-20 14:16:30 -08:00
Alena Prokharchyk ff1e8413f1 1) Added StaticNat/Firewall/Lb capabilities to Netscaler element. Renamed it to "NetscalerElement" from NetscalerLoadBalancingElement as it serves more services now 
2) Added elasticIp and elasticLb network capabilities. Provided support to create network offering with these capabilities.
3) Added one more default network offering having elasticip and elasticlb
4) Public network support to Basic zone. You can associate/disassociate IP addresses now
 2012-01-19 13:56:59 -08:00
prachi 1e675f45ba Bug 11593 - CIDR conflicts with zone when extending pod but not when creating it 
Changes:
- Now we validate Pod's CIDR only against other Pod's CIDR. No need to validate against guest CIDR and
public vlan CIDR.
 2012-01-18 11:33:49 -08:00
Alena Prokharchyk 56b3561033 bug 12856: network offerings with services w/o providers support 
status 12856: resolved fixed
 2012-01-17 16:17:09 -08:00
prachi 189822da50 Bug 12592 - createZone: zone should be added in Disabled state 
- Zone will be Disabled by default when created using createZone API
 2012-01-17 14:56:21 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account 
status 12776: resolved fixed
 2012-01-17 13:40:37 -08:00
Alena Prokharchyk c87c3bc665 bug 12065: verify that provider supports service capability 
status 12065: resolved fixed
 2012-01-17 12:39:07 -08:00
kishan bad573168e Bug 12639: while logging events, hide value for configs containing password string in config name 
Status 12639: resolved fixed
Reviewed-By: Nitin

Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2012-01-17 15:45:00 +05:30
Abhinandan Prateek e6161ac502 bug 12979: anonymous searches now allowed 2012-01-16 20:03:00 +05:30
Nitin Mehta 8a3a4ab9c0 bug 13096 Make capacity deletion for pod deletion more robust. 
Reviewed by : Kishan.
 2012-01-16 14:29:51 +05:30
Alena Prokharchyk b1c60b9d60 bug 12964: createPhysicalNetwork/addTrafficType is no longer a part of createZone API 2012-01-10 13:55:09 -08:00
Sheng Yang 4d82413a66 Remove the check against guest network when adding pod 
Seems we don't want to do this.
 2012-01-09 16:50:48 -08:00
Sheng Yang 5886109fb9 bug 12556: Check guest network cidr when add pod 2012-01-09 16:42:57 -08:00
Sheng Yang 861fdbee17 bug 12556: Add more CIDR checking when create network with specify CIDR 
Pod and vlan creation have already got them.

status 12556: fixed resolved
 2012-01-09 16:27:00 -08:00
Alena Prokharchyk adaea570e4 bug 12934: added name to physical network 
status 12934: resolved fixed
 2012-01-09 14:20:37 -08:00
Sheng Yang 90066f1c12 Remove conserve-mode restriction 
Multiply provider can be used for conserve mode.
 2012-01-06 13:44:19 -08:00
Sheng Yang 5e60228d2b bug 12656: Add conserve mode for network offering 
Conserve mode means, we can use same IP for different purposes, in order to
"conserve" ip resources. But in this offering, all the service providers should
be the same, and the network created from this offering may be prohibited from
update to different network offering whose services are provided by different
service providers - because different service providers would need different IPs
for different services.

If user want to update the "conserve mode" network with the network offering
that has different service providers, each public IP should have only one usage,
only them the update is allowed.
 2012-01-05 21:08:23 -08:00
Alena Prokharchyk d4e0fbda83 bug 12686: added search by zoneId to the listNetworkOfferings 2012-01-04 12:31:59 -08:00
Jessica Wang 64a54f32a5 bug 12199: error message returned from API shouldn't include double quote. That's invalid JSON format. 2012-01-03 17:53:47 -08:00
Naredula Janardhana Reddy 812b4782a2 Bug 9237: Checking private ip range with public ip range overlap and viceversa while adding physical resources. 
Reviwed by: Abhi
 2011-12-28 12:11:34 +05:30
anthony 2d2505d449 bug 12322: SWIFT, update template_zone_ref after update template to swift 
status 12322: resolved fixed
 2011-12-21 11:20:38 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao 
status 12337: resolved fixed
reviewed-by: Abhi
 2011-12-20 19:28:41 +05:30
kishan a2ed3fa5e2 bug 12337: encrypt Hidden category config values only 
reviewed-by: Abhi
 2011-12-20 15:07:22 +05:30
kishan cfb48fb7b7 bug 12337: encrypt Hidden category config values only 2011-12-20 13:01:06 +05:30
Alena Prokharchyk 4cb6fcc17a bug 12591: fixed updateDomain 
status 12591: resolved fixed
 2011-12-16 11:54:47 -08:00
Alena Prokharchyk be696bd283 No guest vlan is requried when add public IP range 2011-12-15 14:56:32 -08:00
Prasanna Santhanam dac505194c Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type 2011-12-15 19:12:21 +05:30
Sheng Yang ab50f65ed8 bug 12483: Discard zone's cidr 
status 12483: resolved fixed
 2011-12-14 17:23:24 -08:00
kishan f3cd93f835 bug 11899: Added events for Zone create, update and delete 
status 11899: resolved fixed
reviewed-by: Nitin
 2011-12-13 19:29:44 +05:30
Alena Prokharchyk 3a94a41baf bug 12305: drop max_connections from the network offering as this information is being set on network element level now 
status 12305: resolved fixed
 2011-12-09 09:00:08 -08:00
Alena Prokharchyk bde5e16a26 bug 12453: when networkId is specified, don't check if the network created from Required network offering is present 
status 12453: resolved fixed
 2011-12-08 14:38:21 -08:00
Alena Prokharchyk 9c6a56a61b Fixed NPE in createNetworkOffering with capabilities set 2011-12-06 14:59:32 -08:00
Nitin Mehta 5def0bc567 bug 12129: Disable validation of router.stats.interval in the global configuration since it can have negative values. 
Reviewed by : Kishan.
 2011-12-06 18:35:03 +05:30
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Murali Reddy 974dc62a2b added support for dynamic load balancer provisioning when netscaler SDX is added 2011-12-05 00:06:45 -08:00
Prasanna Santhanam e365e64afe Fixing build. removing windows chars 2011-12-05 10:41:24 +05:30
Abhinandan Prateek c4f624e7c9 bug 8313: ldap authentication, still need to fix the MD5 encoded password, cuurent authenticator only works with plaintext password 2011-12-04 15:11:06 +05:30
Alena Prokharchyk 7ea6082f22 PhysicalNetworkId is not required in listNetworkServiceProvider call 2011-11-29 10:47:03 -08:00
Alena Prokharchyk 6e3cbaab6f SecurityGroupProvider is added automatically in Disabled state during the zone creation 2011-11-29 10:13:02 -08:00
Alena Prokharchyk ecd7004f15 bug 11978: don't allow passing -, + and spaces for instance.name config param 
status 11978: resolved fixed
 2011-11-28 11:52:46 -08:00
Alena Prokharchyk 102f460458 Fixed updateConfiguration - updateHostDetails used to swallow the exceptions 2011-11-28 11:52:45 -08:00
Alena Prokharchyk 74f217e1d0 Introduced new parameter to listNetworkOfferings API - sourceNatEnabled (Boolean). 2011-11-22 10:54:29 -08:00
prachi 6dc4ae47db Bug 12103: Adding host without labelling guest network fails 
We do not set the default network labels as 'cloud-private' anymore. Instead it is set to the values set in global config variable. This should avoid the host connect failures requiring the network labels to be setup.
 2011-11-21 14:46:02 -08:00
Alena Prokharchyk 1871de3048 bug 11853: better error message when try to add VPN user with duplicated user name 
status 11853: resolved fixed
 2011-11-18 15:49:18 -08:00
Alena Prokharchyk 5ea4133d7b createNetworkOffering: verify that individual services can be enabled for each provider specified for the network offering 2011-11-18 14:46:10 -08:00
Alena Prokharchyk 337c07c0d1 Default gateway service to sourceNat service in the API 2011-11-17 16:28:10 -08:00
Alena Prokharchyk 339e72d414 Introduced "supportedServices" parameter to createNetworkOffering API. This parameter replaces old parameters: dhcpService, gatewayService, etc. 2011-11-16 11:17:07 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
prachi d7ae15beea - Fixed missing UUId in listNetworkServiceProviders API 
- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone.
 2011-11-14 17:39:09 -08:00
Alena Prokharchyk 87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk daec18b4ae All default network offerings come as Enabled by default 2011-11-11 11:56:10 -08:00
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account - 
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
 2011-11-10 18:34:56 -08:00
Sheng Yang bde1f6d2de Merge branch 'networkasservice' 
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
 2011-11-10 16:36:08 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Sheng Yang 4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Murali Reddy 53a636518f NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map 2011-11-09 18:44:18 -08:00
Sheng Yang 47114af94b NaaS: Add redundant capability for Gateway service 2011-11-09 17:09:46 -08:00
Sheng Yang d6d878c250 NaaS: Refactor capability map of network offering 2011-11-09 17:09:30 -08:00
Murali Reddy aaf3b99228 NAAS: fixing NPE in createnetworkoffering with out service capabilities specified 2011-11-09 11:51:04 -08:00
Murali Reddy db991dd8f6 NAAS : adding support for service capabilities to be specified as part of network offering 2011-11-08 13:01:44 -08:00
Alena Prokharchyk 5e6fedb7ff Removed unused code 2011-11-08 10:36:29 -08:00
prachi 810f9e4034 While creating Zone, adding default VirtualRouter provider and instance to the default Physical Network. 
Also adding default trafficTypes to through server-setup.xml
 2011-11-07 14:43:41 -08:00
alena 17a7b7cda4 listNetworkOfferings: added an ability to filter based on the Services supported 2011-11-07 10:53:28 -08:00
alena 7aab227b37 Added one more default network offering - with guestType=Isolated and with DNS/DHCP/USERDATA services supported 2011-11-07 10:50:42 -08:00
prachi 5f93665a30 - Send network labels to hypervisor recource during processConnect 
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
 2011-11-04 17:57:05 -07:00
frank 92edf56ccc Bug 7883 - Add support to allow admins to sort templates, isos, offerings... 
status 7883: resolved fixed
 2011-11-03 10:54:00 -07:00
Sheng Yang 29b19db152 NaaS: Fix createNetworkOffering with multiply service providers 2011-11-02 19:08:49 -07:00
Sheng Yang b646f07f9c NaaS: Add back service offering ID for network offering 
It would be used to adjust service offering of virtual router
 2011-11-02 19:08:37 -07:00
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering. 
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
 2011-11-02 15:44:53 -07:00
Sheng Yang 3fc9b149e4 NaaS: Add portforwarding and staticnat service provider 
Make them service rather than capability of firewall. Now firewall only means
open/close the port.
 2011-11-02 15:18:39 -07:00
alena 4ce2bf2f89 SourceNat service is supported for Isolated network offerings only 2011-11-02 11:52:23 -07:00
prachi 6aa743165a Changes to support Enable/ Disable services of a service provider added to physical network: 
- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider.
 2011-11-01 18:03:55 -07:00
alena 2250dff349 1) Removed tags from the network object 
2) Get hypervisor tags from the physical network instead.
 2011-11-01 17:42:06 -07:00
alena be21a5e37c Don't allow enabling securityGroup service for Isolated networks 2011-11-01 13:09:14 -07:00
kishan b1f78bca25 bug 5822, 10783: Use encryption/decryption for queries which use sql directly 
status 5822, 10783: resolved fixed
 2011-11-01 19:30:00 +05:30
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
prachi 818df189c5 changes to Create Vlan & Public IPs 2011-10-31 09:53:25 -07:00
alena 7b982efeaa Fixed Advance zone creation with security group enabled 2011-10-28 10:24:37 -07:00
prachi 1583211352 Fixing build after removing physicalNetworkId from createvlanIpRangeCmd 2011-10-27 17:42:42 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
Nitin 70aae9666b bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows. 2011-10-27 11:23:26 +05:30
anthony b91dce4f8a Swift: add listtemplate for swift 
add swift configuration
 2011-10-25 20:21:27 -07:00
prachi 809f9d965e Fixed NetworkMgr: getNetworkCapabilities. 
The key used to get the capabilities from the provider capabilities map was wrong.
 2011-10-25 18:51:20 -07:00
alena 525a0a7675 1)Changed implementation for restart network: call shutdown/implement methods as a part of it 
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
 2011-10-25 18:24:24 -07:00
prachi 766c898504 Changes: DeletePhysicalNetwork changes and Configuring NetworkMgr to hold map of providers -> elements 2011-10-24 18:03:18 -07:00
alena 75c8e33226 Removed guestIpType from network/networkOffering 2011-10-24 17:05:00 -07:00
alena abca3dda9d Added ability to list network offerings availabe for network upgrade using listNetworkOfferings command with "networkId" parameter. 
Limitations:

* can't upgrade to the network offering with lesser number of services
* can upgrade only when the service provider of the original offering is not external (domR, dhcp, elb) to the external type of the provider
 2011-10-21 15:36:01 -07:00
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
prachi 654eaec663 NAAS: Configuring Zone 
- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes
 2011-10-19 22:44:03 -07:00
alena c5acad39d9 Make Guest Direct security group enabled network offering system by default - we'll make it non-system after getting rid of Basic/Advance zone concepts 2011-10-19 17:34:21 -07:00
alena ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
alena 2d228dfcbb Default service provider to VirtualRouter (should make this parameter configurable in the future) 2011-10-12 18:02:35 -07:00
alena 7433d5314a 1) Refactored networkOfferings: 
* moved all services to the separate table, map them to the network_offering+provider.
* added state/securityGroupEnabled properties for the networkOffering
* added ability to list by state/securityGroupEnabled in listNetworkOfferings api command

2) New service: SourceNat
 2011-10-12 16:38:59 -07:00
Sheng Yang 30d48c40b3 Network as a service(NaaS): Separate redundant virtual router as a standalone element 
Since we would introduce a way to specify each service provider in the network
offering, it's better for redundant virtual router as a separate service
provider.

Also isRedundant() flag in the network offering would be removed. Redundant
virtual router temporality won't work from now. Until we're able to add
different network elements/service providers in network_offering.
 2011-10-10 15:41:07 -07:00
alena a17570ef51 1)Implemented Suspend/Activate project 
2)Email/token based invitation system
 2011-10-06 16:10:36 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account 
2) Added "Project" limit type for the Domain object
 2011-09-21 17:09:49 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature: 
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
 2011-09-20 18:35:28 -07:00
alena f6a79c603f bug 11036: resource count update is refactored 
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
 2011-09-13 10:47:36 -07:00
alena 47d9cbd2ee bug 11331: allow extending vnet range as a part of updateZone call 
status 11331: resolved fixed
 2011-09-06 17:40:28 -07:00
alena 35b551a199 bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
frank 85f18ff256 fix build, add test rpm back 2011-08-24 13:24:51 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
alena 31a022c720 Added networkRate parameter to createServiceOffering api command 
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2011-08-22 12:05:34 -07:00
alena 033765f93f Added networkRate parameter to createServiceOffering api command 2011-08-22 12:02:08 -07:00
anthony e5e85d05e9 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
 2011-08-09 19:51:32 -07:00
anthony 33b3e02c17 bug 10695: add XCP 1.0 support 
status 10695: resolved fixed
 2011-08-09 19:49:12 -07:00
Abhinandan Prateek bf0e761be1 checking domain list syntax 2011-08-03 14:45:23 +05:30
Abhinandan Prateek f6303c13fb bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:42:29 +05:30
Abhinandan Prateek cd78c5cb9b bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:32:28 +05:30
alena 8d47c53735 Revert "bug 10435: removed vpn feature" 
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2011-08-02 18:12:57 -07:00
Abhinandan Prateek 70b9769bd5 putting a check for domain name list 2011-08-02 15:22:49 +05:30
Abhinandan Prateek 5cb3882349 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:23:33 +05:30
Abhinandan Prateek 46be774ce8 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:08:24 +05:30
alena d6112b1632 Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks" 
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-07-21 16:04:55 -07:00
Alex Huang abd3321077 bug 10799: propagate to 2.2.9 2011-07-21 11:30:03 -07:00
Alex Huang f82aa97273 bug 10799: propagate to main 2011-07-21 11:27:10 -07:00
alena 36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
alena e2eac341a4 bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all" 
status 10710: resolved fixed

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/db/schema-228to229.sql
 2011-07-19 10:33:34 -07:00
anthony 10f1499438 bug 10680: changing guest.network.device in global config also change existing hosts guest.network.device, reconnect will use network information in host_details 
status 10680: resolved fixed
 2011-07-15 18:20:16 -07:00
anthony 4a30f38dd4 bug 10680: changing guest.network.device in global config also change existing hosts guest.network.device, reconnect will use network information in host_details 
status 10680: resolved fixed
 2011-07-15 18:17:53 -07:00
alena 0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
alena 731c3bc20a bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all" 
status 10710: resolved fixed
 2011-07-14 16:28:13 -07:00
alena 1979d1d065 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2011-07-13 18:25:13 -07:00
alena 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed
 2011-07-13 17:16:07 -07:00
alena 9be9a970c9 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-06 16:57:19 -07:00
alena 74f34a0e0c bug 10435: removed vpn feature 
status 10435: resolved fixed
 2011-06-24 09:18:46 -07:00
Sheng Yang 0d750dacc2 bug 10311: Update create network_offering API 2011-06-22 15:30:39 -07:00
alena 2e3fff5b94 bug 10219: Untagged vlan ranges in Public network should have the same subnet 
status 10219: resolved fixed
 2011-06-20 16:17:34 -07:00
alena bc1d199353 bug 10219: Untagged vlan ranges in Public network should have the same subnet 
status 10219: resolved fixed
 2011-06-20 16:15:37 -07:00
Abhinandan Prateek 79e38f0a1f bug 10305: for a systemvm only applicable system vm offering should be displayed 
status 10305: resolved fixed
While creating a system vm offering specify the type. If no type specified the default to domainrouter.
While requesting a set of system offering specify the paramter systemvmtype.
 2011-06-20 20:11:50 +05:30
Abhinandan Prateek 976aab77bb bug 10305: for a systemvm only applicable system vm offering should be displayed 
status 10305: resolved fixed
While creating a system vm offering specify the type. If no type specified the default to domainrouter.
While requesting a set of system offering specify the paramter systemvmtype.
 2011-06-20 20:01:40 +05:30
Abhinandan Prateek 30ba637a04 bug 10313: on trying to delete a default offering throw error 2011-06-19 15:12:16 +05:30
Abhinandan Prateek 94a278a638 bug 10313: on trying to delete a default offering throw error 2011-06-19 15:07:45 +05:30
kishan 7a810d1df1 bug 7451: Added network offering action events 
status 7451: resolved fixed
 2011-06-15 16:56:18 +05:30
kishan 2c24002de9 bug 8699: Added event for glabal config update 
status 8699: resolved fixed
 2011-06-15 12:40:23 +05:30
kishan 8ae65de6b3 bug 8699: Added event for glabal config update 
status 8699: resolved fixed
 2011-06-13 15:34:27 +05:30
alena e74fef711c bug 9655: removed restriction for Direct networks - now can create 2 networks with diff vlans and the same subnet 
status 9655: resolved fixed
 2011-06-10 10:40:26 -07:00
alena c66c3c5bf0 bug 9655: removed restriction for Direct networks - now can create 2 networks with diff vlans and the same subnet 
status 9655: resolved fixed
 2011-06-10 10:39:00 -07:00
alena f06818704b Revert "bug 10199: don't allow network offering Name modification." 
This reverts commit 97f2b9936a8b9e3a057116d327b058253458b4ef.

Use the following solution instead:

* add unique_name field to the network_offerings table. Use this filed as a unique offering identifier in the code
* Added db upgrade steps to 225to226 sql script

Conflicts:

	server/src/com/cloud/offerings/NetworkOfferingVO.java
 2011-06-09 13:34:50 -07:00
alena 4fdb6186af Revert "bug 10199: don't allow network offering Name modification." 
This reverts commit 97f2b9936a8b9e3a057116d327b058253458b4ef.

Use the following solution instead:

* add unique_name field to the network_offerings table. Use this filed as a unique offering identifier in the code
* Added db upgrade steps to 225to226 sql script
 2011-06-09 13:32:53 -07:00
alena 8180e55469 bug 10199: don't allow network offering Name modification. 
UI has to be fixed as well
 2011-06-09 10:05:28 -07:00
alena c57248aa4e bug 10199: don't allow network offering Name modification. 
UI has to be fixed as well
 2011-06-08 17:42:04 -07:00
Sheng Yang 62ac899091 bug 9154: Initial check in for enabling redundant virtual router 
This patch enable redundant virtual routers.

1. To enable this feature, db need to be updated using follow SQL by now(we
would get a UI way later):

UPDATE network_offerings SET redundant_router=1 WHERE guest_type="Virtual" AND
system_only=0;

2. System would try to start up two routers at different hosts. But if there is
only one host in the zone, system would start up two routers on it.

3. The failover part is using keepalived, and connection tracking part is using
conntrackd. There would be one master router and one backup router. The status
of router(master or backup) can be query from the database table domain_router
now. Management server would update the status every 30s by default.

4. The routers for the same zone would use same external NIC(same ip and mac).
The script used for fail-over would ensure only one external NIC present in the
network at any time.

5. Currently management server don't got the ability to stop one of router is
both of them reported as master. The feature is in the todo list.

After two routers start up, disconnect anyone of them, the guest network
shouldn't be affected, and established connection(http, ssh, etc.) should still
works. The fail-over on gateway part should be 3~4 seconds.

Currently the patch works with KVM. Would deal with vmware and XenServer soon.
 2011-06-07 14:47:45 -07:00