etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
prachi 2012-07-13 16:56:22 -07:00
parent f40b6e61b0 0b3805b7cc
commit 15664dd37a
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
View File

@ -129,6 +129,10 @@ public class XenServer56Resource extends CitrixResourceBase {
+ " due to " + e.toString());
}
}
try {
network.destroy(conn);
} catch (Exception e){
}
return;
}
} catch (XenAPIException e) {

5
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -2198,7 +2198,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
}
@Override
public void buildACLSearchParameters(Account caller, Long id, String accountName, Long projectId, List<Long> permittedAccounts, Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject,
public void buildACLSearchParameters(Account caller, Long id, String accountName, Long projectId, List<Long>
permittedAccounts, Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject,
boolean listAll, boolean forProjectInvitation) {
Long domainId = domainIdRecursiveListProject.first();
@ -2224,6 +2225,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
}
if (userAccount != null) {
checkAccess(caller, null, false, userAccount);
//check permissions
permittedAccounts.add(userAccount.getId());
} else {
List<IdentityProxy> idList = new ArrayList<IdentityProxy>();

11
ui/scripts/network.js
View File

@ -1271,7 +1271,8 @@
async: false,
data: {
vpcid: args.context.vpc[0].id,
listAll: true
listAll: true,
supportedservices: 'StaticNat'
},
success: function(json) {
var networks = json.listnetworksresponse.network;
@ -2110,7 +2111,8 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
listAll: true
listAll: true,
supportedservices: 'Lb'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {
@ -2121,7 +2123,7 @@
$.extend(data, {
id: args.context.ipAddresses[0].associatednetworkid
});
} //???
}
$.ajax({
url: createURL("listNetworks"),
@ -2496,7 +2498,8 @@
select: function(args) {
if('vpc' in args.context) {
var data = {
listAll: true
listAll: true,
supportedservices: 'PortForwarding'
};
if(args.context.ipAddresses[0].associatednetworkid == null) {
$.extend(data, {