Commit Graph

13036 Commits

Author SHA1 Message Date
Alena Prokharchyk
d93c5d0531 VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-10 16:37:33 -07:00
Sheng Yang
327b4833ce S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation
And subnets limitation for each customer gateway

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:24:35 -07:00
Sheng Yang
302c9048e8 S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
Sheng Yang
830aec3562 S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-10 16:20:52 -07:00
Sheng Yang
e7efd0d95b S2S VPN: Don't consider VPN is down if IPsec SA still existed
Because ISAKMP SA wouldn't be updated after expiration if IPsec SA is still in
affect.
2012-08-10 16:20:52 -07:00
Sheng Yang
a4431b5740 S2S VPN: Use coma instead of semicolon for separating cidr list 2012-08-10 16:20:52 -07:00
Brian Federle
abbfd74077 Fix _hideFields array not hiding add VM button 2012-08-10 14:03:17 -07:00
Kelven Yang
340b086df4 commit review request https://reviews.apache.org/r/6502/# 2012-08-10 13:38:47 -07:00
Brian Federle
42a9fd641e VPC UI: New ACL flow
-Remove the ACL action from the tier chart item

-Adds an ACL overview list view under the VPC configure menu which
 displays each tier and their total # of ACLs.

-Add ACL edit to tier detail view

- (misc) Also add IP address tab to tier detail view
2012-08-10 13:04:20 -07:00
Alena Prokharchyk
ccac505944 Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
Alena Prokharchyk
5c349dd5e5 Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places 2012-08-10 10:45:38 -07:00
Brian Federle
83361776fa multiEdit: Allow disabling fields per-row
If _hideFields array is passed with row item data, then field IDs
specified will be disabled, if they are custom button actions.
2012-08-10 10:43:35 -07:00
Brian Federle
a6f59e31d5 multiEdit: Allow disabling fields per-row
If _hideFields array is passed with row item data, then field IDs
specified will be disabled, if they are custom button actions.
2012-08-10 10:43:17 -07:00
Jessica Wang
0384259298 CS-15939: cloudstack 3.0 UI - VPC - create VPN connection - add error handling. 2012-08-10 10:29:03 -07:00
Edison Su
81727ad18d Fix the path for the API server endpoint.
RB: https://reviews.apache.org/r/6513/

Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>
2012-08-10 10:17:54 -07:00
Brian Federle
a96c9013d4 multiEdit: pass context to select handler 2012-08-10 09:17:48 -07:00
Brian Federle
b9e1cb640a multiEdit: pass context to select handler 2012-08-10 09:17:28 -07:00
Chip Childers
5725bbf044 Patch from Joe Brockmeier: Add license headers to n-named files, fix DTDs, etc. 2012-08-10 09:14:51 -04:00
Alex Huang
14a60c7666 Removed Base64 from test 2012-08-10 06:10:24 -07:00
Wido den Hollander
602ea46d67 doc: Update mininum system requirements
Fix some indentation in the file and also add some KVM requirements
2012-08-10 12:26:20 +02:00
Mice Xia
a74687128e Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly 2012-08-10 16:50:47 +08:00
Mice Xia
bd2a130251 fix unittest SecurityGroupManagerImpl2Test 2012-08-10 16:01:43 +08:00
Jessica Tomechak
80cbda5791 Add correct DTD URL and license headers to new sections for Infrastructure Concepts. 2012-08-10 00:00:11 -07:00
Jessica Tomechak
4333465a70 Make HTML pages in documentation shorter. 2012-08-10 00:00:08 -07:00
Jessica Tomechak
218f610477 Remove Citrix copyright from documentation. 2012-08-10 00:00:04 -07:00
Alena Prokharchyk
6cddd1e767 Removed trailing whitespaces and fixed line endings in some files 2012-08-09 23:30:33 -07:00
Alena Prokharchyk
97e4906d8c Merged the file with the master branch 2012-08-09 23:30:33 -07:00
Alena Prokharchyk
0d1393a2d3 Removed unsed imports 2012-08-09 23:30:11 -07:00
Alena Prokharchyk
493c8d1190 Removed @author annotation from IpAssocCommand and IpAssocAnswer 2012-08-09 23:30:11 -07:00
Jessica Tomechak
69fb0208eb Add a new image for Infrastructure Overview. 2012-08-09 23:00:33 -07:00
Jessica Tomechak
00a1c7cde8 Remove Citrix "contacting support" section. 2012-08-09 22:59:47 -07:00
Jessica Tomechak
5d19e95299 Add include statements for new About... sub-sections to Cloud Infrastructure Concepts master file. 2012-08-09 22:59:01 -07:00
Jessica Tomechak
6044ac884f Fix book title and abstract in documentation. 2012-08-09 22:57:51 -07:00
Jessica Tomechak
e88b1721ee Add more About ... sections to Infrastructure Concepts documentation, plus small fix to image alt text in About Zones. 2012-08-09 22:56:47 -07:00
Jessica Wang
60f1dbe572 CS-15883: cloudstack 3.0 UI - VPC - VM Wizard - step 1 - zone dropdown - populate only one zone, the one that the VPC is under. 2012-08-09 17:09:19 -07:00
Jessica Tomechak
d9864e3038 Fix broken image references. 2012-08-09 16:59:41 -07:00
Jessica Tomechak
cdc6cf8026 Check in images that are needed, and remove images directory that was placed at the wrong level. 2012-08-09 16:59:39 -07:00
Jessica Tomechak
9cec713c68 Remove unneeded include files from main CloudStack Guide. 2012-08-09 16:59:36 -07:00
Jessica Tomechak
cd12efaa47 Fix bad image references. 2012-08-09 16:59:33 -07:00
Jessica Tomechak
bab6dcbd21 Remove files with underscore filenames. Replaced already by new files with hyphenated filenames. These are causing WARNING messages in the build. 2012-08-09 16:59:31 -07:00
Jessica Tomechak
2c292d7c61 Remove the configs directory within docs. These were working files, not used currently. 2012-08-09 16:59:28 -07:00
Brian Federle
df4a4a6b21 CS-15913: Add state column to VPN connection listing 2012-08-09 16:15:29 -07:00
Brian Federle
241d83aa09 VPC UI, VPN connections: fix 'DPD' boolean field 2012-08-09 16:15:29 -07:00
Brian Federle
41afde3207 CS-15902: Remove loading overlay from VPC actions
For add VPN and add gateway actions: remove loading overlay to allow
user to perform other actions. The overlay is replaced with a set of
notification messages indicating the status of the job.
2012-08-09 16:15:29 -07:00
Jessica Wang
3b8494131f CS-15803: cloudstack 3.0 UI - VPC - fix a bug that root-admin failed to create a VM in a tier that belonged to regular-user or domain-admin. 2012-08-09 14:53:06 -07:00
Jessica Wang
ed28accdf0 CS-15801: cloudstack 3.0 UI - VPC - create new tier - fix an error "Owner of vpc with specified vpcId is different from the network owner Acct[2-admin]". 2012-08-09 14:30:07 -07:00
Chip Childers
e7718a9095 NOTICE and LICENSE updates 2012-08-09 16:15:38 -04:00
Chip Childers
0ad8118562 Fixed three .classpath license header issues 2012-08-09 14:21:06 -04:00
Prasanna Santhanam
038608b54f Ignore comments in config files during loading 2012-08-09 17:37:43 +05:30
Prasanna Santhanam
f72146e96f Changes to simulator setup files
for provider + traffic type changes in marvin
2012-08-09 15:31:58 +05:30