apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 14231: Per-account public IP range support

Browse Source 
Add UI support for associating IP ranges with specific account + domain;
this is accessible by going to the system network graph->public->IP
range edit, where clicking on 'Add user' button opens a dialog to
specify an account and domain.

Note that right now editing of existing IP ranges is not supported, so
in order to associate a range with another account, the IP range needs
to be dropped and re-created with the new account configuration.
This commit is contained in:
Brian Federle 2012-03-21 09:29:31 -07:00
parent f9a7619ae5
commit e682d9a622
2 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/css/cloudstack3.css
View File

@ -6428,7 +6428,7 @@ div.panel.ui-dialog div.list-view div.fixed-header {
background: url(../images/bg-gradients.png) 0px -271px;
border: 1px solid #B7B7B7;
color: #485867;
font-size: 11px;
font-size: 10px;
/*+text-shadow:0px 1px #FFFFFF;*/
-moz-text-shadow: 0px 1px #FFFFFF;
-webkit-text-shadow: 0px 1px #FFFFFF;

85
ui/scripts/system.js
View File

@ -1,4 +1,64 @@
(function($, cloudStack) {
cloudStack.publicIpRangeAccount = {
dialog: function(args) {
return function(args) {
var data = args.data ? args.data : {};
var fields = {
account: { label: 'Account', defaultValue: data.account },
domainid: {
label: 'Domain',
defaultValue: data.domainid,
select: function(args) {
$.ajax({
url: createURL('listDomains'),
data: { listAll: true },
success: function(json) {
args.response.success({
data: $.map(json.listdomainsresponse.domain, function(domain) {
return {
id: domain.id,
description: domain.path
};
})
});
}
});
}
}
};
var success = args.response.success;
if (args.$item) { // Account data is read-only after creation
$.ajax({
url: createURL('listDomains'),
data: { id: data.domainid, listAll: true },
success: function(json) {
var domain = json.listdomainsresponse.domain[0];
cloudStack.dialog.notice({
message: '<ul><li>' + _l('label.account') + ': ' + data.account + '</li>' +
'<li>' + _l('label.domain') + ': ' + domain.path + '</li></ul>'
});
}
});
} else {
cloudStack.dialog.createForm({
form: {
title: 'label.add.account',
desc: '(optional) Please specify an account to be associated with this IP range.',
fields: fields
},
after: function(args) {
var data = cloudStack.serializeForm(args.$form);
success({ data: data });
}
});
}
};
}
};
var zoneObjs, podObjs, clusterObjs, domainObjs, networkOfferingObjs, physicalNetworkObjs;
var selectedClusterObj, selectedZoneObj, selectedPublicNetworkObj, selectedManagementNetworkObj, selectedPhysicalNetworkObj, selectedGuestNetworkObj;
@ -345,6 +405,13 @@
'vlan': { edit: true, label: 'label.vlan', isOptional: true },
'startip': { edit: true, label: 'label.start.IP' },
'endip': { edit: true, label: 'label.end.IP' },
'account': {
label: 'label.account',
custom: {
buttonLabel: 'label.add.account',
action: cloudStack.publicIpRangeAccount.dialog()
}
},
'add-rule': { label: 'label.add', addButton: true }
},
add: {
@ -364,6 +431,11 @@
if(args.data.endip != null && args.data.endip.length > 0)
array1.push("&endip=" + args.data.endip);
if (args.data.account) {
array1.push("&account=" + args.data.account.account);
array1.push("&domainid=" + args.data.account.domainid);
}
array1.push("&forVirtualNetwork=true"); //indicates this new IP range is for public network, not guest network
$.ajax({
@ -419,7 +491,18 @@
dataType: "json",
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
args.response.success({data: items});
args.response.success({
data: $.map(items, function(item) {
return $.extend(item, {
account: {
_buttonLabel: item.account,
account: item.account,
domainid: item.domainid
}
});
})
});
}
});
}