Commit Graph

718 Commits

Author SHA1 Message Date
Naredula Janardhana Reddy 4169be9e49 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces)
Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-24 13:28:48 +05:30
frank b3478c377e Full opensource 2011-08-23 19:52:19 -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
Naredula Janardhana Reddy 4369b0ba96 bug 1067:
- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules.
2011-08-19 11:10:16 +05:30
Edison Su e8a62cc4a9 add security table 2011-08-18 11:38:26 -07:00
Edison Su bdb325609d simulate more commands 2011-08-18 11:38:18 -07:00
Edison Su df6bee4061 add template for simulator 2011-08-18 11:37:50 -07:00
Edison Su 1cf4db7276 add security table 2011-08-16 10:30:52 -07:00
Edison Su 3dc2e0a919 simulate more commands 2011-08-16 10:30:52 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
kishan 1b6f583748 Added sql queries and script to update new template and restart networks 2011-08-16 19:51:11 +05:30
kishan db6c0e810b Added sql queries and script to update new template and restart networks 2011-08-16 19:42:51 +05:30
alena 5fcc2616a1 bug 11120: elb/load balancer config values should be the part of 229 to 2210 db upgrade, not 228 to 229
status 11120: resolved fixed
2011-08-15 10:20:35 -07:00
alena 803255b0ba bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now
status 11029: resolved fixed

Commit also includes the following:

* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule
2011-08-15 10:18:09 -07:00
alena 6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
alena f521b6844d Revert "Network_domain is supported in nectarine 2.2.8, so adding corresponding db upgrade step to 228-229 upgrade"
This reverts commit bc43d5ba5c6b329f39b2ab89256c381e3ca677f6.

Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-09 15:07:21 -07:00
Kelven Yang eb28549e6c Seperate template cleanup control to enable template preloading 2011-08-09 13:42:50 -07:00
Kelven Yang fe9ccf33b5 Seperate template cleanup control to enable template preloading 2011-08-09 13:38:27 -07:00
Chiradeep Vittal 924961d898 merge nectarine 2011-08-08 21:45:37 -07:00
alena 06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -07:00
Kelven Yang 02e64f90de Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:45:47 -07:00
Kelven Yang 39a3d82f11 Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:37:26 -07:00
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
Chiradeep Vittal 52e8d5c4da bug 11005: upgrade must enable lb on system guest network 2011-08-05 23:21:23 -07:00
alena cb9998be53 Network_domain is supported in nectarine 2.2.8, so adding corresponding db upgrade step to 228-229 upgrade 2011-08-05 21:43:29 -07:00
Chiradeep Vittal 1e82b65983 Ensure upgrade picks up new db configs 2011-08-05 18:13:52 -07:00
anthony fb46a7f1d6 bug 10849: storage ip is not require NOT NULL
status 10849: resolved fixed
2011-08-05 11:27:02 -07:00
anthony 355be3a417 bug 10849: storage ip is not require NOT NULL
status 10849: resolved fixed
2011-08-05 11:26:10 -07:00
Nitin f6e2669a6e bug 9345: Remove pool_id from template_host_ref. Add upgrade changes for the same.
status 9345: resolved fixed
2011-08-05 13:49:55 +05:30
Chiradeep Vittal a671a78da4 handle upgrade from 2.2.8 2011-08-04 23:13:21 -07:00
Sheng Yang 38366074c9 Add some default values for 2.2.9-2.2.10 scheme 2011-08-04 12:10:56 -07:00
Sheng Yang 63e67c21d3 Add some default values for 2.2.9-2.2.10 scheme 2011-08-04 12:10:08 -07:00
anthony 2d23ce6dd1 Bug 10197: DB upgrade 2011-08-04 10:58:19 -07:00
anthony 94855b688f Bug 10197: DB upgrade 2011-08-04 10:52:28 -07:00
alena 294e30d7c2 Merged 228-229 db upgrade from 228 branch 2011-08-04 10:19:23 -07:00
alena 3d0758691f bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed

Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-04 10:01:06 -07:00
Nitin a3cb6d9a09 bug 9345: Remove pool_id from template_host_ref. Its not needed anymore. Also removed the unwarranted code.
status 9345: resolved fixed
2011-08-04 12:51:35 +05:30
alena dfd0d7730e bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed
2011-08-03 20:47:44 -07:00
alena 527c3b024f bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed
2011-08-03 20:46:33 -07:00
Sheng Yang 7f859cf30f Update scheme-229to2210.sql to reflect redundant virtual router change 2011-08-03 17:33:53 -07:00
Sheng Yang 13e7c5f3d4 Update scheme-229to2210.sql to reflect redundant virtual router change 2011-08-03 17:06:06 -07:00
keshav 34a0c44f4f Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs. 2011-08-03 16:10:20 -07:00
alena 603de56c93 Merged fixes for 228-229 upgrade from 2.2.8 zucchini branch 2011-08-03 10:39:02 -07:00
alena 21a98e8457 Added missing config value to 229 to 2210 upgrade 2011-08-03 10:35:32 -07:00
alena a7bc955822 Added missing config value to 229 to 2210 upgrade 2011-08-03 10:35:06 -07:00
alena da4b39279d Added 229 to 2210 upgrade path
Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	setup/db/db/schema-228to229.sql
2011-08-03 10:23:27 -07:00
Abhinandan Prateek 7e727be42c bug 10748: use external dnses if set thru global config (dhcp otpion 6) 2011-08-03 12:34:02 +05:30
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Abhinandan Prateek 2f804dd799 bug 10748: use external dns, configurable thru global param 2011-08-02 16:21:55 +05:30
Abhinandan Prateek 9009026eba bug 10748: use external dns
status 10748: resolved fixed
2011-08-02 15:35:13 +05:30
Alex Huang f150f68128 sg improvements 2011-08-01 22:09:41 -07:00
alena f73c2695a1 bug 10927: instance_id is foreign key, not index, in port_forwarding_rules table 2011-08-01 17:25:25 -07:00
alena 5ffaed128d bug 10927: added index for Removed field in create-schema 2011-08-01 17:11:59 -07:00
alena 1d5543ec79 Removed the key from upgrade-228-229.sql as we are adding it as a part of java code
Fixed the typo in 2.2.8 to 2.2.9 upgrade
2011-08-01 17:00:06 -07:00
Alex Huang 270303e525 bug 10927: missing indexes in upgrade script 2011-08-01 16:19:22 -07:00
alena 333e435fc5 bug 10927: added missing constraint to firewall_rules_cidr table 2011-08-01 15:52:44 -07:00
alena d30fe74794 Added 229 to 2210 upgrade path 2011-08-01 15:42:16 -07:00
alena 52f1a58fc6 bug 10927: removed network_domain for account/domain as this feature is not in 2.2.9, but in 2.2.10
Conflicts:

	setup/db/db/schema-228to229.sql

Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-01 15:32:24 -07:00
alena 38db7a45dd bug 10927: removed network_domain for account/domain as this feature is not in 2.2.9, but in 2.2.10
Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-01 15:31:16 -07:00
alena f48efae77c bug 10927: removed network_domain for account/domain as this feature is not in 2.2.9, but in 2.2.10 2011-08-01 15:14:12 -07:00
frank 03fbe13f58 Add upgrade path to 2.2.9
Add files
2011-07-29 20:05:50 -07:00
frank 44f3ac98f6 A couple of things:
add 229 upgrade path

Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8 (edit)

run checker before any components loaded
2011-07-29 20:05:50 -07:00
Chiradeep Vittal fae6fa790c ELB VM: implement delete LB by deleting ELB vm
in the future we will manage a pool of vms more intelligently
2011-07-28 00:15:16 -07:00
Abhinandan Prateek e5b7c89986 bug 10866: putting additional database guard so as to enforce uniqness of cidrs at db level 2011-07-28 10:58:10 +05:30
Abhinandan Prateek 8a8cfe1388 bug 10866: Putting additional unique indexs on firewall_rules_cidrs to prevent duplicate rules.
Although the code has been tested for duplicate cidrs, the additional table constraint will add a further safegaurd for this condition.
2011-07-28 10:45:24 +05:30
Alex Huang 70e0b54a83 Upgrade scripts for missing indexes 2011-07-27 17:56:16 -07:00
Alex Huang 6fea146903 more index. moved op_lock to memory table to try it 2011-07-27 14:06:40 -07:00
Chiradeep Vittal b829cde18f track ip to vm mapping 2011-07-27 12:00:08 -07:00
Naredula Janardhana Reddy 3d7275f077 bug 10557: updated upgrade script 2011-07-27 14:48:14 +05:30
Naredula Janardhana Reddy e5ebd28743 bug 10557: updated upgrade script 2011-07-27 14:45:04 +05:30
Alex Huang c610925304 moved agent ping to in memory rather than db based 2011-07-25 15:21:06 -07:00
Alex Huang 1b56808be5 brought over agent ping uses the same db connection 2011-07-25 10:57:00 -07:00
Alex Huang d54d7315da added more indexes 2011-07-25 10:04:17 -07:00
Alex Huang b0fdb94f5c added more indexes 2011-07-25 10:03:34 -07:00
Alex Huang 5b39a1b620 added more indexes 2011-07-25 10:02:15 -07:00
Alex Huang 868373c280 more index changes 2011-07-23 13:23:10 -07:00
Alex Huang f4bab3b4db more index changes 2011-07-23 13:11:35 -07:00
Alex Huang 20c8261832 more index changes 2011-07-23 13:07:47 -07:00
Alex Huang da94f29881 missing indexes 2011-07-22 18:54:05 -07:00
Alex Huang 3385792081 missing indexes 2011-07-22 18:53:40 -07:00
Alex Huang c3747878cf missing indexes 2011-07-22 18:52:59 -07:00
Alex Huang ccce718783 added indexes for firewall rules and port forwarding rules 2011-07-22 16:49:42 -07:00
Alex Huang 03716ed5c6 propagate db upgrade 2011-07-22 16:31:59 -07:00
Alex Huang c8fc95e573 propagate db upgrade 2011-07-22 16:31:11 -07:00
Alex Huang 3ecfddf130 Added db upgrade fro the indexes 2011-07-22 16:29:02 -07:00
Alex Huang 91722351db propagate indexes 2011-07-22 14:49:52 -07:00
Alex Huang c1f7bb57b0 propagate indexes 2011-07-22 14:49:08 -07:00
Alex Huang e953ee7045 Added a bunch of indexes for different removed fields 2011-07-22 14:47:10 -07:00
alena 66f879e400 Revert "bug 10373: added config parameter "domain.level.virtual.network" to the db upgrade scripts"
This reverts commit c18e1a020357c0c42454656c070fa4827f8c0703.

Conflicts:

	setup/db/db/schema-228to229.sql
2011-07-21 16:03:01 -07:00
alena b1d5b5a51d 2 fixes for Agent Load Balancer:
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default
2011-07-21 15:43:52 -07:00
alena 307741edcd 2 fixes for Agent Load Balancer:
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default

Conflicts:

	server/src/com/cloud/configuration/Config.java
	setup/db/db/schema-228to229.sql
2011-07-21 15:27:50 -07:00
alena c03d360968 bug 10373: added config parameter "domain.level.virtual.network" to the db upgrade scripts 2011-07-20 18:21:15 -07:00
anthony 9f2eaca6cb Support XenServer 6.0 beta 2011-07-20 16:47:48 -07:00
Alex Huang 37c1401ad3 bug 10756: propagate to 2.2.8.z 2011-07-20 16:43:38 -07:00
anthony bef3b480cd bug 10197:
The step to upgrade xenserver,

1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts

TODO,

1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:44:37 -07:00
anthony 3881e13387 bug 10197:
The step to upgrade xenserver,

1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts

TODO,

1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:26:25 -07:00
alena 8b100f7c4d bug 10409: added domainSuffix parameters to account/domain objects
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-228to229.sql
2011-07-19 11:10:52 -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
Alex Huang c4a1a89388 bug 10756: Removed constraints for the op_host_capacity table. op_host_capacity table is a table that is frequently updated and is only used in the background. There's no real reason for it to maintain data integrity with other tables. This change may introduce problems where data center, cluster, or pod is deleted and there are capacities entries left. However, this really should be in the application logic to do this deletion rather than relying on the database schema. Be sure to test these cases and make sure there are no data left over. 2011-07-19 10:15:46 -07:00
Alex Huang b92208c91c bug 10756: Removed constraints for the op_host_capacity table. op_host_capacity table is a table that is frequently updated and is only used in the background. There's no real reason for it to maintain data integrity with other tables. This change may introduce problems where data center, cluster, or pod is deleted and there are capacities entries left. However, this really should be in the application logic to do this deletion rather than relying on the database schema. Be sure to test these cases and make sure there are no data left over. 2011-07-19 10:15:14 -07:00