From a8c883ba53fd4345f8f22bed72beb99023245a5c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 13 Jul 2012 13:50:02 -0700 Subject: [PATCH 1/3] cloudstack 3.0 UI - VPC - IP Address - PF, LB, EnableStaticNAT dialogbox - tier dropdown - list only tiers that support corresponding service. --- ui/scripts/network.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a404a67af1b..9a9facc9ad4 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -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, { From c17bca4088a66e67eac9ee2eac6c4555e75b0299 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 13 Jul 2012 15:56:51 -0700 Subject: [PATCH 2/3] CS-15579 - perform check when account/domainId is passed to list call by the regular user --- server/src/com/cloud/user/AccountManagerImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 10094de7c2d..8bf4ba34029 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -2198,7 +2198,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag } @Override - public void buildACLSearchParameters(Account caller, Long id, String accountName, Long projectId, List permittedAccounts, Ternary domainIdRecursiveListProject, + public void buildACLSearchParameters(Account caller, Long id, String accountName, Long projectId, List + permittedAccounts, Ternary 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 idList = new ArrayList(); From 0b3805b7cc42255b870e2a8b6f6a98a453b53287 Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 13 Jul 2012 16:44:00 -0700 Subject: [PATCH 3/3] CS-11581 : remove xenserver network, when it is not used --- .../cloud/hypervisor/xen/resource/XenServer56Resource.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index 7edc74212c5..cc644141e6b 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -129,6 +129,10 @@ public class XenServer56Resource extends CitrixResourceBase { + " due to " + e.toString()); } } + try { + network.destroy(conn); + } catch (Exception e){ + } return; } } catch (XenAPIException e) {