apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,909 Commits 307 Branches 324 Tags
Commit Graph

12909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pranav Saxena
1323d7f32f CS-15903:Detail page of vpn connection miss ike/esp lifetime 2012-08-08 13:59:34 +05:30
Pranav Saxena
1aea98f622 CS-15898:Change drop down options in vm tier for vpc 2012-08-08 11:03:08 +05:30
Sheng Yang
2641b5d6b8 S2S VPN: Fix multiply remote side guest networks 2012-08-07 18:39:45 -07:00
Sheng Yang
c4eadf3011 S2S VPN: CS-15884: Delete iptables rules after delete vpn connection 2012-08-07 16:32:22 -07:00
Sheng Yang
5e0eb93fe6 S2S VPN: CS-15882: Only allow VPN connection between same account's gateways 2012-08-07 16:27:04 -07:00
Brian Federle
b5e1c53137 CS-15892: Tier detail view: Show 'tier details' instead of 'details' 
Conflicts:
	ui/index.jsp
 2012-08-07 16:02:07 -07:00
Brian Federle
7de225baa9 CS-15890: ACL multiEdit: Change 'Source CIDR' -> 'CIDR' 2012-08-07 16:00:44 -07:00
Brian Federle
72651f62b7 CS-15891: Add view console action to VPC instances list view 
Conflicts:
	ui/css/cloudstack3.css
 2012-08-07 16:00:35 -07:00
Brian Federle
bcead6eec2 Reduce whitespace to overcome file size limit 2012-08-07 15:59:43 -07:00
Brian Federle
310b24b285 List view: support external link actions 
Support actions which point to an external link, primary to support
launching the console proxy.

Example:

listView: {
  actions: {
    viewConsole: {
      label: 'label.view.console',
      action: {
        externalLink: {
          url: function(args) {
            return clientConsoleUrl + '?cmd=access&vm=' + args.context.vpcTierInstances[0].id;
          },
          title: function(args) {
            return args.context.vpcTierInstances[0].id.substr(0,8);
          },
          width: 820,
          height: 640
        }
      }
    }
  }
}
 2012-08-07 15:59:36 -07:00
Alena Prokharchyk
629556c708 Fixed UserContext initialization - got broken by unittest 2012-08-07 11:51:00 -07:00
Alena Prokharchyk
95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Alena Prokharchyk
bda1e2d08d VPC: more unittests for VpcService 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:37:36 -07:00
Alena Prokharchyk
d38e9eebed VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:25:02 -07:00
Alena Prokharchyk
a83c753354 VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 2012-08-07 11:24:04 -07:00
Alena Prokharchyk
cf64fda5d5 VPC: unittest preparation 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-07 11:23:52 -07:00
Alena Prokharchyk
972fe01aec VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:21:53 -07:00
Chip Childers
81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Wido den Hollander
5fa300cd9c kvm: Define CPU shares in domain XML 
Since libvirt 0.9.0 this can be specified in the XML.

This used to be set by invoking virsh after starting the instance, but this is cleaner.
 2012-08-07 17:49:58 +02:00
Chip Childers
64def0ef3d Removing tools/mockito directory, per discussion on dev list 2012-08-07 11:44:15 -04:00
Wido den Hollander
9212995501 kvm: Fix two small typos 2012-08-07 17:19:38 +02:00
Chip Childers
fa7dc09412 Fixed escape issues for wget commands in build_vagrant_basebox.sh 2012-08-07 11:11:27 -04:00
Wido den Hollander
00f12dd156 Add my key to the KEYS file 2012-08-07 12:08:14 +02:00
Abhinandan Prateek
0a2b6436dd bug CS-15859: put a check on volume limit 
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-07 10:47:54 +05:30
Sheng Yang
435480cb5a S2S VPN: CS-15641: Enable UDP port 4500 for NAT-T 2012-08-06 17:15:38 -07:00
Jessica Wang
37b66d3fb2 cloudstack 3.0 UI - infrastructure - Virtual Routers - detailView - add ChangeService action to VPC Virtual Router. 2012-08-06 16:01:02 -07:00
Jessica Wang
8da249e2a3 cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - detailView - add ChangeService action. 2012-08-06 16:00:05 -07:00
Jessica Wang
1e69966f75 cloudstack 3.0 UI - infrastructure - zone detail - network service providers - Virtual Router - Instances tab - exclude VPC Virtual Router here. 2012-08-06 15:59:11 -07:00
Jessica Wang
648dcf0ccf cloudstack 3.0 UI - infrastructure - zone detail - network service providers - VPC Virtual Router - Instances tab - add Type to listView (System, VPC or Project). 2012-08-06 15:50:38 -07:00
Sheng Yang
4908adb3a1 S2S VPN: CS-15852: Add vpninmask for VPN network usage 2012-08-06 15:32:36 -07:00
Sheng Yang
6e7b4bc07b S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:32:18 -07:00
Sheng Yang
84a1a311f9 S2S VPN: CS-15511: Add PFS support for VPN connection 2012-08-06 15:27:13 -07:00
Sheng Yang
a8cbba9e82 S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection 
The owner would be always same as VPC owner.

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
	setup/db/db/schema-304to305.sql
 2012-08-06 15:21:54 -07:00
Sheng Yang
70d704c786 S2S VPN: Allow name to be modified in updateCustomerGateway 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:20:33 -07:00
Sheng Yang
1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Brian Federle
469e180515 multiEdit: better handling for tag widget 
Place tagging widget in a separate action and dialog class; it is
indicated by a 'tag' icon for better clarity.

-- This removes the requirement to specify a dummy 'edit' action on
multi-rules; instead, the separate tag action will appear automatically
as long as 'tags' is specified under the multiEdit's properties.

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
	ui/index.jsp
 2012-08-06 14:15:41 -07:00
Jessica Wang
feb2ed1d2d cloudstack 3.0 UI - site to site VPN - Edit mode - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field. 2012-08-06 13:26:59 -07:00
Jessica Wang
532806ba13 cloudstack 3.0 UI - site to site VPN - listView - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field. 2012-08-06 13:25:21 -07:00
Jessica Wang
8b16e32b50 cloudstack 3.0 UI - site to site VPN - Create action - (1)split IKE policy field into 3 fields. (2)split ESP plicy field into 3 fields. (3)split lifetime field into 2 fields. (4) add Dead Peer Detection field. 2012-08-06 13:13:59 -07:00
Chip Childers
d968193c80 Devcloud puppet configuration additions 2012-08-06 15:57:25 -04:00
Chip Childers
1f28847f7d Devcloud puppet configuration additions 2012-08-06 15:57:25 -04:00
Chip Childers
28f4411c5d Adding top level KEYS file to prepare for a potential release. 2012-08-06 15:57:25 -04:00
Brian Federle
e149459358 VPC ACL UI: Fix alignment of multiEdit tables 
Conflicts:
	ui/css/cloudstack3.css
 2012-08-06 11:23:14 -07:00
Edison Su
0ec679c359 CS-14826, CS-14996: fix the md5 checksum 
Cherry-picked from 6618101d.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-08-06 10:32:33 -07:00
David Nalley
98fd82c129 removing project admin from git for move to svn 2012-08-06 11:34:19 -04:00
Mice Xia
5908e92fb8 several minor updates for configuration section in runbook 2012-08-06 11:21:01 -04:00
Hugo Trippaers
dd6fd2b68d Remove XTrustProvider as this class is kept within the 
cloud-iControl.jar.
 2012-08-06 16:31:36 +02:00
Chip Childers
6c07b777d3 Added license header to .gitignore 2012-08-06 09:52:25 -04:00
Pranav Saxena
feaea413c7 CS-15844:InterVlan - UI - Remove ACL Icon is not displayed properly for ACL Rules 2012-08-06 16:06:30 +05:30
Prasanna Santhanam
6ffafde33a Missing LICENSE headers for sandbox and __init__.py's 2012-08-04 17:29:47 +05:30