apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,322 Commits 304 Branches 324 Tags
Commit Graph

439 Commits

Author SHA1 Message Date
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
Sheng Yang
684a603a6e bug 11307: Add cleanup parameter to restartNetwork command 
Default set it to true. When cleanup=false, restartNetwork would only
re-implement the network, but don't destroy current existed routers.
 2011-09-14 16:23:34 -07:00
alena
45c595d558 Don't update resource count for system account 2011-09-13 16:58:54 -07:00
alena
09f8d8ee4c Fixed the bug when networkRate for the domR's guest network wasn't taken from the service offering 2011-08-30 10:41:17 -07:00
Murali Reddy
9abb544865 bug 6876: netscaler MPX & VPX support 
- adding supprt for Netscaler VPX & MPX load blancers
    - implemented for virtual networking
    - works only with new fetched public IP, inline support is not added yet
 2011-08-30 00:14:05 +05:30
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
alena
e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions. 
status 11236: resolved fixed
 2011-08-24 14:48:35 -07:00
alena
c9e60d703d Fixed listNetwork by id 2011-08-23 01:03:40 -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
0998b04098 Fixed security issue in listNetworks 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-08-22 10:51:44 -07:00
alena
20a518f3ac Fixed security issue in listNetworks 2011-08-22 10:50:30 -07:00
alena
05713a20e8 bug 11114: when release static nat as a part of vm expunge, do searchIncludingRemoved in nics table as the nics are marked as Removed before static nat is released 
status 11114: resolved fixed
 2011-08-15 10:18:45 -07:00
alena
47e8d2b29c Fixed error message 2011-08-15 10:18:44 -07:00
Chiradeep Vittal
51af0db682 mass merge 2.2.10 2011-08-11 16:41:52 -07:00
alena
477e5d6389 bug 10561: reapply static nat on the backend as a part of domR restart and network restart 2011-08-11 11:19:09 -07:00
alena
278f2a401f bug 10561: intermediate checkin for enable/disableStaticNat. 
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
 2011-08-11 10:19:22 -07:00
Sheng Yang
94f93a60c3 Clean up restart Network 2011-08-10 15:02:58 -07:00
Sheng Yang
a9fd65b9c3 Clean up restart Network 2011-08-10 15:02:48 -07:00
Sheng Yang
18f2df44a1 Clean up restart Network 2011-08-10 15:02:08 -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
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
Chiradeep Vittal
8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
Chiradeep Vittal
5552b650ff Merge branch 'guru' into 2.2.8.nectarine 2011-08-05 12:27:47 -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
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
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
alena
e0033c5d9d bug 10869: always allocate first ip address from the range for the dhcp server. 
status 10869: resolved fixed

Here is the flow (design is approved by Will Chan):

1) If user specifies custom ip address, and this ip is not the first ip in the range, the dhcp server gets the ip.
2) If user specifies custom ip address, and this ip is the first ip in the range, the dhcp server will get the random ip address from the range.
2) If user doesn't specify custom ip address, we always try to allocate first ip address from the range for the dhcp server; if this ip is already allocated, the dhcp server will get the random ip from the range.

This will work for:

* domR's Guest network
* dhcp's Direct network
 2011-08-02 17:42:12 -07:00
alena
64eeb8d79b bug 10869: always allocate first ip address from the range for the dhcp server. 
status 10869: resolved fixed

Here is the flow (design is approved by Will Chan):

1) If user specifies custom ip address, and this ip is not the first ip in the range, the dhcp server gets the ip.
2) If user specifies custom ip address, and this ip is the first ip in the range, the dhcp server will get the random ip address from the range.
2) If user doesn't specify custom ip address, we always try to allocate first ip address from the range for the dhcp server; if this ip is already allocated, the dhcp server will get the random ip from the range.

This will work for:

* domR's Guest network
* dhcp's Direct network
 2011-08-02 17:41:03 -07:00
Alex Huang
f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Chiradeep Vittal
56d7be35f1 WIP 2011-07-29 11:04:54 -07:00
Chiradeep Vittal
cd8e069f80 Acquire an ip and launch an ELB vm 2011-07-27 12:00:07 -07:00
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
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
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
Alex Huang
45074e7cba bug 10799: There are two problems. The deadlock was ate up but then the savepublicip call return true, causing the problem with the pod_vlan_map hitting a constraint problem. HostPodDao was used as the scope for the insufficient capacity exception which causes the virtualmachinemanager to not to retry starting the vm. It should have been HostPod instead of HostPodDao. 2011-07-21 11:22:55 -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
alena
36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
alena
1a38c8547d bug 10605: updateNetworks api command - restart the network if networkDomain is updated. 
updateNetwork command is async now

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-07-19 12:09: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
Sheng Yang
3100d4b22f Update RestartNetworkCmd to reimplment the network 
Because the redundant router config may change.

Back port from 8c7c9a4b499ceee8a07f1f3a2b908d4a128aef32 partly.
 2011-07-19 10:53:21 -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
alena
0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
alena
0d2787e2db bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well. 
status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-15 14:20:52 -07:00
alena
864a04ea6d bug 10671: list domain level networks for children domains when domainId is not specified 
status 10671: resolved fixed
 2011-07-08 21:17:32 -07:00
alena
cad925bc6b bug 10671: list domain level networks for children domains when domainId is not specified 
status 10671: resolved fixed
 2011-07-08 21:11:51 -07:00
alena
9db9d3f36f When release public ip address, make a search by ip+networkId instead of ip+accountId as ipAddress is unique in network only. 2011-07-08 15:55:15 -07:00
alena
47f519f5de When release public ip address, make a search by ip+networkId instead of ip+accountId as ipAddress is unique in network only. 2011-07-08 15:47:25 -07:00