d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
39485a4a56
VPC: CS-15821 - corrected mac address format for vpc private network
2012-08-02 18:07:15 -07:00
c35153cefd
Patch from Joe Brockmeier - Adding Apache license, DTD fixes, &product;
...
entity and other misc fixes to d-named files under /doc.
2012-08-02 19:44:45 -04:00
25b75c1bff
cloudstack 3.0 UI - site to site VPN - (1) implement Add VPN connection action in VPN connection listView. (2) remove Add VPN connection action from VPN customer gateway detailView.
2012-08-02 16:01:34 -07:00
47f309af6d
cloudstack 3.0 UI - site to site VPN - VPN customer gateway - add name field.
2012-08-02 15:30:15 -07:00
95b6a5eeda
CS-15807 :Network label for OVM support on UI : Reviewed-By - Brian Federle
2012-08-03 03:18:26 +05:30
c12734eab6
CS-15798: Support editing of VPC resource limits
2012-08-02 14:22:45 -07:00
1276aedd35
rbd: Remove debug line
...
This is no longer needed. It was here for testing purposes, but it was actually a bug in libvirt which has been resolved.
2012-08-02 23:05:00 +02:00
d4be261f63
Patch from Joe Brockmeier - Adding Apache license headers, fixed DTD,
...
added &PRODUCT; entity in place of CloudPlatform/CloudStack.
2012-08-02 16:10:51 -04:00
81be063882
Patch from Joe Brockmeier - Adding Apache license headers to all b*xml files, fixing
...
the DTD to remove local C:/ drive reference, adding &product; entity to
replace CloudPlatform. Also some misc fixes.
2012-08-02 16:05:41 -04:00
0d339c94fb
Patch from Joe Brockmeier - Adding Apache license headers to all a*xml A*xml files, fixing the DTD to remove local C:/ drive reference, adding &product; entity to replace CloudPlatform. Also some misc fixes.
2012-08-02 16:00:27 -04:00
6747df6d32
Added devcloudbase provisioning logic
2012-08-02 15:58:32 -04:00
34cedcf37f
Corrected box label
2012-08-02 15:34:14 -04:00
f25842f142
Devcloud setup scripts - work in progress
2012-08-02 15:17:49 -04:00
2cb141e6ae
VPC: Update site-to-site VPN creation flow
...
If no VPN gateway exists for a VPC, then immediately show a dialog box
asking if user wants to add. If so, create VPN gateway and show list
view afterwards.
- This removes the 'add' button from the list view, moving the code up
a level in the object to siteToSiteVPN.add
- In addition there is a new function, siteToSiteVPN.preCheck, which
returns true/false. If true, then show list view immediately; if
false, show dialog and go through creation process, showing list
view afterwards.
Conflicts:
ui/scripts/vpc.js
2012-08-02 11:34:51 -07:00
3996094e55
Fix bug: can not deploy VM on ESXi due to incorrect
...
secondaryStorageResource used for SSVM
Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.
Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource
RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
2012-08-02 11:20:35 -07:00
e116c24989
Removed obsolete file SearchCriteria2Test.java which caused ant unittest
...
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
2012-08-02 10:33:06 -07:00
895b6a3e4b
CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread
...
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
2012-08-02 21:50:44 +05:30
9ee803ee02
License header updates for the deps folder
2012-08-02 10:45:48 -04:00
1a18d5ca7f
Removing the obsolete scripts directory from agent-simulator
...
These are legacy bash scripts which were used to setup configurations of
mgmt server when testing its scalability.
2012-08-02 19:44:17 +05:30
714a9fad12
License header updates for debian folder
2012-08-02 10:02:22 -04:00
9ed5d3840a
License header updates for the core folder
2012-08-02 09:22:36 -04:00
42ef767c4a
License header updates.
2012-08-02 09:16:16 -04:00
9c127cf608
Fix rpm build after kvm move
2012-08-02 11:56:33 +02:00
eb116b6ecb
CS-15318: Do not allow user to stop a VM in Starting State (hiding the stop button)
2012-08-02 14:22:53 +05:30
cf06317671
Probably a left-over of a merge conflict
2012-08-02 09:33:48 +02:00
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
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
a4c52d41e8
VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC
2012-08-01 18:57:52 -07:00
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
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
d2df3e0102
VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols
2012-08-01 18:48:21 -07:00
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
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
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
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
70713043cf
VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone
2012-08-01 18:20:43 -07:00
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
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
d49776938b
CS-15713 : remove listen section, when ld is removed
2012-08-01 17:22:34 -07:00
1aa4ed84b9
Merge VPC support in VMware integration
2012-08-01 17:27:59 -07:00
10cf9c2f20
CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider.
2012-08-01 17:18:28 -07:00
387fe57771
don't log null response
2012-08-01 16:54:50 -07:00
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
904ef73398
Build fix.
2012-08-01 16:41:38 -07:00
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
babc868de6
listView UI: Fix case where $breadcrumb isn't present
2012-08-01 15:57:28 -07:00
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
Alena Prokharchyk
Chip Childers
Jessica Wang
Pranav Saxena
Brian Federle
Wido den Hollander
Edison Su
mice xia
Prasanna Santhanam
Hugo Trippaers
anthony
Kelven Yang
Rohit Yadav
Sheng Yang