12265 Commits

Author SHA1 Message Date
Sheng Yang
9bb65b1126 CS-6840: Add data structure for site-to-site vpn tables 2012-07-02 16:20:58 -07:00
Sheng Yang
78b31bb7db CS-6840: Add tables for site to site VPN use. 2012-07-02 16:20:53 -07:00
Alena Prokharchyk
1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk
634cd78baa Merge branch 'master' into vpc
Conflicts:
	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/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
Murali reddy
c41094154d moving out OVS code to plugins/network-elements/ovs 2012-06-28 17:23:41 -07:00
Alena Prokharchyk
377b03acde VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering 2012-06-28 17:18:27 -07:00
Alena Prokharchyk
24772bcb4e VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC 2012-06-28 17:18:15 -07:00
Alena Prokharchyk
c19639e4a2 Static route can be created for generic VpcGateway now, not just Private gateway 2012-06-28 17:17:44 -07:00
Brian Federle
4c6738266d Fix add tier UI
Properly pass context for add tier dialog, which broke due to recent
changes that requires context to be present, for the action filter.
2012-06-28 15:34:22 -07:00
Brian Federle
b1a5ec13cd VPC tier UI: Update state after performing actions
After performing an action that changes state, namely starting and
stopping a tier, run through the action pre-filter again, to make sure
that the allowable actions are properly refreshed.

Conflicts:
	ui/scripts/ui-custom/vpc.js
2012-06-28 15:23:37 -07:00
Brian Federle
28e49e8880 VPC UI: Refactor tier action filter handling
For reusability, move action filter handling for VPC tier actions to a
separate function. This allows for easier refreshing of actions after a
tier's state has changed.
2012-06-28 15:22:41 -07:00
Brian Federle
9bbbc4e356 Pass _custom correctly to VPC tier add VM action 2012-06-28 14:21:08 -07:00
Brian Federle
6d78cc4000 Add Apache license to new JS files 2012-06-28 13:40:19 -07:00
Brian Federle
dfb6670fe8 CS-15211: More noticable 'Back' button on quick install
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-06-28 13:35:32 -07:00
Edison Su
80e2a6faa0 add ASF license 2012-06-28 13:28:38 -07:00
Brian Federle
2fe2a0e2fb Fix missing actionFilter causing instance wizard to never complete 2012-06-28 12:30:11 -07:00
Brian Federle
808a3d75d9 Instance wizard: Don't try to add a new row if list view isn't present 2012-06-28 11:14:02 -07:00
Brian Federle
c347c6bd09 Add base VPC UI
** Note: this is a work-in-progress, and only contains dummy content

Implement UI for managing VPC tiers, via a custom chart-like UI list
tiers and allowing the management of VMs associated with the VPCs.
2012-06-28 10:51:56 -07:00
Brian Federle
e6a6f84361 Pass context to instance wizard 2012-06-28 10:51:56 -07:00
Alena Prokharchyk
46b97cbf7d VPC: update public IP info in domain_router table once the VR gets the public nic 2012-06-28 10:25:24 -07:00
Alena Prokharchyk
308fd39a73 VPC: delete network ACLs as a part of network cleanup 2012-06-28 10:18:23 -07:00
Alena Prokharchyk
b03265bc76 VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete) 2012-06-28 10:18:14 -07:00
Alena Prokharchyk
cec5012d5a VPC: fixed ip addres assignment in createLB rule 2012-06-28 10:18:03 -07:00
Alena Prokharchyk
c8ec262dea VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls 2012-06-28 10:17:53 -07:00
Alena Prokharchyk
5ecdad7399 VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
2012-06-28 10:17:34 -07:00
Alena Prokharchyk
09bd4e1725 VPC: fixed list public ips by vpcId 2012-06-28 10:16:22 -07:00
Alena Prokharchyk
fcdf6f2bec Fixed @Implementation for the api commands - responseObject field should be the instance of BaseResponse
Conflicts:

	api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
2012-06-28 10:15:43 -07:00
Alena Prokharchyk
42dac79e08 VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
2) Re-apply static routes as a part of VPC VR start
2012-06-28 10:13:48 -07:00
Alena Prokharchyk
1140f081df VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes 2012-06-28 10:13:36 -07:00
Alena Prokharchyk
a78fcedb5e VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
Conflicts:

	server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
Alena Prokharchyk
1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Edison Su
8ca14c8637 need to copy build.xml to remote machine also 2012-06-27 23:45:10 -07:00
Edison Su
5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Jessica Wang
3938c24b45 CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2). 2012-06-27 16:57:03 -07:00
bfederle
6015df9137 CS-13535: Error handling for add domain operation
Original patch by: olga.smola
reviewed-by: jessica, r5583
2012-06-27 16:20:30 -07:00
Jessica Wang
af1d5d00f7 cloudstack 3.0 UI - fix space problem from a patch 2012-06-27 14:11:25 -07:00
olgasmola
a30fe62b11 CS-14047: Return the user to the log in page when login time out. 2012-06-27 13:43:05 -07:00
Jessica Wang
d03fb2a7e2 cloudstack 3.0 UI - (1) to distinguish between getUpdatedItem() and getUpdatedData(), rename getUpdatedData() to getUpdatedItemWhenAsyncJobFails() since it's being called only when async job fails. (2) fix the space problem (tab size is not 2) from patch. 2012-06-27 10:57:29 -07:00
Murali reddy
8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy
550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
olgasmola
367e32adbc CS-15329: Instances with Error states appear in Instances list after creating. 2012-06-26 16:28:59 -07:00
Murali reddy
cefbbb3850 moving random storage allocator to plugins/storage-allocators 2012-06-26 15:17:25 -07:00
Murali reddy
3ceb8d5667 moving out plaintext authenticator to plugins/user-authenticators 2012-06-26 14:33:27 -07:00
Murali reddy
eb5e02e4e1 moving out MD5 authenticator to plugins/user-authenticators 2012-06-26 14:18:42 -07:00
bfederle
4e9a97177f CS-15290: Fix 'Path' field validation
Original patch by: olga.smola
reviewed-by: brian
2012-06-26 13:43:30 -07:00
Murali reddy
dfcded6733 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-06-26 13:37:44 -07:00
Murali reddy
df32adb1d5 adding build-cloud-plugins.xml, this will seperate out plug-in building 2012-06-26 13:35:57 -07:00
bfederle
cbe1f3e4c4 CS-15287
Support validation on edit detail view

Original patch by: olga.smola
reviewed-by: brian
2012-06-26 13:30:36 -07:00
bfederle
80b8515347 CS-15315: Fix overlay positioning
Original patch by: olga.smola
reviewed-by: brian
2012-06-26 10:24:54 -07:00
David Nalley
7b7d51cecd apply chip childers licensing patches for the test directory
https://reviews.apache.org/r/5444/
2012-06-26 11:19:58 -04:00