12792 Commits

Author SHA1 Message Date
Alena Prokharchyk
ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Alena Prokharchyk
21e8fb372b VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 19:02:43 -07:00
Alena Prokharchyk
a4c52d41e8 VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC 2012-08-01 18:57:52 -07:00
Alena Prokharchyk
b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
Alena Prokharchyk
5cbe3d9722 ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
Conflicts:

	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
Alena Prokharchyk
d2df3e0102 VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols 2012-08-01 18:48:21 -07:00
Alena Prokharchyk
48102871e9 VPC: add account/domain info to the API vpc response
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2012-08-01 18:48:09 -07:00
Alena Prokharchyk
1168747128 Fixed numerous bugs in listNetworks call related to filtering by projectId/listAll/domainId/etc. All the rules below are followed now:
1) When account/domainId or projectId are passed in:

* list all account specific networks of the account/project
* list all domain level networks from the domainId + subdomains if the targeted network has allowSubdomainAccess = true

In other words, we use all the networks that can be used for vm deployment by account/domainId.

If listAll is not specified in the request, account/domainId are being defaulted to the account/domainId of the caller
listAll is ignored if the call is being done by the regular user.

2) listAll is passed in by the Root admin, we list:

* all Account specific networks in the system
* all domain specific networks in the system

3) listAll is passed by the Domain admin, we list:

* All Account specific networks belonging to domain/subdomains of the domain admin.
* All domain specific networks belonging to domain/subdomains of the domain admin
* All domain specific networks allowing subdomain access belonging to the parent domain.

4) domainId - can be passed either with or without listAll. We list:

* all account specific networks belonging to the domain
* all domain specific networks of the domain
* all domain specific networks of the subdomains if isRecursive = true is passed in

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 18:46:36 -07:00
Alena Prokharchyk
7cceaae912 VPC: moved vpc related code from NetworkManager to VpcManager
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
Alena Prokharchyk
ebe53a91d7 VPC: reduced visability for some vpc related methods
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 18:33:12 -07:00
Alena Prokharchyk
70713043cf VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone 2012-08-01 18:20:43 -07:00
Alena Prokharchyk
9be0a5525d VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only 2012-08-01 18:19:20 -07:00
Alena Prokharchyk
e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
anthony
d49776938b CS-15713 : remove listen section, when ld is removed 2012-08-01 17:22:34 -07:00
Kelven Yang
1aa4ed84b9 Merge VPC support in VMware integration 2012-08-01 17:27:59 -07:00
Jessica Wang
10cf9c2f20 CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider. 2012-08-01 17:18:28 -07:00
Edison Su
387fe57771 don't log null response 2012-08-01 16:54:50 -07:00
Rohit Yadav
db7ace389d README: fix brand This is just a dummy patch to test post-review cmd tool Hope this works
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-08-01 16:54:50 -07:00
Sheng Yang
904ef73398 Build fix. 2012-08-01 16:41:38 -07:00
Jessica Wang
a902443708 CS-15792: cloudstack 3.0 UI - VPC - pass domainid+account instead of listAll to all listNetworks API calls under VPC section. 2012-08-01 16:10:41 -07:00
Brian Federle
babc868de6 listView UI: Fix case where $breadcrumb isn't present 2012-08-01 15:57:28 -07:00
Brian Federle
640dcdec1f cloudBrowser / list view UI: Show subsection in breadcrumb
If in a section with multiple subsections, show active subsection in
the breadcrumb.

For example, if in storage->snapshots, display 'Storage - Snapshots'
based on the 'title' attribute for the main section and subsetion.

-- Note: this disables the 'fixSize' functionality which resizes long
   breadcrumb trails, due to incompatibility with this new feature. It
   is going to be reimplemented anyway, as it is fairly glitchy in its
   current incarnation.
2012-08-01 15:57:24 -07:00
Brian Federle
8120785bab listView UI: Fix case where $breadcrumb isn't present 2012-08-01 15:57:00 -07:00
Sheng Yang
96ac18d8ed S2S VPN: CS-15810: Add check for customer gateway subnets / VPC CIDR overlap 2012-08-01 15:31:17 -07:00
Edison Su
88b317f7fd Do not log null lines in agent logfile 2012-08-01 15:26:41 -07:00
Brian Federle
6ad7f2f80b CS-15740: Show 'please select a tier' instead of blank default option
For VPC enable static NAT dialog, a tier always needs to be selected
-- this is now indicated in the default option select.
2012-08-01 14:36:46 -07:00
Brian Federle
ef9dd4210e cloudBrowser / list view UI: Show subsection in breadcrumb
If in a section with multiple subsections, show active subsection in
the breadcrumb.

For example, if in storage->snapshots, display 'Storage - Snapshots'
based on the 'title' attribute for the main section and subsetion.

-- Note: this disables the 'fixSize' functionality which resizes long
   breadcrumb trails, due to incompatibility with this new feature. It
   is going to be reimplemented anyway, as it is fairly glitchy in its
   current incarnation.
2012-08-01 14:36:15 -07:00
Brian Federle
8c8c10fbbd CS-15799: Show 'network domain' instead of 'network domain text' 2012-08-01 14:36:15 -07:00
Edison Su
05df0a1965 Another clean up for unnecessary parameter conn Clean up unused
parameter conn. Add test for LibvirtVMDef Add support for ethernet type
RB: https://reviews.apache.org/r/6284/
Send-by: tomoe@midokura.com
2012-08-01 13:59:11 -07:00
Edison Su
3a184a1b49 remove the unused files 2012-08-01 13:57:33 -07:00
Chip Childers
99b0ea7b10 License header update for the client folder 2012-08-01 13:49:10 -04:00
Chip Childers
c34fc9eed2 Corrected license header for build.xml 2012-08-01 11:43:19 -04:00
Chip Childers
d6689072d9 License header updates for the build folder. 2012-08-01 11:36:10 -04:00
Wido den Hollander
2ffc9907f7 kvm: Use libvirt for polling storage pool capacity and allocation
Since we are using libvirt for handling our storage pools we should rely on that information as well.

Before fetching the capacity we refresh the pool so libvirt has the most up-to-date information.

This is not needed with newly created pools since libvirt does a refresh on creation.
2012-08-01 17:18:11 +02:00
Chip Childers
a1b2f7aec1 Corrected SQL license header comment format 2012-08-01 10:30:45 -04:00
Chip Childers
c6b891ae76 License header update for awsapi-setup 2012-08-01 10:30:45 -04:00
Koushik Das
3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
2012-08-01 19:39:30 +05:30
Chip Childers
3cbc0e324f awsapi license header changes 2012-08-01 09:34:12 -04:00
Nitin Mehta
85398bb2e0 bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting
Reviewed-by: Kishan
2012-08-01 18:16:01 +05:30
Wido den Hollander
34ed15e44e kvm: Remove main methods in various classes
This is dead code which seems to be in there from the VMOps time.

No reason for this to be here, so this can safely be removed
2012-08-01 14:42:31 +02:00
Hugo Trippaers
65daade79a Add a "ping" function to the resource and allow commands to be retried. 2012-08-01 14:11:32 +02:00
Pranav Saxena
250501c56d CS-14907:Download volume option to be present only if it is in READY state since it has moved to the primary storage 2012-08-01 10:58:22 +05:30
Chip Childers
9ef5b42202 Build configuration change from Ewan Mellor: https://reviews.apache.org/r/6266/ 2012-07-31 21:21:35 -04:00
Chip Childers
640087b534 api license header fixes 2012-07-31 20:31:57 -04:00
Chip Childers
a777f515ef Agent-simulator license header corrections 2012-07-31 20:21:13 -04:00
Chip Childers
d204fa9940 Agent-simulator license header corrections 2012-07-31 20:18:02 -04:00
Wido den Hollander
d333e31069 agent: Add cloud-plugin-hypervisor-kvm.jar to the classpath
Without this the JAR won't end up in the CLASSPATH in the agent init script
2012-07-31 23:50:48 +02:00
Brian Federle
379ba3b292 Update VPC UI:
-Update with additional actions

-Fix dataProvider for tiers

-Add 'view all IP addresses' link to tier details
2012-07-31 14:38:46 -07:00
Brian Federle
1c7e68aa49 VPC widget: fix missing $browser reference 2012-07-31 14:37:55 -07:00
Chip Childers
2d1d43dd2b License file header updates for agent 'dot' files. 2012-07-31 17:30:26 -04:00