Commit Graph

156 Commits

Author SHA1 Message Date
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
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
Abhinandan Prateek 46be774ce8 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:08:24 +05:30
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
alena 74f34a0e0c bug 10435: removed vpn feature
status 10435: resolved fixed
2011-06-24 09:18:46 -07:00
alena 38ffe66b66 bug 10424: send userData information only when vm is in one of the following states: Running, Starting, Stopping, Migrating
status 10424: resolved fixed
2011-06-23 11:06:52 -07:00
Alex Huang 129f40d0cb bug 10375: trying to reduce the scope of the transaction 2011-06-22 16:34:14 -07:00
Alex Huang a254e90ab3 Renamed IPAssoc to IpAssoc to be consistent with agent commands 2011-06-21 10:15:42 -07:00
Abhinandan Prateek 976aab77bb bug 10305: for a systemvm only applicable system vm offering should be displayed
status 10305: resolved fixed
While creating a system vm offering specify the type. If no type specified the default to domainrouter.
While requesting a set of system offering specify the paramter systemvmtype.
2011-06-20 20:01:40 +05:30
Abhinandan Prateek cf15573d06 bug 10313: marking default system offering as default so that they should not be deleted
status 10313: resolved fixed
2011-06-19 12:30:07 +05:30
Alex Huang 3d0b30073e bug 10341: deploying virtual router and deploying dhcp server should not be acquiring locks in lock table 2011-06-17 08:17:13 -07:00
kishan dfd3e128f5 bug 8879: Send network usage command for domain routers in Running state only
status 8879: resolved fixed
2011-06-15 14:17:30 +05:30
kishan ed6809c53d bug 8144: Added event for router start/stop and reboot
status 8144: resolved fixed
2011-06-15 12:40:23 +05:30
Alex Huang 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
Sheng Yang 2971fb32fb bug 9516: Fix network.throttling.rate on DomR other vnifs
It's due to nobody tell getNetworkRate() it's the router who want to get network
throttling rate, then the function failed to follow the policy.

status 9516: resolved fixed
2011-06-10 19:52:59 -07:00
Kelven Yang 5f7f885c6a bug 10214: merge fix from 2.2.4 branch 2011-06-10 12:08:22 -07:00
Alex Huang d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
Abhinandan Prateek 5ad41e09ae bug 7553: Virtual Router service offering 2011-05-21 22:21:12 +05:30
Abhinandan Prateek 770e317218 bug 7553: Virtual Router service offering 2011-05-19 19:18:33 +05:30
keshav 5d5363965d Changed usage code to look up stats by network ID. 2011-05-16 14:41:47 -07:00
kishan d456f89095 bug 8866: Direct Network Usage, TrafficSentinel support added, work in progress 2011-05-12 19:43:47 +05:30
Jessica Wang fe8d81e246 bug 9765: This is NOT an UI bug. This is a server-side bug. UI calls DeployVM API with ServiceOfferingID parameter (NOT ServiceOfferingDescription parameter). Then, server-side gets ServiceOfferingDescription by ServiceOfferingID and send it to DomR WITHTOUT escaping it first. DomR doesn't support full range of unicode character set. Therefore, DomR fails to accept metadata that has non-ascii code (error: "vm_data failed"). This check-in will send Unicode-escaped string of metadata "service-offering", "availability-zone" and "local-hostname" to DomR. Data Consumer of VM-data service needs to unescape the content accordingly. 2011-05-10 17:57:44 -07:00
Alex Huang fba1c95512 bug 9615: Part of the HA cleanup 2011-05-03 16:34:53 -07:00
kishan 77e48b8683 bug 9678: update user statistics in cloud_usage. Send network usage command to routers of virtual network only
status 9678: resolved fixed
2011-05-04 02:38:25 +05:30
Chiradeep Vittal b42ebf4872 Build fixes after first pass at merge 2011-05-03 10:41:31 -07:00
Chiradeep Vittal 303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang 99bc15f64a changed getName to getHostname 2011-04-29 08:34:10 -07:00
kishan 42a9c49712 bug 8866: ignore network usage for system account 2011-04-27 19:44:52 +05:30
kishan 341e553b8a bug 8866: added support for direct network usage tracking using traffic sentinel 2011-04-27 19:03:02 +05:30
alena 4290abb57c bug 9578: when deploy dhcp in Basic zone, put pod information to deploymentPlan
status 9578: resolved fixed
2011-04-26 14:57:40 -07:00
alena 1a6d78eae4 Code cleanup. No need to declare runtime exceptions (CloudRuntimeException, InvalidParameterException, PermissionDenied exceptions) 2011-04-21 16:26:53 -07:00
alena b83456f895 bug 9504: don't send DHCP entry command for Destroyed vm
status 9504: resolved fixed
2011-04-21 14:26:42 -07:00