702 Commits

Author SHA1 Message Date
alena
c4efac2083 Added back changed reverted by merge 2011-09-13 11:19:48 -07:00
anthony
162e5cf50a storage_ip_address in host table can be NULL 2011-09-13 11:15:47 -07:00
anthony
7da10dc158 bug 11403:
use unique_name to do update
2011-09-13 11:08:27 -07:00
kishan
d2293137c7 bug 11199: Moved DB upgrade changes to schema-2211to2212-premium
status 11199: resolved fixed
2011-09-13 23:28:54 +05:30
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
kishan
7840302c70 bug 11199: Added indexes to upgarde 2211 to 2212 script
status 11199: resolved fixed
2011-09-13 18:01:51 +05:30
kishan
1b44c0c8f5 bug 11199: Added indexes to tables in cloud_usage DB in create-schema-premium.sql
status 11199: resolved fixed
2011-09-13 17:57:21 +05:30
Edison Su
d461cfbf1b fix security group rule which not get updated into db, and simulator agents reports the wrong security group to mgt server 2011-09-12 19:09:41 -07:00
Chiradeep Vittal
fae5e84699 if the xenserver host cannot do bridge firewalling do not attempt to retry the security rule updat
change some logs to debug level
2011-09-12 18:20:24 -07:00
Chiradeep Vittal
d03c5af720 make instance_id unique to allow usage of ON DUPLICATE KEY
useful logging

Reduce batch size to 16 to avoid sql errors

try using multi inserts to overcome deadlock during batch update
2011-09-12 18:20:23 -07:00
Chiradeep Vittal
e216686029 Revert "bug 10617: Intermediate checking"
revert pending review

This reverts commit 561b27565512d438db3d8896df6f97b644b0b498.
2011-09-12 14:45:58 -07:00
Nitin
cbe996e1ce bug 11403: Making hypervisor_type of xs-tools.iso (id=200) as XenServer. Made the corresponding DB changes as well. 2011-09-13 03:07:32 +05:30
Prasanna Santhanam
53b8b99d57 * Added indexes to some of the mock tables
* Moving the mocksecurityrules to Memory
(cherry picked from commit 76b07b040fc62a4f56e85a2d113eec8e4dc60c54)
2011-09-12 17:09:21 +05:30
alena
5a67bfd7f0 bug 11393: insert agent.lb.enabled config parameter (if doesn't exist) as a part of db upgrade
status 11393: resolved fixed
2011-09-09 14:06:11 -07:00
Naredula Janardhana Reddy
f9b0962ad9 bug 10617: Intermediate checking
Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.

   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm
2011-09-09 18:14:19 +05:30
kishan
4e663bbef9 bug 8338: Added usage.aggregation.range parameter. Also included in 2211 to 2212 upgrade 2011-09-09 13:43:13 +05:30
prachi
bd09e70509 Bug 11200 - maximum number of guests per host
Changes to schema file to insert default records in hypervisor_capabilities table.
2011-09-08 18:23:37 -07:00
Kelven Yang
048dc4eb62 bug 11381: Set HypervisorVersion to StartupRoutingCommand when a VMWare host connects 2011-09-08 17:04:48 -07:00
Kelven Yang
aa7f06d7eb bug 11384: deprecate vmware.guest.nic.device.type global configuration variable 2011-09-08 16:11:17 -07:00
Kelven Yang
f70958809b bug 11360: make user_vm_details generic to all VMs instead of user-only VMs, VM details info will be carried down to hypervisor resource 2011-09-07 15:42:40 -07:00
prachi
84868b7f9c Bug 11200 - maximum number of guests per host
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
2011-09-07 14:53:05 -07:00
alena
b883b25a12 bug 11348: make content type for "json" files configurable
status 11348: resolved fixed
2011-09-07 14:22:01 -07:00
alena
6dfd2f280b 1) More logging to cloud-sysvmadm script - to give the user better details on which domR is being restarted at the moment
2) When domR is executed in parallel thread, make sure that the thread "exit 0" after the restart is done
2011-09-06 16:11:17 -07:00
alena
fb01f58bcb bug 11329: changed default number of parallel threads to be 10 in cloud-sysvmadm
status 11329: resolved fixed
2011-09-06 11:31:50 -07:00
alena
8fb76e747e bug 11321: update vms in obsolete "Creating" state to "Error" state.
status 11321: resolved fixed
2011-09-02 17:30:50 -07:00
kishan
8d5e7ff659 bug 11316: In 2.2.y, removed new template upgrade changes. Added upgrade path from 2210 to 2211. Moved existing changes to 2211to2212
status 11316: resolved fixed
2011-08-31 15:16:12 +05:30
kishan
2ff1e4f92a bug 11316: Removed new template upgrade changes. Added upgrade path from 2210 to 2211. Existing changes moved to 2211to2212 upgrade
status 1316: resolved fixed
2011-08-31 14:19:20 +05:30
alena
0b95ad2f0f bug 11290: insert VPN config values as a part of 229-2210 upgrade
status 11290: resolved fixed
2011-08-29 11:22:42 -07:00
Naredula Janardhana Reddy
db0d6329d8 bug 11253:
Added New value "link-local" to global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
            global - stats visible from public network
            guest-network - stats visible only to guestnetwork.
            link-local - stats visible only to link local network.
            disabled - stats disabled.
2011-08-26 15:21:49 +05:30
Naredula Janardhana Reddy
cbed4c7a44 bug 11253:
Added New value "link-local"  to  global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
       global -  stats visible from public network
       guest-network - stats visible only to guestnetwork.
       link-local - stats visible only to link local network
       disabled - stats disabled.
2011-08-26 15:21:29 +05:30
alena
a11b7de9fe Set firewall.rule.ui.enabled to false by default
Conflicts:

	server/src/com/cloud/configuration/Config.java
2011-08-25 16:12:55 -07:00
Kelven Yang
97a7dddf7d bug 11162: support memory overprovisioning in VMware 2011-08-25 15:38:28 -07:00
prachi
05440f0905 Bug 9921 - template tags
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
2011-08-25 12:03:59 -07:00
Naredula Janardhana Reddy
145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
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