Commit Graph

140 Commits

Author SHA1 Message Date
Sheng Yang 3de3fc69d2 NaaS: Implement shutdownProviderInstances for virtual router 2011-11-03 13:44:26 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena 75c8e33226 Removed guestIpType from network/networkOffering 2011-10-24 17:05:00 -07:00
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
alena 12e25fb988 Implemented vm* api commands to be executed against the project 2011-09-29 10:20:51 -07:00
Abhinandan Prateek 83c6cf3db0 bug 10588: code to sync VM state at cluster level and dettached from ping command 2011-09-27 13:18:21 +05:30
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
kishan f9d5a46871 Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug 2011-09-05 18:41:42 +05:30
alena b93318cb73 bug 11002: userVmDao - create searchBuilder as a part of dao init process (otherwise it's not threadsafe)
status 11002: resolved fixed
2011-09-02 15:51:52 -07:00
alena ecd99ad379 bug 11332: don't try to log vm's information when the vm is already Expunged
status 11332: resolved fixed

Conflicts:

	server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
2011-09-02 12:08:39 -07:00
Abhinandan Prateek cd01f7dab2 bug 11181: taking care of a boundary condition with 0 user VM 2011-08-25 15:38:48 +05:30
root 01044c5b2d removing spurious debug statement 2011-08-24 16:47:29 +05:30
Abhinandan Prateek bd439831ad bug 11181: batching the select statements 2011-08-24 16:34:28 +05:30
alena d3eb9db7fa bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
status 11204: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
prachi 40d348ff8b Bug 11213 - UserConcentratedPod returning wrong list of pods
Changes:
- Needed to add parentheses to the query to get correct results.
2011-08-23 11:53:48 -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
Abhinandan Prateek 8d4c7208a4 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:23:49 +05:30
Abhinandan Prateek 601708c3e6 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:21:03 +05:30
Sheng Yang 843e41752f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:23 -07:00
Sheng Yang a961dd913f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:13 -07:00
alena 441d9d765c bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:04:11 -07:00
alena 6291554576 bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:03:53 -07:00
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
Chiradeep Vittal 68a450b5a4 initialize search builder 2011-08-05 12:26:15 -07:00
Abhinandan Prateek 59d5080718 bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:18:42 +05:30
Abhinandan Prateek 415db5a126 bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:16:39 +05:30
Abhinandan Prateek 51e43be06c bug 10969: name of VM is instance name, instead of display name
status 10969: resolved fixed
2011-08-05 13:14:28 +05:30
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
anthony 37dcec77bb Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-08-02 17:31:36 -07:00
anthony dc7ff2b5ad Bug 10197:
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
2011-08-02 16:52:24 -07:00
alena bdbc16f081 bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
status 10938: resolved fixed
2011-08-02 16:14:20 -07:00
alena 21afd1785a bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
status 10938: resolved fixed
2011-08-02 16:10:23 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Chiradeep Vittal 07c2f6cdc7 differentiate between dhcp server and elb vm 2011-07-27 12:00:07 -07:00
alena 3167c49687 bug 10736: when deploy vm in Basic zone, 1) send vmData/Password info to the Dhcp running in the same pod 2) send dhcp information to all pods in the system only when network.dns.basiczone.updates has "all" value
status 10736: resolved fixed
2011-07-20 16:50:58 -07:00
alena 19f7c9e26f Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call 2011-07-19 10:33:34 -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
Sheng Yang 978b2640e2 Backport VirtualNetworkApplianceManager
Also:
1. Discard VPN related change.
2. Add network.dns.basiczone.updates in Config.java
3. Add findByNetworkOutsideThePod() for DomainRouterVO

Tested with VLAN and basic mode, works.

Disable redundant virtual router temporaily, would enable it after more testing.
2011-07-18 18:30:05 -07:00
Sheng Yang 4bc8686513 bug 10429: Backport redundant virtual router
Part 1

This backport contained:

commit 52317c718c25111c2535657139b541db0c9d1e1f
    bug 9154: Initial check in for enabling redundant virtual router

commit 54199112055d754371bfb141168fb5538bf6d6ea
    Add host verification for CheckRouterCommand

commit cef978a228c90056ead9be10cbc4de74c2b8de76
    Fix CheckRouterAnswer's isMaster report

commit 4072f0a6991ac3b63601a1764fbe14188965f62f
    Some build fixes and code refactoring for redundant router

commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
    Redundant Router: Fix OVS

commit 6a228830e7c46d819fa0c3317e159e041337e887
    Fix findByNetwork()/findByNetworkAndPod()'s return

commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
    Redundant Router: Fix isVmAlive()

commit e1275d2514adc41f8744f5107d4069c38be195f1
    Only issue CheckRouterCommand to redundant routers

And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes

in the master branch.
2011-07-18 18:29:56 -07:00
Kelven Yang 1081a3cfaa bug 10732: fix console proxy assignment issue 2011-07-14 21:56:34 -07:00
Kelven Yang 028d235716 bug 10732: fix console proxy assignment issue 2011-07-14 21:52:16 -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 1acfa6013d Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call 2011-07-11 18:26:15 -07:00
alena 80ede648e3 bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
status 10629: resolved fixed
2011-07-07 15:48:02 -07:00
alena b92abc5333 bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
status 10629: resolved fixed
2011-07-07 15:42:44 -07:00
Abhinandan Prateek 2aa1f3e596 bug 10570: fixed ISO id and name
status 10570: resolved fixed
2011-07-06 11:26:10 +05:30
Abhinandan Prateek c62ad3d11a bug 10570: fixed ISO id and name
status 10570: resolved fixed
2011-07-06 11:23:23 +05:30
Kelven Yang 7e6e097b58 bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue 2011-07-01 14:09:58 -07:00
Kelven Yang 3b46e7c695 bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue 2011-07-01 14:02:09 -07:00
Abhinandan Prateek 2a2611d6f6 group id is optional 2011-07-01 13:20:57 +05:30