Commit Graph

184 Commits

Author SHA1 Message Date
Sheng Yang b63b3fcf05 Skip the null Host for CheckRouterTask 2011-08-11 14:29:49 -07:00
Sheng Yang f28291cedb Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:48:56 -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 8c70e06572 Fix existed single router network after enable redundant router feature 2011-08-10 18:07:42 -07:00
alena 3c29f00de1 bug 11013: Basic zone setup - pass domRs from other pods to addVirtualMachineToNetwork() method only when network.dns.basiczone.updates is set to "all"
status 11013: resolved fixed
2011-08-10 16:03:48 -07:00
alena 956445960a Throw ResourceUnavailableException when rules/ips fail to apply on the backend 2011-08-10 12:56:25 -07:00
Sheng Yang 6e0eeb132e bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:05:22 -07:00
Sheng Yang 501dc0d9f4 bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:21:28 -07:00
Sheng Yang 15cad8ba8e Revert "Catch domr creation exception"
This reverts commit 2eff1d0eb9e39e4a8d702bb9867b9e95bb276b3e.
2011-08-09 15:57:46 -07:00
Sheng Yang f558f74863 Catch domr creation exception 2011-08-09 15:03:27 -07:00
Sheng Yang 8249c072ee Add more detail log for startVirtualRouter 2011-08-09 11:16:33 -07:00
Sheng Yang 980c4b9120 Change router to FAULT state if anything goes wrong on fail-over 2011-08-09 11:09:20 -07:00
Abhinandan Prateek 311afeae23 bug 10731: reverting back source cidr changes for loadbalancer and portforwarding 2011-08-09 16:01:48 +05:30
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
keshav b8c9205000 Changed findOrCreateDhcpServers() to check if start IP is null before retrieving an IP address object 2011-08-05 17:03:20 -07:00
Sheng Yang 7a3edd74d5 Fix missing lock releasing in VirtualNetworkApplianceManagerImpl.java 2011-08-05 12:14:42 -07:00
Sheng Yang 7638f8e7a7 bug 10991: Determine existing redundant router using both state and host id
Seems in some condition, when a router is stopped, it's host_id != null.

status 10991: resolved fixed
2011-08-05 11:36:35 -07:00
Abhinandan Prateek 0f2a9b6a69 bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 12:02:54 +05:30
Abhinandan Prateek c460a1b80b bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 11:58:48 +05:30
Sheng Yang a46c2cb650 Send CheckRouter command only when router is running 2011-08-03 16:57:43 -07:00
Abhinandan Prateek cd78c5cb9b bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:32:28 +05:30
Abhinandan Prateek 6dd519ddd4 bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:16:08 +05:30
Abhinandan Prateek 7e727be42c bug 10748: use external dnses if set thru global config (dhcp otpion 6) 2011-08-03 12:34:02 +05:30
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
Abhinandan Prateek 9009026eba bug 10748: use external dns
status 10748: resolved fixed
2011-08-02 15:35:13 +05:30
Naredula Janardhana Reddy b3b32fce9b bug 10811: public_hostname and public_ipv4 are set same as that of local_hostname, local_ipv4 only for Basic network 2011-08-02 13:53:26 +05:30
Naredula Janardhana Reddy a790e79f44 bug 10811: public_hostname and public_ipv4 are set same as that of local_hostname, local_ipv4 2011-08-02 13:52:47 +05:30
Abhinandan Prateek 4f3dec5f1c bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:34:38 +05:30
Abhinandan Prateek 46be774ce8 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:08:24 +05:30
Chiradeep Vittal 07c2f6cdc7 differentiate between dhcp server and elb vm 2011-07-27 12:00:07 -07:00
Naredula Janardhana Reddy 3c66075b8b bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config 2011-07-27 14:06:26 +05:30
Naredula Janardhana Reddy 93680fdc9e Bug:10557 2011-07-27 14:05:47 +05:30
Abhinandan Prateek de34d6089d bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables
status 10731: resolved fixed
2011-07-21 13:40:06 +05:30
alena 6dc8e515f4 bug 10736: when restart dhcp in basic zone, generate vmData info only for vms in the same pod 2011-07-20 15:22:11 -07:00
Sheng Yang 8d2e41abd1 bug 10429: Enable redundant virtual router for 2.2.9
status 10429: resolved fixed
2011-07-19 15:06:20 -07:00
Sheng Yang fa623c04e2 bug 10640: Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool
The old strategy is to deploy the second virtual router to diffent host only.

status 10640: resolved fixed
2011-07-19 15:06:15 -07:00
alena d970c13cf2 bug 10417: Basic zone - send vm data info only to the dhcp server in the same pod
status 10417: resolved fixed

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
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 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
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 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 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
status 10681: resolved fixed
2011-07-13 17:16:07 -07:00
Kelven Yang e522ecb3a1 Add data integrity check for Console Proxy/SSVM/Domain Router 2011-07-06 17:22:21 -07:00
alena b2942572e7 bug 10453: fixed NPE in startRouter command - used to happen when domR start was called for existing domR as a part of networkImplement
status 10453: resolved fixed
2011-06-30 11:35:51 -07:00
Alex Huang a59d70e7e4 bug 10375: fixed deadlock issue I think 2011-06-27 10:43:32 -07:00
Alex Huang 97b562fc2a logging changes 2011-06-27 10:18:40 -07:00