apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3268: Support transfer of portable IP

Browse Source 
Allow UI to implicitly transfer portable IP, through enabling static
NAT on a VM/NIC from another cross-zone network.
This commit is contained in:
Brian Federle 2013-08-07 16:16:56 -07:00
parent cab72c0193
commit f1680ef9ff
1 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ui/scripts/network.js
View File

@ -35,9 +35,49 @@
return elemData; return elemData;
}; };
var instanceSecondaryIPSubselect = function(args) { var instanceSecondaryIPSubselect = function(args) {
var instance = args.context.instances[0]; var instance = args.context.instances[0];
var network = args.context.networks[0]; var network = args.context.networks[0];
if (args.context.ipAddresses[0].isportable) {
$.ajax({
url: createURL('listNics'),
data: {
virtualmachineid: instance.id
},
success: function(json) {
var nics = json.listnicsresponse.nic;
var ipSelection = [];
$(nics).map(function(index, nic) {
var ips = nic.secondaryip ? nic.secondaryip : [];
var prefix = '[NIC ' + (index + 1) + '] ';
// Add primary IP as default
ipSelection.push({
id: nic.networkid + ',-1',
description: prefix + nic.ipaddress + ' (Primary)'
});
// Add secondary IPs
$(ips).map(function(index, ip) {
ipSelection.push({
id: nic.networkid + ',' + ip.ipaddress,
description: prefix + ip.ipaddress
});
});
});
args.response.success({
data: ipSelection
});
}
});
return;
}
var nic = $.grep(instance.nic, function(nic) { var nic = $.grep(instance.nic, function(nic) {
return nic.networkid == network.id; return nic.networkid == network.id;
})[0]; })[0];
@ -2338,7 +2378,7 @@
networkid: $tierSelect.val(), networkid: $tierSelect.val(),
vpcid: args.context.vpc[0].id vpcid: args.context.vpc[0].id
}); });
} else if ('networks' in args.context) { } else if ('networks' in args.context && !args.context.ipAddresses[0].isportable) {
$.extend(data, { $.extend(data, {
networkid: args.context.networks[0].id networkid: args.context.networks[0].id
}); });
@ -2382,7 +2422,17 @@
virtualmachineid: args.context.instances[0].id virtualmachineid: args.context.instances[0].id
}; };
if (args._subselect && args._subselect != -1) { if (args.context.ipAddresses[0].isportable) {
var subselect = args._subselect.split(',');
var networkid = subselect[0];
var vmguestip = subselect[1];
data.networkid = subselect[0];
if (parseInt(vmguestip) !== -1) {
data.vmguestip = vmguestip;
}
} else if (args._subselect && args._subselect != -1) {
data.vmguestip = args._subselect; data.vmguestip = args._subselect;
} }