6841e265d3
bug 10330: finally merge Rommer's CLVM patch
...
status 10330: resolved fixed
2011-11-02 18:03:58 -07:00
89e45bd671
bug 11130: Add GetDomRVersionCmd
2011-09-29 14:50:11 -07:00
91320e481c
bug 11455: add vpn support in kvm
...
Reviewed-by:Murali.Reddy@citrix.com
2011-09-16 11:16:25 -07:00
3549067d55
bug 11307: Add BumpUpPriorityCommand
2011-09-14 16:22:19 -07:00
b987123daa
bug 11307: Let CheckRouterAnswer() parse the return result
2011-09-14 16:21:33 -07:00
3b423dbc01
fix firwall/nat rule
2011-09-13 18:53:10 -07:00
b3478c377e
Full opensource
2011-08-23 19:52:19 -07:00
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
18f87c2108
Merge branch 'cvm' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
d72200bbfc
If one of the static nat rules failed to apply on the backend, the end result should be false
2011-08-15 10:18:44 -07:00
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
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
501048952d
Revert "bug 11064: add setfirewallrule for kvm"
...
This reverts commit 8b52313bd9fceceb3c4c5ff2b849652cbd37258c.
2011-08-11 09:45:14 -07:00
5a34c9259b
bug 11064: add setfirewallrule for kvm
2011-08-10 16:18:23 -07:00
fde6e7d801
bug 11064: add setfirewallrule for kvm
2011-08-10 16:17:00 -07:00
f24e14d2d9
bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules
2011-08-10 10:43:26 +05:30
cd94e6ac25
bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules
2011-08-09 16:05:20 +05:30
6aaf3d5ae0
Merge branch 'cvm'
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/storage/Storage.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
e3d30c6be6
bug 10946: Add default buffer length for compressed request
...
Then it can support 2.2.8 system vm connection.
status 10946: resolved fixed
2011-08-03 11:54:26 -07:00
cb5e4574f9
bug 10946: Add default buffer length for compressed request
...
Then it can support 2.2.8 system vm connection.
status 10946: resolved fixed
2011-08-03 11:54:11 -07:00
15d57cef9f
bug 10557: implemented the TODO - opening the stats port using iptable
2011-07-28 17:28:20 +05:30
2fc7be14de
bug 10557: implemented the TODO - opening the stats port using iptable
2011-07-28 17:24:10 +05:30
44d4113ae6
bug 10429: backport redundant router
...
Part 2
commit 797839360c65cd348d2eb20630521177ab0919de
bug 9154: redundant virtual router
commit 8ff7f230204d4d3a7a4adee75523a9a84f4276fe
bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB
commit 230b99e9e0b152648f1dd2a5eab6f22315b8e7b4
bug 9154: Add redundant state to DomainRouterResponse
commit ccefb5ff5e83d713798a347c99bce1a0d04b4317
bug 9154: Add router fault state report
commit 7a3090378f9785caecf741b70554f6ea17c41764
bug 9154: Send alert if found two virtual routers in master state
commit 66831056e4bf27665871bccd24e6159071564847
bug 9154: Code clean up
commit bf3f58a85741fa7118bd848a42d8b21baa4478d4
bug 9154: Add isRedundantRouter to DomainRouterResponse
2011-07-18 18:30:02 -07:00
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
0a9dd39a4a
bug 10737: Fix java.nio.BufferOverflowException in decompression
...
Also add unit test for compression/decompression
status 10737: resolved fixed
2011-07-15 18:22:25 -07:00
1dac8f3815
bug 10737: Fix java.nio.BufferOverflowException in decompression
...
Also add unit test for compression/decompression
status 10737: resolved fixed
2011-07-15 18:21:45 -07:00
d09008ff72
bug 10692: Fix the limitation of SSL packet is 16k using compression
2011-07-12 14:50:00 -07:00
8725257f6b
bug 10692: Fix the limitation of SSL packet is 16k using compression
2011-07-12 13:09:52 -07:00
c537d8a00b
more logging for gson
2011-07-11 14:19:35 -07:00
b9d4d65714
more logging to figure out problems with gson
2011-07-11 14:18:12 -07:00
e5994a6485
added logging for the gson error
2011-07-09 10:58:14 -07:00
81475c256b
fix user/meta data: if data is empty, return a blank file, not 404
2011-07-08 13:50:27 -07:00
56bc4f27a9
fix user/meta data: if data is empty, return a blank file, not 404
2011-07-01 12:58:14 -07:00
18dc85c765
Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance)
2011-06-27 10:37:00 -07:00
826f5eedf1
bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
...
status 10447: resolved fixed
2011-06-27 10:37:00 -07:00
41f12eb642
Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance)
2011-06-27 10:20:41 -07:00
0bf34f3612
bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
...
status 10447: resolved fixed
2011-06-27 10:20:40 -07:00
a254e90ab3
Renamed IPAssoc to IpAssoc to be consistent with agent commands
2011-06-21 10:15:42 -07:00
8459ae0beb
Renamed IPAssoc to IpAssoc to be consistent with agent commands
2011-06-21 09:25:29 -07:00
6f0edd9541
bug 9154: Add router fault state report
2011-06-14 20:33:18 -07:00
6c35a97cd8
added check for null
2011-06-14 10:31:03 +05:30
11816a174d
added missing check for null
2011-06-14 10:24:49 +05:30
2688d61a1e
bug 10222: fixed issue with associate ip introduced more than one nic. The problem is that associate ip automatically creates a nic but doesn't have sufficient information to properly creates so it uses what it knows for sure is the naming pattern to do it. However, we changed the naming pattern and it broke. I fixed it by passing all of the information in the ipaddressTO object.
2011-06-11 13:45:28 -07:00
44d15d38b0
bug 10222: fixed issue with associate ip introduced more than one nic. The problem is that associate ip automatically creates a nic but doesn't have sufficient information to properly creates so it uses what it knows for sure is the naming pattern to do it. However, we changed the naming pattern and it broke. I fixed it by passing all of the information in the ipaddressTO object.
2011-06-11 13:45:00 -07:00
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
a0ce3da191
fixed problem with header
2011-06-05 13:51:29 -07:00
d9e0bcfa1e
bug 10126: Renamed getPodId() to getPodIdToDeployIn()
2011-06-03 22:17:08 -07:00
0ab12edd6c
network tagging changes
2011-05-31 09:49:27 -07:00
29db060aee
bug 8115: add source ip filter for kvm
...
status 8115: resolved fixed
2011-05-25 10:39:57 -04:00
Edison Su
Sheng Yang
Edison Su
frank
alena
Abhinandan Prateek
Naredula Janardhana Reddy
Alex Huang