etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,515 Commits 324 Branches 325 Tags 913 MiB
Commit Graph

685 Commits

Author SHA1 Message Date
Frank e9652e67ad migrate premium to oss 2011-01-28 16:07:46 -08:00
Kelven Yang 4696b16d10 Normalize name convention for vmware hypervisor 2011-01-28 11:16:30 -08:00
alena a267d1c261 Generate usage event when Ip is released as a part of network destroy 2011-01-28 10:58:53 -08:00
keshav b23df4c7e3 Fixed zoneIsConfiguredForExternalNetworking method 2011-01-28 10:56:25 -08:00
keshav c7bccd0b0f Added method to check if a zone is configured for external networking. 2011-01-28 10:42:04 -08:00
alena 620466d393 Network destroy: when release ip addresses assigned to the network, no need to send applyIpAssociations command to the network elements as they are already shutdown. 2011-01-28 10:09:20 -08:00
Frank 65e326c751 ovs -- use VmStateListener to track vm state change 2011-01-27 18:41:06 -08:00
alena 52dd679d95 bug 8185: fixed java part of password reset feature. There are still changes needed in backend scripts (bugs 8253 and 8254 are filed separately) 
status 8185: resolved fixed
 2011-01-27 17:24:09 -08:00
Kelven Yang 3b846961ce Bug 8229: Add finalizeExpunge to VirtualMachineGuru interface to allow overriding cleanup operations at expunging stage 
Status 8229: Resolved Fixed
 2011-01-27 10:29:55 -08:00
alena 77e89b72ca bug 8187: retreive DNS information from DataCenter instead of resetting it for the network. After the DNS is reset, all networks in the zone have to be restarted. Console proxy and secondary vm should be restarted too. 
status 8187: resolved fixed
 2011-01-26 19:08:56 -08:00
alena 402506e8a0 Disable static nat for the IP address when corresponding vm gets expunged 2011-01-26 14:17:08 -08:00
alena a4c5bef188 disableOneToOneNat: generate usage events for all rules (port ranges) that are being removed 2011-01-26 10:31:27 -08:00
alena 731e78937f Added 2 new api commands for 1-1 nat feauture: enable/disableOneToOneNat. Here is the 1-1 nat api summary: 
* to enable 1-1 nat for ip/vm use enalbeOneToOneNat api
* to open port range (or multiple port ranges) use createIpForwardingRule api.
* to delete one port range use deleteIpForwardingRule api.
* to disable 1-1 nat use disableOneToOneNat api.
 2011-01-26 09:35:32 -08:00
Edison Su fc97034000 refactor vmstatelistener 2011-01-26 11:01:43 -05:00
alena 4fdbb00060 Allow to add 1-1 Nat with the same public IP address and different port ranges 2011-01-25 15:31:48 -08:00
alena a96f8f9575 Refactored 1-1 NAT feature: 
* added new fields to createIpForwardingRule api: startPort/protocol - required, endPort is optional
* updated "firewall_rules" table with a new field "is_one_to_one_nat" (being set when new rule is created)
 2011-01-25 14:43:32 -08:00
Kelven Yang 8f138d9330 Remove unused code in ConsoleProxyManager 2011-01-25 11:36:07 -08:00
kishan 16c8111add bug 8122: cover port forwarding rules for usage 
status 8122: resolved fixed
 2011-01-25 19:14:55 +05:30
alena 3a008ee699 Changed restartNetwork command flow: 
* API requires network id to be passed in (it was optional before)
* restartNetwork calls restart() method of all network elements in the system, and it's up to the element to decide which actions to take on the restart (for example, for Virtual Router it's IPAssoc/applyPF/applyLBRules).
 2011-01-24 18:37:57 -08:00
Alex Huang 68464d6f66 removed unused dns 2011-01-24 17:50:32 -08:00
alena 0e4196448a bug 7811: Start domR/Dhcp if it's not running when do userVmReboot 
status 7811: resolved fixed

Other fixes:
* vmExpunge: cleanup LB/PF rules after vm was marked as Expunging in the DB to avoid the situation when user recovers a vm in the middle of expunge job.
 2011-01-24 17:04:23 -08:00
Alex Huang 2466589e2f removed unused domain_router_id from uservm 2011-01-24 16:56:00 -08:00
Alex Huang fc33ef2be2 Removed several unused fields after the refactoring 2011-01-24 16:18:40 -08:00
Frank 38ab26bcb0 ovs tunnel network -- add lock entry in ovs_tunnel_account 2011-01-24 13:47:34 -08:00
Frank 639ddbb45c ovs managers: handle execption along with Alex's convention 2011-01-24 10:06:07 -08:00
alena 6304a92c23 bug 7881: fixed publicIpAllocation to an account. 
status 7881: resolved fixed

Also fixed the issue with account delete when nonSourceNat ip addresses were not being released
 2011-01-24 10:03:18 -08:00
kishan dcd12c213c bug 7951: Added source nat field for ip address usage 
status 7951: resolved fixed
 2011-01-24 17:09:11 +05:30
kishan 956b678ed4 bug 7857: Added netwrork usage create command to router start command 
status 7857: resolved fixed
 2011-01-24 12:20:38 +05:30
Frank 276e37115b open vswitch - Implement gre tunnel based network that doesn't use vlan 
it allows cross zone communication and no 4096 limitation introduced by vlan
 2011-01-21 17:32:02 -08:00
abhishek 0dc959c23f removing guest ip address during ip assoc from java layer 2011-01-21 17:27:13 -08:00
Edison Su d45f5cd5bf bug 8119: don't boot from iso, if iso is dettached 
status 8119: resolved fixed
 2011-01-22 04:04:52 -05:00
Edison Su 4b355ca301 bug 8118: add security group back 
status 8118: resolved fixed
 2011-01-22 04:04:52 -05:00
alena 671cce23ad bug 7704: network_rate is a part of network offering now. It's optional parameter; if not specified - global config param is used. 
status 7704: resolved fixed
 2011-01-21 09:54:27 -08:00
abhishek 31c9cce6c3 bug 7949: changing security group code to use ids instead of name 
status 7949: resolved fixed
 2011-01-20 14:21:32 -08:00
alena a4cfe20db8 bug 7389: implemented listPortForwardingRules by ip/account/domainId. Also fixed broken pagination for this call 
status 7389: resolved fixed
 2011-01-20 11:35:40 -08:00
kishan 94ec7bf27a bug 7842: events refactoring. Still wrok in progress 2011-01-20 21:49:50 +05:30
kishan 8563322993 recommiting usage changes which were erased due to 650fb5221e 2011-01-20 13:36:43 +05:30
alena 3f9e96b08a bug 8035: allow PF rules creation with the same parameters except for the protocol 
status 8035: resolved fixed
 2011-01-19 17:31:59 -08:00
alena 43c0190963 Shutdown the network when it fails to implement 2011-01-19 16:36:23 -08:00
Alex Huang 1d091236e9 removed inaccurate reservation strategy for nics 2011-01-19 12:03:41 -08:00
kishan 88024bea6a bug 6928: throw error when router is not in stopped state while upgrading 
status 6928: resolved fixed
 2011-01-19 16:30:12 +05:30
kishan 1117eff8f9 bug 7069: throw exception when Vm is already assigned to load balancer 
status 7069: resolved fixed
 2011-01-19 16:00:56 +05:30
kishan 1872c941f4 bug 7157: throw insufficient capacity exception when public Ips are exhausted 
status 7157: resolved fixed
 2011-01-19 15:33:42 +05:30
kishan fa2ae5793a bug 7341: introduced search by id and vmId for listIpForwardingRules 
status 7341: resolved fixed
 2011-01-19 13:13:09 +05:30
alena 4c697304ec Fixed release() method to use correct Nic state 2011-01-18 20:01:01 -08:00
alena 632d3c67f1 bug 6689: release source nat ip address as a part of domR/dhcp destroy 
status 6689: resolved fixed

Changes to destroyNetwork process. Here are the steps:
* shutdown network - shutdowns all network elements (domRs/Dhcps)
* delete network - destroy all network elements, cleanup network's resources (vlans, ip ranges), mark network with Destroyed state and set Removed field
 2011-01-18 19:31:04 -08:00
Kelven Yang 23cf2e048a HA fix on VM-sync for VM in starting state, Mac Address fix 2011-01-18 19:28:51 -08:00
Alex Huang 650fb5221e nic is no longer reserved 2011-01-18 19:28:44 -08:00
Kelven Yang c0fb9be02a Turn on rp_filter default to disable for console proxy VM, avoid explcit route conflict in DomR 2011-01-18 16:15:05 -08:00
Alex Huang e8f89004d9 added more robust start code 2011-01-18 16:09:24 -08:00
alena f20c725827 bug 8062: fixed releasing vnet when corresponding network is shutdown. Used to happen because reservation_id for the network didn't match reservation_id for the vnet, and cleanup thread couldn't find vnet to cleanup 
status 8062: resolved fixed

Also set broadcastUri to null when shutdown the corresponding network.
 2011-01-18 13:25:04 -08:00
Frank 48fd9221ee bug 7722: open vswitch - 
only create ovs stuff when ovs enabled
 2011-01-18 10:49:20 -08:00
kishan 568eb8a59a bug 7950: removed IPAssoc usage events for system account 
status 7950: resolved fixed
 2011-01-18 13:15:09 +05:30
alena 50540b2bba Stop ConsoleProxy/SecondaryStorage vms: use the same code path as for user vms. 2011-01-14 17:57:15 -08:00
Alex Huang 42950f2e8b migration complete 2011-01-14 15:12:13 -08:00
Alex Huang d43717eef8 merge changes 2011-01-14 15:12:13 -08:00
Alex Huang 19edfdfcdb migration code 2011-01-14 15:12:13 -08:00
alena 13630923ab bug 7959: return gateway for domainRouter Api commands 
status 7959: resolved fixed
 2011-01-13 17:04:44 -08:00
Chiradeep Vittal dd7f8625cc bug 7380: SNAT rules when there are multiple public interfaces 
bug 6854: port from 2.1.x
 2011-01-13 16:59:35 -08:00
Chiradeep Vittal 2b66b8a924 bug 7929: remove security groups when account is deleted. 
status 7929: resolved fixed
 2011-01-13 15:40:29 -08:00
Frank 488dd424aa bug 7722: open vswitch - 
fix a race condition, create tunnel sync
correct drop flow, this fix a flooding case which may cause openvswitch hang in kernel
 2011-01-13 13:53:35 -08:00
alena 877741030c bug 7957: set network domain for domain router based on Network networkDomain parameter. Default networkDomain is "cloud.internal" 
status 7957: resolved fixed
 2011-01-13 11:57:29 -08:00
Ragnar B. Johannsson 7a60bbbbbc Refresh UserVmDetails before using. 2011-01-13 01:21:57 +00:00
alena 381717854c Fixed NPE in deleteAccount - search for all accounts (instead of searching for active accounts only) when do deleteNetwork 2011-01-12 16:34:56 -08:00
keshav 158ed4c622 Changed some formatting. 2011-01-12 16:26:23 -08:00
Ragnar B. Johannsson bf747a4a2e Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss 2011-01-12 23:31:42 +00:00
Ragnar B. Johannsson 4bb42e43cc Get UserVm details via UserVmDao.loadDetails(). 
Also, removed references to ssh public key in UserVmVO and the underlying
table and used user_vm_details instead.
 2011-01-12 23:24:17 +00:00
Kelven Yang 256e26ff61 Waiting virtual router to be ready in a outer place instead of inside VirtualNetworkApplianceImpl. This is to fix the the blocker issue of unable to deploy VM/start DomR 2011-01-12 12:31:19 -08:00
Ragnar B. Johannsson 83b3580c32 Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss 
Conflicts:
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/vm/UserVmVO.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-01-12 17:06:08 +00:00
anthony 8b425e6313 need to check state every 2 second 2011-01-11 19:36:55 -08:00
Frank 870d0835a5 bug 7722: open vswitch - add entities to tunnel table/vlan mapping table when 
host connect, this make these tables lock free(for table lock)
 2011-01-11 19:04:37 -08:00
anthony 7add7643e3 bug 7748: need to make sure domr is up before start user VM, if domr is not up within 5 minutes, throw exception 
status 7748: resolved fixed
 2011-01-11 18:58:20 -08:00
anthony 5b68027d3a bug 7858: for untagged vlan, broadcastRUi is vlan://untagged 
status 7858: resolved fixed
 2011-01-11 18:09:01 -08:00
Alex Huang 6e6e8ff876 better expunge and destroy of volumes 2011-01-11 18:02:09 -08:00
Alex Huang ad4ed5b2fd added hypervisor type to vm 2011-01-11 18:02:09 -08:00
alena 620e7e0305 Implemented list by trafficType in listNetworks command 2011-01-11 16:06:58 -08:00
alena 5dfe399c1a bug 7803: introduces new parameter "is_default" for the network. DeployVm requires 1 default network to be specified, other networks (if any) have to be secondary 
status 7803: resolved fixed

Fix overview:

1) Parameter "isDefault" should be defined as a part of createNetwork
* Virtual network is always default
* Parameter can be specified only for DirectNetwork
* Once parameter is set, there is no way to change it as we don't provide updateNetwork command.
2) Added isDefault parameter to listNetworks command so you can sort by that.
3) DeployVmCmd:
* at least one default network should be set
* if more than 1 default network is set - throw an error
4) Return isDefault information as a part of Nic object for the vm response in deploy/stop/start/listVm
 2011-01-11 14:22:26 -08:00
abhishek e28882b8ee eliminating use of multiple variables; using the same var for all protocols (denoting ports for tcp/udp and type/code for icmp) 2011-01-11 14:20:02 -08:00
abhishek e4c3f556c2 bug 7942: we were not using the right values for record creation when the proto=icmp. Using the right vals 
status 7942: resolved fixed
 2011-01-11 13:57:53 -08:00
Frank c6683c2eab bug 7722: open vswitch - 
refine ovs plugin, create a separate plugin instead of messing with vmops
refine gre tunnel, maintains tunnel in database instead of plugin
fix an arp issue cause by overlap vlan range
 2011-01-11 02:55:36 -08:00
alena 15fc1fa10f Fixed listNetworks to list all system networks (not just Public) when isSystem=true is specified 2011-01-10 14:04:50 -08:00
alena d31b3cc446 Resend dhcp/userData entries as a part of Dhcp vm start. 2011-01-10 12:17:57 -08:00
Frank a964494332 bug 7722: open vswitch - align some data type with master branch 2011-01-08 17:31:00 -08:00
Frank e9959d32a9 bug 7722: open vswitch - handle router when schedule a work 2011-01-08 16:28:47 -08:00
Frank ec643c7e59 bug 7722: open vswitch - refine code; add normal flow makes vswitch work as 
normal L2/L3, otherwise the output packet cannot find right output port
 2011-01-08 16:28:47 -08:00
Frank 6f9f8b145b bug 7722: open vswitch - complete 2011-01-08 16:28:47 -08:00
Frank 9d2916ffcc it works 2011-01-08 16:28:47 -08:00
Frank c94b6acadf bug 7722: open vswitch - works at VM start time, need fullsync() and flow clean in next 2011-01-08 16:22:59 -08:00
Frank 5c01c42ba7 fix bug 7722, code complete basic architecture 2011-01-08 16:20:39 -08:00
alena 93a49fcd72 Return shared networks for regular user 2011-01-07 18:22:32 -08:00
alena b8a17f4a97 Don't default isShared to false for listNetworks api command. 2011-01-07 17:39:00 -08:00
alena d0687f663f bug 7863: fixed router cleanup thread 
status 7863: resolved fixed

Router cleanp thread is fixed, here is functionality description:

* Runs every "router.cleanup.interval" period of time (1 day by default)
* Stops only domRs running in Advance zone
* Thread Flow:
- gets all Running domRs/dhcps, get their networks, select network that
has to be checked (see criteria below):
- checks that there is only one nic in the op_networks table for the
network, and this nic belongs to domR/dhcp
- Stops domR/dhcp
* Criteria to choose the network:
- Network has to be non-system.
- Network should be one of the following: Guest Virtual (TrafficType=Guest; GuestType=Virtual); Direct Tagged (TrafficType=Public; GuestType=Direct)

Couple of other fixes:

* Added isShared parameter to listNetworks command
* Moved guestType from NetworkOffering to Network
 2011-01-07 16:57:47 -08:00
abhishek ffb8d54dff changing a few obsolete names to std convention 2011-01-07 16:49:51 -08:00
abhishek fec9a6d566 not iterating over cidr list if null 2011-01-07 16:22:28 -08:00
abhishek d639854426 fixes for the security groups 2011-01-07 16:22:28 -08:00
alena 335e81cc52 Fixed listNetworks for regular user to return system network information 2011-01-07 14:09:34 -08:00
Alex Huang 386d4a540d merge changes 2011-01-07 13:46:20 -08:00
Alex Huang 2e29f21e5a changes for injectors 2011-01-07 13:42:43 -08:00
abhishek 274edf1478 fixing sec group rules creation, and also adding some description in commands. checking in so that ui work can begin. 2011-01-07 10:34:00 -08:00
Ragnar B. Johannsson 32c68e1583 API cmds for SSH-keys manipulation and VM passwds retrieval. 
These include five new API cmds as well as changes to deployVirtualMachine to
specify an optional name of an SSH key to pass to the VM when starting. When
an SSH key is specified with a password-enabled template the newly created
password is encrypted with the SSH public key and can be retrieved via the
getVMPassword cmd. It is then the user's responsibility to decrypt retrieved
passwords with the correct SSH private key.
 2011-01-06 13:34:07 +00:00
alena 4ec3bc5865 bug 7244: delete corresponding untagged pod vlan ranges when pod is deleted 
status 7244: resolved fixed
 2011-01-06 16:16:09 -08:00
alena 916b516d13 bug 7878: Fixed Basic zone functionality - uservm/systemvm/domR start 
status 7878: resolved fixed
 2011-01-06 15:44:13 -08:00
alena 02dc187a0c bug 7727: Don't create Public network with broadcast_domain_type=vlan for Basic zone 
status 7727: resolved fixed
 2011-01-06 15:44:13 -08:00
alena c74fd529be bug 7611: get directPodBased default network when deploy vm with no networkId specified 
status 7611: resolved fixed
 2011-01-04 18:43:03 -08:00
alena edfbc5a782 bug 7267: create/updateZone - guestNetworkCidr parameter is accepted only for zone of type Adanced. 
status 7267: resolved fixed

As a part of the fix added cidr format validation to updateZone command.
 2011-01-04 16:59:39 -08:00
Alex Huang 61dd3b3bf9 bug 7865: Changed ip allocation for guest network to happen during allocation and not reserve time so ip address won't keep changing 2011-01-04 15:01:34 -08:00
Alex Huang 4eba6d10d7 Moved State into VirtualMachine like other States of objects 2011-01-04 15:01:34 -08:00
alena 0b7a15ab99 bug 7348: reapply PortForwardingRules (including 1-1 Nat), LB rules, Vpn as a part of domr Stop/Start 
status 7348: resolved fixed

More fixes:
* Update user_statistics on each domR stop/reboot
* Reset dhcpData/userData as a part of domR stop/reboot
* More logging for domR commands
 2011-01-03 23:00:05 -08:00
alena d18eaa840e bug 7798: removed vpn events generation from RemoteAccessVpnManagerImpl as we already generate it in ApiDispatcher code. 
status 7798: resolved fixed
 2011-01-03 23:00:05 -08:00
kishan 02ae55cc96 bug 7389: made ip optinal for list pf rules, all rules for the account will be listed when ip is not available 
status 7389: resolved fixed
 2011-01-03 13:47:18 +05:30
will fa7504532e Merging from 2.2Beta3 where network was not showing network dedicated to an user 2010-12-31 00:52:01 -08:00
will 18d4c97b55 Fixed problem with displaying direct network dedicated to non-admin accounts. 2010-12-31 00:52:00 -08:00
Alex Huang 62702a2f41 no default route sent for direct network 2010-12-30 17:21:17 -08:00
Alex Huang dc7de43aff release the nic state 2010-12-30 15:19:40 -08:00
Edison Su 7384d1b97a bug 7717: fix the bug that call the wrong fucntion to set netmask 
status 7717: resolved fixed
 2010-12-31 08:02:57 -05:00
alena 6576dd1273 Fixed NPE in listNetworks (handle the case when Zone service provider is NULL) 2010-12-30 14:31:40 -08:00
alena 225f15899d bug 7776: Fixed setting netmask for guest domR network 
status 7776: resolved fixed
 2010-12-30 10:49:40 -08:00
Alex Huang da4ed648ac consolidated all of the vm destroy, cleanup and account cleanup. 2010-12-30 05:46:54 -08:00
alena bd788b1827 Fixed RemoteAccessVpn apis 2010-12-29 21:36:44 -08:00
will de6b9eb0e2 - Fixed NPE caused when calling listRemoteAccessVpn API command with no vpn record in DB. 
- Fixed UI to pass in ipaddress when you create/delete remote access vpn.
 2010-12-29 21:14:48 -08:00
keshav 3da09345c9 Changed schema to keep track of which public IP address and host a user statistics entry is for 2010-12-29 19:14:35 -08:00
root c6847f001a bug 7760: fix a regression when adding host 
status 7760: resolved fixed
 2010-12-29 19:38:20 -05:00
Alex Huang a10ce22f99 remote access vpn from management server side is done 2010-12-29 12:13:35 -08:00
Alex Huang 090bc1edb4 more changes to fix up the merge 2010-12-29 09:32:54 -08:00
Alex Huang 544fa7ff1b remote access vpn, user ip address changes 2010-12-29 09:32:54 -08:00
alena d005f9133e bug 7603: update uservm count when deploy/recover vm. Also fixed updating volumes count when volume is created as a part of vm deployment 
status 7603: resolved fixed

Couple of other fixes:
* Set correct user_id for createVolume event instead of hardcoding it to System (1)
* Deploy dhcp vm when Zone's gateway provider is External Firewall and network is Virtual
 2010-12-28 17:32:17 -08:00
alena 085824d524 1) Updated schema for data_center - provider fields can have NULL values. 
2) Fixed deletePortForwarding/deleteIpForwardingRule commands to return false when delete rule fails.
 2010-12-28 16:22:36 -08:00
edison 3a143577b9 bug 7659: fix the race condition that agent inside systemvm connecting to mgt server at the head of startcommand returning to mgt server, then got a NPE. and fix bugs in security group of KVM 
status 7659: resolved fixed
 2010-12-28 15:51:28 -08:00
alena 88afdb3313 Made NetworkId parameter required for Vlan, modified DB schema and corresponding Managers' methods. For Virtual and Direct untagged vlan networkId is got from default system Public/Public-DirectPodBased networks accordingly 2010-12-28 15:15:24 -08:00
abhishek 719f3984d2 changing domain.suffix to guest.domain.suffix, along with associated deps 2010-12-27 17:00:07 -08:00
alena b7317c12fa bug 7616: Don't try to apply portForwardingRule when vm's nic is not set with Ip address 
status 7616: resolved fixed
 2010-12-27 15:50:57 -08:00
abhishek 344a151ffe someone had commented out the domr code in the storage maintenance, enabling the same 2010-12-27 15:25:02 -08:00
alena bb088a2e4c bug 7489: Added events for network create/delete 
status 7489: resolved fixed
 2010-12-27 15:18:14 -08:00
alena dceab9f18a bug 7705: deletePortForwardingRule is Async now 
status 7705: resolved fixed

Couple of other fixes:
* don't allow to send ipAssoc command when domR is in Starting/Stopping states as the command not async so it might be sent in parallel with domR stop/start and fail on the backend.
* DeleteIpForwardingRule api: set ownerId to rule owner id instead of hardcoding it to 1(System)
 2010-12-27 14:17:17 -08:00
alena 8f7c0bc500 bug 7680: Use correct name ("source") for one of supported LB algorithms. 
status 7680: resolved fixed
 2010-12-27 09:19:47 -08:00
kishan e51dc79000 bug 7504: Events refactoring 
status 7504: resolved fixed
 2010-12-24 19:38:28 +05:30
kishan 53d3455cbe bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
kishan bb0e6a0ae3 bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
alena dfaf7c4c5d Remove vm from Load Balancers when vm is Expunged. Added more logging to vm expunge process 2010-12-23 16:23:51 -08:00
alena 928ab98dc6 Added new network Capability "TrafficStatistics" for LoadBalancer and Firewall services 2010-12-23 15:06:37 -08:00
alena 727f56e2ac Mark all corresponding vm/lb mappings as Revoke when delete loadBalancer command is executed. 2010-12-23 14:14:05 -08:00
alena eb1f1da035 Assert when capability is not supported by service 2010-12-23 11:52:44 -08:00
alena 3775ba043e Added Services (dhcp, gateway, portForwarding, etc.) to NetworkOffering. 2010-12-23 09:40:15 -08:00
edison ac4295d91f bug 7605: fix release link local when domr stopped 
status 7605: resolved fixed
 2010-12-22 19:26:14 -08:00
alena ec9260ce62 bug 7619: Added list of Capabilities parameter for Network 
status 7619: resolved fixed
 2010-12-22 11:05:31 -08:00
kishan b12cd70216 bug 7504: Added usage events and made corresponding changes in usage server 2010-12-22 18:03:24 +05:30
kishan a7626fc991 bug 7504: Added usage events 2010-12-22 12:28:05 +05:30
abhishek bb5859de83 bug 7615: enabling the system vms and domr to be ha-enabled by default 
status 7615: resolved fixed
 2010-12-21 17:44:32 -08:00
Chiradeep Vittal 1216ffd21a WIP 2010-12-21 11:04:27 -08:00
alena 51d1aa2f95 Fixed publicNetworkGuru to set Broadcast URI for Public tagged network. 2010-12-21 10:24:56 -08:00
Alex Huang 91573b6252 more changes 2010-12-21 03:56:01 -08:00
Alex Huang 0ecb0118ec renamed the domainrouter services 2010-12-21 03:56:01 -08:00
Alex Huang 356526db83 Changed exception code to give the scope of the problem 2010-12-21 03:54:30 -08:00
alena 724b8d80bd Don't allow to remove a network with deleteNetwork api when the network has active nics assigned 2010-12-20 20:20:09 -08:00
alena 21bb9df292 Fixed accountCleanup to release all public ip addresses and delete the corresponding networks. 2010-12-20 20:20:09 -08:00
Chiradeep Vittal 1597671e73 Merge branch 'fixloadbalancer2' 2010-12-20 17:52:21 -08:00
alena 6a35f1bf31 Set broadcast domain type to Native for directPodBased network 2010-12-20 17:46:20 -08:00
Chiradeep Vittal 64a831dd50 Fix merge issues 2010-12-20 17:28:20 -08:00
Chiradeep Vittal 6da6330c3f WIP to fix domr network integration 2010-12-20 17:28:20 -08:00
alena b228ae6acb Set domR access details (name, privateIp) for various commands - PF/LB/IPAssoc 2010-12-20 17:22:52 -08:00
abhishek d63e61c915 adding some code to ensure system vms come up for the direct untagged case (zynga setup). Also, checking in some changes on behalf of Alena 2010-12-20 16:33:57 -08:00
alena ddc69cdd47 Assign sourceNat ip address to domR only, skip DHCP. 2010-12-20 10:47:06 -08:00
alena 116ddb3cae Port forwarding rules support for domainRouterElement. When new pf rule is created for a public ip address, we resend all existing rules for this address to the domR. 2010-12-20 10:01:19 -08:00
alena 3cd989cbef 1) Changed format for IpAssoc command. Instead of sending the ip addresses to assign one by one, we send a list of ip addresses to the agent. 
2) Fixed createVM with multiple networks
 2010-12-20 09:37:46 -08:00
abhishek a54c5e8949 fixing the issue wherein public network guru failed to get ip address for direct network in case of security groups 2010-12-17 16:16:51 -08:00
alena 59cf483043 Added "state" parameter to LoadBalancerRules response 2010-12-17 12:50:09 -08:00
alena ca92c28e0e Fixed setupNetwork command to use vlan tag instead of vlan dbId. 
Changed LoadBalancerConfigCommand to use Array data structrue instead of List as list is not handled well by gson.
 2010-12-17 12:07:06 -08:00
alena 8807fc8677 Don't send applyLB command to the backend when domR is stopped. 2010-12-17 09:57:48 -08:00
alena ec1749a3bc Removed unused code that was commented out previously. 2010-12-17 09:41:10 -08:00
alena 0049c74a5e 1) Different format for LoadBalancerCommand. 
2) When apply lb rule for domR, resend all lb rules belonging to the lb network
 2010-12-17 09:37:13 -08:00
abhishek d73e06a938 bug 7509: adding search by id for security groups, also refactoring a few method names to use the new scheme 
status 7509: resolved fixed
 2010-12-16 16:47:57 -08:00
abhishek 5154ba1539 bug 6361: this is a good point to commit; 1st round of refactor is done, code is clean compiling and ms is deploying 2010-12-16 15:37:19 -08:00
Alex Huang e613ecaba0 unit test passed 2010-12-16 14:04:32 -08:00
Alex Huang 65d0b32182 removed a bunch of old code 2010-12-16 14:04:32 -08:00
Alex Huang 39cc371e78 network gc 2010-12-16 14:03:21 -08:00
edison 5279ac1468 fix expunge 2010-12-16 13:22:42 -08:00
alena 0d1c529175 Fixed revokeRule method to set FirewallRule state to Revoke in the DB. 2010-12-16 12:19:53 -08:00
alena d427cdae1e 1) Return associatedIpAddress in listPublicIpAddresses command. 
2) Disabled create/deleteNetworkOffering API commands
 2010-12-16 12:07:09 -08:00
alena 7224e1ccd2 Implemented applyLoadBalancer rules in domainRouterManager 2010-12-16 10:40:58 -08:00
alena 4ca2b8808b Fixed ipAssoc command to throw an exception when virtual network is null 2010-12-15 17:25:45 -08:00
alena b383aaceec bug 7517: Added an ability to specify vm's host name during vm Deploy using "name" parameter. The parameter is optional. 
status 7517: resolved fixed

Name should follow these rules:
* must be between 1 and 63 characters long and may contain only the ASCII letters 'a' through 'z', the digits '0' through '9', and the hyphen ('-').
* can not start  with a hyphen, and must not end with a hyphen

Once name is set (during vm deploy), it can't be modified.
 2010-12-15 15:52:16 -08:00
alena c1db5b6fc0 1) Fixed associate/disassociateIP address commands. The procedure is changed from 2.1, right now on single ipAssoc command we get a new ip and reapply all exising ip associations. 
2) Added restartNetwork API command. Currently the command reapplies ip addresses for the network. TODO - reapply PF/LB rules and restart the domR.
 2010-12-15 11:39:30 -08:00
edison e39f664e89 fix storage creation bugs 2010-12-13 20:48:31 -08:00
alena d673686f5f Added Availability field for NetworkOffering. Added updateNetworkOffering API command 2010-12-13 18:28:33 -08:00
abhishek 5e61be67fd fix bugs in allocator 2010-12-13 16:42:25 -08:00
alena d077b127aa bug 7498: fixed search by keyword in listUserVm/listSystemVms/listRouters commands 
status 7498: resolved fixed
 2010-12-13 15:22:11 -08:00
alena 65f53e3910 1) Create default networks for zones specified in server-setup.xml file 
2) Direct pod based netwoks is taken care by DirectNetworkGuru now
 2010-12-13 14:03:19 -08:00
alena c7a9267225 Delete network as a part of account cleanup 2010-12-13 10:47:10 -08:00
alena 7d7817ecba Delete corresponding networks during zone deletion. 2010-12-10 20:42:38 -08:00
alena 8db9f9fbdb Fixed listLoadBalancerRuleInstances to list only instances belonging to LB rule network 2010-12-10 20:42:37 -08:00
Alex Huang 7cfbd5b7e0 missing mac fields 2010-12-10 17:20:31 -08:00
Alex Huang 790bf40be6 Forgot what i change but must be important 2010-12-10 17:20:31 -08:00
alena acef5c9f5c Fixed listLoadBalancerRuleInstances to return all vms in the system for the ROOT admin 2010-12-10 15:35:07 -08:00
alena 88d6ff2136 bug 7467: release IP address works now. 
status 7467: resolved fixed

Fixed all load balancer commands to work with the latest networking code
 2010-12-10 15:12:32 -08:00
abhishek 9c8d8d1dc4 bug 7474: implementing search for public ip address for a zone, without the filter for vlan db id. 
status 7474: resolved fixed
 2010-12-10 15:04:18 -08:00
Alex Huang 8ac694bf55 changes from testing 2010-12-10 09:29:23 -08:00
Alex Huang 3f9d797594 Changes to how public ip addresses are allocated 2010-12-10 08:38:21 -08:00
Alex Huang 68932929fb Changes to how public ip addresses are allocated 2010-12-10 08:38:20 -08:00
Alex Huang 2d4432d87e network shutdown code 2010-12-10 08:38:20 -08:00
alena 2f0f78ff73 Set trafficType to Public insteand of Guest for Direct network 2010-12-09 21:06:48 -08:00
alena 7e9579dab2 Fixed create/list LoadBalancerRules 2010-12-09 21:06:48 -08:00
edison 04f3a4baa9 bug 7441: fix ipassoc when starting router 
status 7441: resolved fixed
 2010-12-09 20:25:27 -08:00
Kelven Yang 68e6706fbe Fix a number of issues related with vmware on new networking 2010-12-09 19:33:30 -08:00
edison 712953156b fix boot from iso/attach iso/disks issue 2010-12-09 14:25:44 -08:00
alena 157156dd35 1)Introduced new Network Guru - used for direct tagged network. 
2)Made vm start with multiple networks
 2010-12-09 11:12:29 -08:00
alena 8fb948650f Fixed createPortForwardingRule command. 
Modified createVlanIpRange command: added optional networkId parameter; only startIp parameter is required now.
 2010-12-09 11:12:29 -08:00
Alex Huang f497e8eab3 Make VMWare work 2010-12-08 17:08:30 -08:00
alena 829d6fe8a0 Fixed listIpForwardingRules command: made ipAddress required, added vm and rule state info to the response. 2010-12-08 14:28:37 -08:00
alena 1f7d74dbec 1) Disabled updatePortForwardingRule api command. 
2) Added vm information (id, name, display_text) to all port forwarding rule responses.
 2010-12-08 14:28:37 -08:00
alena d1331b26bf Fixed Dhcp instance - set dhcp range to the first ip address of the subnet instead of cidr. 2010-12-08 12:11:34 -08:00
alena a5d2f8ba5c Removed check for default nic 2010-12-08 12:11:34 -08:00
alena 013ed05ca7 Don't do transition from Implemented to Setup for network 2010-12-08 12:11:34 -08:00
Alex Huang e49fab6903 Renamed MauricMoss now that we're going public with this. 2010-12-08 09:28:01 -08:00
Alex Huang 9bae18d915 merge changes 2010-12-08 09:17:44 -08:00
Alex Huang 2c42ebbf71 ip assoc working 2010-12-08 09:03:34 -08:00
Alex Huang beee7aac2c merge changes 2010-12-08 09:03:34 -08:00
Alex Huang f794abfdef ip addresses are now separated from domR 2010-12-08 09:03:34 -08:00
alena c2bec9fec4 Set network state to Implemented when implement network in Setup state. 2010-12-07 19:57:58 -08:00
alena a06a07f48d Setup dhcp range in correct place 2010-12-07 19:18:08 -08:00
alena e279389c2b Added created/removed fields to Nics and Networks tables. 2010-12-07 18:08:05 -08:00
alena 2ffcbb8815 Added isSystem parameter for listNetworks command, default value is false. If it's set to true, only system networks with trafficType=Public and and zone=Advanced are gonna be returned 2010-12-07 16:36:34 -08:00
alena c8bd857db6 Set type and dhcp range in finalizeVirtualMachineProfile 2010-12-07 15:51:04 -08:00
alena 954756d69b Introduced new NetworkElement - DhcpElement. 2010-12-07 13:47:59 -08:00
edison 20b677be10 add public/private/guest network in each type of vm 2010-12-06 18:36:46 -08:00
alena a67e91253f Don't allow to create network offering of DirectPodBased type 2010-12-06 17:42:23 -08:00
alena fb4c448762 Don't create default pod/zone 
Create untagged network as a part of createZone command
 2010-12-06 16:48:25 -08:00
Alex Huang d8fe8c3012 everything seems to be starting and running again 2010-12-06 14:17:53 -08:00
Alex Huang e217c89028 start vm not working again 2010-12-06 14:17:53 -08:00
Alex Huang f147bf5f94 start vm not working again 2010-12-06 14:17:53 -08:00
Alex Huang fcdd20ca06 more checkin 2010-12-06 14:17:53 -08:00
alena a230a5fed9 createNetwork - specifyVlan parameter applies for regular users only. 2010-12-06 14:11:53 -08:00
alena ade1b2665b Removed podId from createNetwork api command 2010-12-06 13:25:37 -08:00
edison fd7960f13d fix secondary storage in new networking mode 2010-12-06 12:40:52 -08:00
alena 5571b444f2 1) Don't allow to delete a vlan if it has network associated with it. Also don't show such vlans in listIpRanges command. 
2) Return vlan in create/list networks command.
3) Implemented list networks by type.
4) Changed listVlanIpRanges to return start/endIps in separate tags instead of returning them in description.
 2010-12-06 12:36:09 -08:00
alena 619d378095 Set specifyVlan=true for default Direct network offering 2010-12-06 09:23:15 -08:00
alena 0dbd21fe23 createNetwork command accepts netmask/gateway instead of cidr. Also return start/endIp in the createNetwork response. 2010-12-06 09:18:02 -08:00
Alex Huang cf032b7a3a more changes 2010-12-04 17:33:02 -08:00
Alex Huang 16cccf4f59 ip address modifications. removed old deploy 2010-12-04 17:32:32 -08:00
Alex Huang 16caf1954b New ip address states and mode 2010-12-04 17:32:32 -08:00
Alex Huang daa9add158 removed router stuff from network manager 2010-12-04 17:32:31 -08:00
edison e591f56b25 add logs, and don't break old code 2010-12-04 15:02:03 -08:00
edison d17beeb348 move all the vm's state machine to itmgr->statetransitTO 2010-12-04 15:02:02 -08:00
edison 2e3ef1408c refactor 2010-12-04 14:59:40 -08:00
alena 150d684e05 1) isShared attribute belongs to Network now, not NetworkOffering 
2) Added list by networkId support to listVirtualMachines command.
3) Implemented search by zoneId in listNetworks command
 2010-12-03 19:07:08 -08:00
alena cb605e626a listNetworks api - return only networks belonging to the caller plus Shared networks when command is called without any parameters 2010-12-03 14:15:30 -08:00
alena 9f11f52611 listNetworks - don't return Networks created from systemOnly network offerings 2010-12-03 12:31:30 -08:00
Alex Huang a8b617c596 port forwarding is now in 2010-12-03 08:48:03 -08:00
Alex Huang b859e103d8 ip nat rule forwarding done 2010-12-03 08:48:03 -08:00
Alex Huang 9a70ee54f0 portforwarding is working 2010-12-03 08:48:03 -08:00
Alex Huang bb78986ddb port forwarding working 2010-12-03 08:48:02 -08:00
Alex Huang 223688d0bf Port forwarding rules and load balancing rules rewrite 2010-12-03 08:48:02 -08:00
alena f8a687ab23 1) Implemented create/list/deleteNetworkOffering create/delete/listNetwork APIs. 
2) Added networkIds parameter to deployVMCmd - accepts list of networks ids separated by coma.
3) Changed domainRouter/systemVm/userVm response to return list of Nics associated with the vm.
 2010-12-02 19:30:17 -08:00
abhishek dd9fd57514 changing the logging and error msgs from 1:1 NAT to static NAT (in accordance with the feature being called static and not 1:1 NAT) 2010-12-02 15:50:04 -08:00
abhishek e353b7ac2d we use 2 different tables for ip/port fwding and load balancer rules respectively. when we create a new static nat rule, this checkin tests against existing records in either of these tables based on the public ip address being mapped. if such a rule exists in either table, we do not permit creation of a static nat rule on this public ip 2010-12-02 15:50:04 -08:00
abhishek 66186ca876 bug 7348: fixing the issue of the static nat rules not being re-programmed on a domr stop/start or a domr reboot 
status 7348: resolved fixed
 2010-12-02 11:16:33 -08:00
abhishek dce3f9fa3b bug 7344: preventing enabling of static nat on an ip for more than one instance. Check the nat flag, and error out if set 
status 7344: resolved fixed
 2010-11-29 11:56:34 -08:00
Alex Huang d40700b286 Changed firewall rule's constructor 2010-11-29 09:38:13 -08:00
alena aa8aa6027a Modified UserContext - got rid of accountName, domainId fields as we can get this information from Account field. 2010-11-24 14:29:08 -08:00
abhishek 1950bf7a99 changing the nat feature to work with kvm 2010-11-24 10:04:24 -08:00
alena 44737d24c5 bug 7196: fixed response object generation for authorizeNetworkGroupIngress command (response type is Network group response - the way it was in 2.1.x - instead of IngressRule response) 
status 7196: resolved fixed

Also fixed revokeNetworkGroup command - didn't work via 8096 port
 2010-11-24 09:50:04 -08:00
abhishek 5543814f39 blocking the static natting of an ip address, if it is already source natted 2010-11-23 16:39:02 -08:00
alena 10fb2a0f39 bug 7292: fixed assignig LB to non-source Nat ip address 
status 7292: resolved fixed
 2010-11-22 20:54:08 -08:00
alena 3f1abbcbc8 Fixed assignToLoadBalancer command - admin couldn't assing LB rule in behalf of other user 2010-11-22 17:08:51 -08:00
Alex Huang d38f7fd56d Moved DAO to server 2010-11-22 07:40:41 -08:00
Alex Huang 1e44925564 api refactoring 2010-11-21 12:00:21 -08:00
alena 138e0914b6 bug 7245: don't try to set vm name for detached volume during expunge process. 
status 7245: resolved fixed

Fixed couple of other problems:
* cleanup corresponding records in load_balancer_vm_map table when loadBalancerRule is removed.
* don't log "java.lang.IllegalStateException: getAttribute: Session already invalidated" exception when UI session expires
 2010-11-19 20:08:18 -08:00
alena 6b61caad46 AssignToLoadBalancer - added missing transaction.commit to corresponding NetworkManager method. 2010-11-19 19:14:24 -08:00
alena 5426b1487c listPortForwardingRules: return empty response instead of throwing exception when ipAddress doesn't have any rules assigned. 2010-11-19 18:40:32 -08:00
Alex Huang 5b4a6f27db Changed networkconfigurations to network as per Sheng's suggestion 2010-11-19 15:44:42 -08:00
Chiradeep Vittal 394554770e Enforce user limit on number of vpn users 2010-11-18 18:38:29 -08:00
Chiradeep Vittal c53e165eaa bug 6971: bring back l2tp port 1701 2010-11-18 14:06:01 -08:00
Chiradeep Vittal a7547846bf bug 6971: Dont confuse PF rules added for VPN to be LB rules 2010-11-18 14:05:28 -08:00
Alex Huang a73e3dc9ac new networking can be set by use.new.networking 2010-11-17 17:51:17 -08:00
Chiradeep Vittal 4c7bb302bc bug 6971: Use PSK length configuration 
validate global configurations
 2010-11-17 16:32:50 -08:00
alena 9fefa33a36 bug 5701: listNetworkGroups api - apply page size parameter to the NetworkGroup instead of IngressRule. 
status 5701: resolved fixed
 2010-11-17 15:34:45 -08:00
Chiradeep Vittal 31e17b907d bug 6971: ensure no conflicts with portforwarding rules for vpn udp ports 
also, do not open up port 1701 -- only used on ppp interface not public interface
also clean up password generator, make it easier to use and more secure
moved some constants to NetUtils
heuristic to determine if an ip is one-to-one nat'ted
 2010-11-17 15:32:50 -08:00
abhishek 38292fcd02 bug 6929: we prevent upgrading of a router with a SO different from the type it was created with (eg. prevent a virtual offfering being upgraded to direct) 
status 6929: resolved fixed
 2010-11-17 12:59:54 -08:00
abhishek 1d1a2fa691 bug 6448: returning an error back from the api on trying to add a pf rule which already exists 2010-11-17 11:50:05 -08:00
alena c5d78a726e Modified exception handing in API. Following exceptions are supported now (location - BaseCmd.java): 
* MALFORMED_PARAMETER_ERROR - when type of the request parameter is invalid (String instead of Long for id for example)
* PARAM_ERROR - when invalid parameter value is specified in api request. For example, id of non existing vm for StartVmCmd
* ACCOUNT_RESOURCE_LIMIT_ERROR - when user tries to exceed his resource limits by executing the api command.
* INSUFFICIENT_CAPACITY_ERROR - when resource fails to create/start due to insufficient capacity.
* RESOURCE_UNAVAILABLE_ERROR - when user tries to create a vm when storage is not available.
* RESOURCE_IN_USE_ERROR - when user tries to delete/modify resource while it's in use. For example, when we try to delete a network group when it contains ingress rules.
* NETWORK_RULE_CONFLICT_ERROR - when LB/PF rule to add conflicts with existing rule
* ACCOUNT_ERROR - when user is not authorized to execute operation on the resource.
* INTERNAL_ERROR
 2010-11-16 11:56:34 -08:00
Alex Huang ed31497188 ComponentLocator changes 2010-11-16 04:28:15 -08:00
Alex Huang 17afeade00 better componentslocator 2010-11-16 04:28:14 -08:00
alena d43a8e983c Fixed authorizeNetworkGroupIngress api command (it stopped working after API refactor) 2010-11-15 17:44:51 -08:00
abhishek d5ab597fcf bug 6474,6475: porting over the expunge fixes for port forwarding rules to 2.2 
status 6474,6475: resolved fixed
 2010-11-15 17:33:05 -08:00
abhishek d520f0af5b adding a column in user_ip_address table called one_to_one_nat; which is a boolean to tell us if the ip is a nat ip. This is false by default, and is set to true when we nat the ip. Also, this value is returned in the list public ip addrsses api call. 
finally, the value is set to false when we delete the ip forwarding rule.
 2010-11-15 12:39:24 -08:00
abhishek d8fdcd3815 bug 7088: returning right error msg for assocIp failure 2010-11-12 15:31:30 -08:00
anthony 2537dc3058 bug 7149: merge from 2.1.x 2010-11-12 13:16:03 -08:00
abhishek 05bbd35860 resolving the network manager merge conflict 2010-11-11 13:13:04 -08:00
abhishek 1faaba8fb0 fixed a corner case; also changed the commands to be async and changed the method signatures to conform with the master refactor 2010-11-11 13:07:26 -08:00
abhishek 239942bbe1 refactored all the commands to cater to keshav's needs, and added the new apis. the initial set of testing is complete, will now focus on corner cases 2010-11-11 13:07:26 -08:00
abhishek 26b75fc05d this is a good point to check the code in; have completed a part of the enhancement's code; with create and delete ip forwarding rule commands and the skeleton for port to rule map with associated table 2010-11-11 13:07:26 -08:00
abhishek e5ca5dddf9 renaming the ip forwarding commands to port forwarding commands, and beginning to work on Keshav's request to modify the current 1-1 NAT to be compatible with the Amazon apis 2010-11-11 13:07:26 -08:00
Alex Huang 94250c1330 committing to update 2010-11-11 12:53:19 -08:00
Alex Huang c6033baa78 system vm start and stop added 2010-11-11 12:53:19 -08:00
alena d091bdd886 bug 7126: return true only when assignToLoadBalancer succeeded. 
status 7126: resolved fixed
 2010-11-11 12:46:21 -08:00
alena 86e83bc4bd Created new response objects for userVm/domainRouter/systemVm that going to be used by API after network refactorig is in place. 2010-11-11 10:43:18 -08:00
Alex Huang c8a3ea3080 merge conflict with alena's changes 2010-11-08 12:40:38 -08:00
Alex Huang edf9ddd464 added reservation id to vnet 2010-11-08 12:29:38 -08:00
Alex Huang aca8ef79cd a bunch of other changes for network refactoring 2010-11-08 12:29:37 -08:00
alena 1c24deda34 1) Refactored current Apis not to use reflection for method invocation. In new version following has to be done: 
* Implement callCreate() and execute() methods in apis extending BaseAsyncCreateCmd (example - CreateVolumeCmd)
* Implement execute() method in apis extending BaseCmd and BaseAsyncCmd (example - deleteVolumeCmd and deleteUserCmd)

We no longer need createMethod(), method(), manager() fields in @Implementation annotation, cleanup has to be done.

2) Moved Account/User related methods to AccountManagerImpl. Methods are exposed via AccountService interface.
3) Enhanced exception handing for Api calls.
4) Created ConfigurationService interface, all Api config methods are exposed via it.
 2010-11-08 11:27:36 -08:00
will bd5f1a7de6 Fixed NPE if addVPNUser fails because it was unable to reach the domR. 2010-11-06 16:54:14 -07:00