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

cloudstack 3.0 UI - VPC - IP Address - create Port Forwarding rule with tier ID.

This commit is contained in:
Jessica Wang 2012-07-10 17:07:37 -07:00
parent 5ecd1c7492
commit 708b4f7003
1 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ui/scripts/network.js
View File

@ -2436,15 +2436,24 @@
headerFields: {
tier: {
label: 'Tier',
select: function(args) {
args.response.success({
data: [
{ id: '', name: '', description: 'None' },
{ id: '1', name: 'tier1', description: 'tier1' },
{ id: '2', name: 'tier2', description: 'tier2' },
{ id: '3', name: 'tier3', description: 'tier3' }
]
});
select: function(args) {
if('vpc' in args.context) {
$.ajax({
url: createURL("listNetworks"),
data: {
vpcid: args.context.vpc[0].id,
listAll: true
},
success: function(json) {
var networks = json.listnetworksresponse.network;
var items = [];
$(networks).each(function(){
items.push({id: this.id, description: this.displaytext});
});
args.response.success({ data: items });
}
});
}
}
}
},
@ -2521,19 +2530,25 @@
},
add: {
label: 'label.add.vm',
action: function(args) {
var openFirewall = false;
action: function(args) {
var data = $.extend(args.data, {
openfirewall: false,
ipaddressid: args.context.ipAddresses[0].id,
virtualmachineid: args.itemData[0].id
});
if('vpc' in args.context) { //from VPC section
if(args.data.tier == null) {
args.response.error('Tier is required');
return;
}
$.extend(data, {
networkid: args.data.tier
});
}
$.ajax({
url: createURL('createPortForwardingRule'),
data: $.extend(args.data, {
openfirewall: openFirewall,
ipaddressid: args.context.ipAddresses[0].id,
virtualmachineid: args.itemData[0].id
}),
dataType: 'json',
async: true,
data: data,
success: function(data) {
args.response.success({
_custom: {
@ -2636,16 +2651,15 @@
}
});
});
// Check if tiers are present; hide/show header drop-down
var hasTiers = false;
var $headerFields = $multi.find('.header-fields');
if (hasTiers) {
$headerFields.hide();
} else {
$headerFields.show();
}
// Check if tiers are present; hide/show header drop-down
var $headerFields = $multi.find('.header-fields');
if ('vpc' in args.context) {
$headerFields.show();
}
else if('networks' in args.context){
$headerFields.hide();
}
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));