Multiple NICs UI: Refactor list view/detail view Puts secondary IP list view and detail view in dedicated section, instead of as part of the public IP address section.
Removes conditional API calls from public IP address list/detail view for secondary NICS. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f24ee207 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f24ee207 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f24ee207 Branch: refs/heads/Health-Check-UI Commit: f24ee207c46b2a5fcf7c96bb3f9590ad43a06f33 Parents: 4469e6b Author: Brian Federle <brian.fede...@citrix.com> Authored: Wed Mar 6 12:13:00 2013 -0800 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Wed Mar 6 12:13:00 2013 -0800 ---------------------------------------------------------------------- ui/scripts/instances.js | 2 +- ui/scripts/network.js | 733 +++++++++++++----------------------------- 2 files changed, 223 insertions(+), 512 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f24ee207/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 8240581..787239d 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1243,7 +1243,7 @@ } ], viewAll: { - path: 'network.ipAddresses', + path: 'network.secondaryNicIps', attachTo: 'ipaddress', title: function(args) { var title = _l('label.menu.ipaddresses') + ' - ' + args.context.nics[0].name; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f24ee207/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f685c9c..4d8798b 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1058,400 +1058,167 @@ } }); } - }, - - egressRules: { - title: 'label.egress.rules', - custom: function(args) { - var context = args.context; - - return $('<div>').multiEdit({ - context: context, - noSelect: true, - noHeaderActionsColumn: true, - fields: { - 'cidrlist': { edit: true, label: 'label.cidr.list', isOptional: true }, - 'protocol': { - label: 'label.protocol', - select: function(args) { - args.$select.change(function() { - var $inputs = args.$form.find('th, td'); - var $icmpFields = $inputs.filter(function() { - var name = $(this).attr('rel'); - - return $.inArray(name, [ - 'icmptype', - 'icmpcode' - ]) > -1; - }); - var $otherFields = $inputs.filter(function() { - var name = $(this).attr('rel'); + } + } + } + } + }, + secondaryNicIps: { + title: 'label.menu.ipaddresses', + listView: { + id: 'secondaryNicIps', + label: 'label.ips', + fields: { + ipaddress: { + label: 'label.ips', + converter: function(text, item) { + if (item.issourcenat) { + return text + ' [' + _l('label.source.nat') + ']'; + } - return name != 'cidrlist' && - name != 'icmptype' && - name != 'icmpcode' && - name != 'protocol' && - name != 'add-rule'; - }); + return text; + } + }, + zonename: { label: 'label.zone' }, + virtualmachinedisplayname: { label: 'label.vm.name' }, + state: { + converter: function(str) { + // For localization + return str; + }, + label: 'label.state', indicator: { 'Allocated': 'on', 'Released': 'off' } + } + }, + actions: { + add: { + label: 'label.acquire.new.ip', + addRow: 'true', + messages: { + confirm: function(args) { + 'message.acquire.new.ip'; + }, + notification: function(args) { + return 'label.acquire.new.ip'; + } + }, + action: function(args) { + var dataObj = {}; - if ($(this).val() == 'icmp') { - $icmpFields.show(); - $otherFields.hide(); - } else if ($(this).val() == 'all') { - $icmpFields.hide(); - $otherFields.hide(); - } else { - $icmpFields.hide(); - $otherFields.show(); - } - }); + $.ajax({ + url: createURL('addIpToNic'), + data: { + nicId: args.context.nics[0].id + }, + success: function(json) { + args.response.success({ + _custom: { + getUpdatedItem: function(data) { - args.response.success({ - data: [ - { name: 'tcp', description: 'TCP' }, - { name: 'udp', description: 'UDP' }, - { name: 'icmp', description: 'ICMP' }, - { name: 'all', description: 'All' } - ] - }); - } - }, - 'startport': { edit: true, label: 'label.start.port', isOptional: true }, - 'endport': { edit: true, label: 'label.end.port', isOptional: true }, - 'icmptype': { edit: true, label: 'ICMP.type', isHidden: true, isOptional: true }, - 'icmpcode': { edit: true, label: 'ICMP.code', isHidden: true, isOptional: true }, - 'add-rule': { - label: 'label.add', - addButton: true + }, + jobId: json.addiptovmnicresponse.jobid } - }, - add: { - label: 'label.add', - action: function(args) { - var data = { - protocol: args.data.protocol, - cidrlist: args.data.cidrlist, - networkid: args.context.networks[0].id - }; - - if (args.data.icmptype && args.data.icmpcode) { // ICMP - $.extend(data, { - icmptype: args.data.icmptype, - icmpcode: args.data.icmpcode - }); - } else { // TCP/UDP - $.extend(data, { - startport: args.data.startport, - endport: args.data.endport - }); - } + }); + } + }); + }, - $.ajax({ - url: createURL('createEgressFirewallRule'), - data: data, - dataType: 'json', - async: true, - success: function(json) { - var jobId = json.createegressfirewallruleresponse.jobid; + notification: { + poll: pollAsyncJobResult + } + } + }, - args.response.success({ - _custom: { - jobId: jobId - }, - notification: { - label: 'label.add.egress.rule', - poll: pollAsyncJobResult - } - }); - }, - error: function(json) { - args.response.error(parseXMLHttpResponse(json)); - } - }); - } - }, - actions: { - destroy: { - label: 'label.remove.rule', - action: function(args) { - $.ajax({ - url: createURL('deleteEgressFirewallRule'), - data: { - id: args.context.multiRule[0].id - }, - dataType: 'json', - async: true, - success: function(data) { - var jobID = data.deleteegressfirewallruleresponse.jobid; + dataProvider: function(args) { + var data = {}; - args.response.success({ - _custom: { - jobId: jobID - }, - notification: { - label: 'label.remove.egress.rule', - poll: pollAsyncJobResult - } - }); - }, - error: function(json) { - args.response.error(parseXMLHttpResponse(json)); - } - }); - } - } - }, - ignoreEmptyFields: true, - dataProvider: function(args) { - $.ajax({ - url: createURL('listEgressFirewallRules'), - data: { - listAll: true, - networkid: args.context.networks[0].id - }, - dataType: 'json', - async: true, - success: function(json) { - var response = json.listegressfirewallrulesresponse.firewallrule ? - json.listegressfirewallrulesresponse.firewallrule : []; - - args.response.success({ - data: $.map(response, function(rule) { - if (rule.protocol == 'all') { - $.extend(rule, { - startport: 'All', - endport: 'All' - }); - } else if (rule.protocol == 'tcp' || rule.protocol == 'udp') { - if (!rule.startport) { - rule.startport = ' '; - } + $.ajax({ + url: createURL('listNics'), + data: { + nicId: args.context.nics[0].id, + virtualmachineid: args.context.instances[0].id + }, + success: function(json) { + var ips = json.listnics.nic[0].secondaryip - if (!rule.endport) { - rule.endport = ' '; - } - } + args.response.success({ + data: $(ips).map(function(index, ip) { + return $.extend(ip, { + zoneid: args.context.instances[0].zoneid, + zonename: args.context.instances[0].zonename, + virtualmachinedisplayname: args.context.instances[0].displayname + }); + }) + }); + } + }); + }, - return rule; - }) - }); - } + // Detail view + detailView: { + name: 'Secondary IP address detail', + actions: { + remove: { + label: 'label.action.release.ip', + action: function(args) { + $.ajax({ + url: createURL('removeIpFromNic'), + data: { + id: args.context.secondaryNicIps[0].ipaddress + }, + success: function(json) { + args.response.success({ + _custom: { jobId: json.removeipfromnicresponse.jobid } }); } }); - } - }, - - addloadBalancer: { // EIP/ELB Basic zone: Add Load Balancer tab in network detailView - title: 'label.add.load.balancer', - custom: function(args) { - var context = args.context; - - return $('<div>').addClass('loadBalancer').multiEdit( - { - context: context, - listView: $.extend(true, {}, cloudStack.sections.instances, { - listView: { - filters: false, + }, + messages: { + confirm: function(args) { + return 'message.action.release.ip'; + }, + notification: function(args) { + return 'label.action.release.ip'; + } + }, + notification: { poll: pollAsyncJobResult } + } + }, + tabs: { + details: { + title: 'label.details', + fields: [ + { + ipaddress: { label: 'label.ip' } + }, + { + id: { label: 'label.id' }, + virtualmachinedisplayname: { label: 'label.vm.name' }, + zonename: { label: 'label.zone.name' } + } + ], - dataProvider: function(args) { - var data = { - page: args.page, - pageSize: pageSize, - domainid: g_domainid, - account: g_account, - networkid: args.context.networks[0].id, - listAll: true - }; - - $.ajax({ - url: createURL('listVirtualMachines'), - data: data, - dataType: 'json', - async: true, - success: function(data) { - args.response.success({ - data: $.grep( - data.listvirtualmachinesresponse.virtualmachine ? - data.listvirtualmachinesresponse.virtualmachine : [], - function(instance) { - var nonAutoScale=0; - if(instance.displayname == null) - nonAutoScale = 1; - else{ - if( instance.displayname.match(/AutoScale-LB-/)==null) - nonAutoScale =1; - else { - if(instance.displayname.match(/AutoScale-LB-/).length) - nonAutoScale =0; - } - } - var isActiveState= $.inArray(instance.state, ['Destroyed','Expunging']) == -1; - return nonAutoScale && isActiveState; - } - ) - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } - }); - } - } - }), - multipleAdd: true, - fields: { - 'name': { edit: true, label: 'label.name' }, - 'publicport': { edit: true, label: 'label.public.port' }, - 'privateport': { edit: true, label: 'label.private.port' }, - 'algorithm': { - label: 'label.algorithm', - select: function(args) { - args.response.success({ - data: [ - { name: 'roundrobin', description: _l('label.round.robin') }, - { name: 'leastconn', description: _l('label.least.connections') }, - { name: 'source', description: _l('label.source') } - ] - }); - } - }, - 'sticky': { - label: 'label.stickiness', - custom: { - buttonLabel: 'label.configure', - action: cloudStack.lbStickyPolicy.dialog() - } - }, - 'autoScale': { - label: 'AutoScale', - custom: { - requireValidation: true, - buttonLabel: 'label.configure', - action: cloudStack.uiCustom.autoscaler(cloudStack.autoscaler) - } - }, - 'add-vm': { - label: 'label.add.vms', - addButton: true - } - }, - - add: { //basic zone - elastic IP - Add Load Balancer tab - Add VMs button - label: 'label.add.vms', - action: function(args) { - var data = { - algorithm: args.data.algorithm, - name: args.data.name, - privateport: args.data.privateport, - publicport: args.data.publicport, - openfirewall: false, - domainid: g_domainid, - account: g_account - }; - - 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 - }); - } - else { //from Guest Network section - $.extend(data, { - networkid: args.context.networks[0].id - }); - } - - var stickyData = $.extend(true, {}, args.data.sticky); - - $.ajax({ - url: createURL('createLoadBalancerRule'), - data: data, - dataType: 'json', - async: true, - success: function(data) { - var itemData = args.itemData; - //var jobID = data.createloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule - - $.ajax({ - url: createURL('assignToLoadBalancerRule'), - data: { - id: data.createloadbalancerruleresponse.id, - virtualmachineids: $.map(itemData, function(elem) { - return elem.id; - }).join(',') - }, - dataType: 'json', - async: true, - success: function(data) { - var jobID = data.assigntoloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule - var lbCreationComplete = false; + dataProvider: function(args) { + $.ajax({ + url: createURL('listNics'), + data: { + nicId: args.context.nics[0].id, + virtualmachineid: args.context.instances[0].id + }, + success: function(json) { + var ips = json.listnics.nic[0].secondaryip - args.response.success({ - _custom: { - jobId: jobID - }, - notification: { - label: 'label.add.load.balancer', - poll: function(args) { - var complete = args.complete; - var error = args.error; - - pollAsyncJobResult({ - _custom: args._custom, - complete: function(args) { - if (lbCreationComplete) { - return; - } - - lbCreationComplete = true; - cloudStack.dialog.notice({ - message: _l('message.add.load.balancer.under.ip') + - args.data.loadbalancer.publicip - }); - - if (stickyData && - stickyData.methodname && - stickyData.methodname != 'None') { - cloudStack.lbStickyPolicy.actions.add( - args.data.loadbalancer.id, - stickyData, - complete, // Complete - complete // Error - ); - } else { - complete(); - } - }, - error: error - }); - } - } - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } + args.response.success({ + data: $.grep($(ips).map(function(index, ip) { + return $.extend(ip, { + zonename: args.context.instances[0].zonename, + virtualmachinedisplayname: args.context.instances[0].displayname }); - } - }, - - - dataProvider: function(args) { - args.response.success({ //no LB listing in AddLoadBalancer tab - data: [] - }); - } + }), function(ip) { + return ip.ipaddress == args.context.secondaryNicIps[0].ipaddress; + })[0] + }); } - ); + }); } } } @@ -1595,51 +1362,32 @@ account: g_account }); } - } - - if (args.context.nics) { - $.ajax({ - url: createURL('addIpToNic'), - data: { - nicId: args.context.nics[0].id - }, - success: function(json) { - args.response.success({ - _custom: { - getUpdatedItem: function(data) { + } - }, - jobId: json.addiptovmnicresponse.jobid - } - }); - } - }); - } else { - $.ajax({ - url: createURL('associateIpAddress'), - data: dataObj, - success: function(data) { - args.response.success({ - _custom: { - jobId: data.associateipaddressresponse.jobid, - getUpdatedItem: function(data) { - var newIP = data.queryasyncjobresultresponse.jobresult.ipaddress; - return $.extend(newIP, { - state: 'Allocated' - }); - }, - getActionFilter: function() { - return actionFilters.ipAddress; - } + $.ajax({ + url: createURL('associateIpAddress'), + data: dataObj, + success: function(data) { + args.response.success({ + _custom: { + jobId: data.associateipaddressresponse.jobid, + getUpdatedItem: function(data) { + var newIP = data.queryasyncjobresultresponse.jobresult.ipaddress; + return $.extend(newIP, { + state: 'Allocated' + }); + }, + getActionFilter: function() { + return actionFilters.ipAddress; } - }); - }, + } + }); + }, - error: function(json) { - args.response.error(parseXMLHttpResponse(json)); - } - }); - } + error: function(json) { + args.response.error(parseXMLHttpResponse(json)); + } + }); }, notification: { @@ -1674,49 +1422,27 @@ }); } - if (args.context.nics) { - $.ajax({ - url: createURL('listNics'), - data: { - nicId: args.context.nics[0].id, - virtualmachineid: args.context.instances[0].id - }, - success: function(json) { - var ips = json.listnics.nic[0].secondaryip + $.ajax({ + url: createURL('listPublicIpAddresses'), + data: data, + dataType: "json", + async: true, + success: function(json) { + var items = json.listpublicipaddressesresponse.publicipaddress; - args.response.success({ - data: $(ips).map(function(index, ip) { - return $.extend(ip, { - zonename: args.context.instances[0].zonename, - virtualmachinedisplayname: args.context.instances[0].displayname - }); - }) - }); - } - }); - } else { - $.ajax({ - url: createURL('listPublicIpAddresses'), - data: data, - dataType: "json", - async: true, - success: function(json) { - var items = json.listpublicipaddressesresponse.publicipaddress; - - $(items).each(function() { - getExtaPropertiesForIpObj(this, args); - }); - - args.response.success({ - actionFilter: actionFilters.ipAddress, - data: items - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } - }); - } + $(items).each(function() { + getExtaPropertiesForIpObj(this, args); + }); + + args.response.success({ + actionFilter: actionFilters.ipAddress, + data: items + }); + }, + error: function(data) { + args.response.error(parseXMLHttpResponse(data)); + } + }); }, // Detail view @@ -2070,53 +1796,39 @@ remove: { label: 'label.action.release.ip', action: function(args) { - if (args.context.nics) { - $.ajax({ - url: createURL('removeIpFromNic'), - data: { - id: args.context.ipAddresses[0].id - }, - success: function(json) { - args.response.success({ - _custom: { jobId: json.removeipfromnicresponse.jobid } - }); - } - }); - } else { - $.ajax({ - url: createURL('disassociateIpAddress'), - data: { - id: args.context.ipAddresses[0].id - }, - dataType: 'json', - async: true, - success: function(data) { - args.response.success({ - _custom: { - jobId: data.disassociateipaddressresponse.jobid, - getActionFilter: function() { - return function(args) { - var allowedActions = ['enableStaticNAT']; + $.ajax({ + url: createURL('disassociateIpAddress'), + data: { + id: args.context.ipAddresses[0].id + }, + dataType: 'json', + async: true, + success: function(data) { + args.response.success({ + _custom: { + jobId: data.disassociateipaddressresponse.jobid, + getActionFilter: function() { + return function(args) { + var allowedActions = ['enableStaticNAT']; - return allowedActions; - }; - }, - getUpdatedItem: function(args) { - return { - state: 'Released' - }; - }, - onComplete: function() { - $(window).trigger('cloudStack.fullRefresh'); - } + return allowedActions; + }; + }, + getUpdatedItem: function(args) { + return { + state: 'Released' + }; + }, + onComplete: function() { + $(window).trigger('cloudStack.fullRefresh'); } - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } - }); - } + } + }); + }, + error: function(data) { + args.response.error(parseXMLHttpResponse(data)); + } + }); }, messages: { confirm: function(args) { @@ -2180,19 +1892,18 @@ dataProvider: function(args) { var items = args.context.ipAddresses; - // Get network data $.ajax({ url: createURL('listPublicIpAddresses'), - data: { + data: { id: args.context.ipAddresses[0].id, - listAll: true + listAll: true }, dataType: "json", async: true, success: function(json) { var ipObj = json.listpublicipaddressesresponse.publicipaddress[0]; getExtaPropertiesForIpObj(ipObj, args); - + var network = $.grep( args.context.vpc ? args.context.vpc[0].network : args.context.networks,
