diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 4fb5ffe5cf9..08307010482 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2000,40 +2000,14 @@ $icmpFields.parent().find('label.error').hide(); } }); - - var data = [ - { name: 'tcp', description: 'TCP' }, - { name: 'udp', description: 'UDP' } - ]; - //ICMP portocol is not supported in Firewall provided by JuniperSRX - $.ajax({ - url: createURL('listNetworkOfferings'), - data: { - id: args.context.networks[0].networkofferingid - }, - async: false, - success: function(json) { - var serviceArray = json.listnetworkofferingsresponse.networkoffering[0].service; - var FirewallProviderArrayIncludesJuniperSRX = false; - for(var i = 0; i < serviceArray.length; i++) { - if(serviceArray[i].name == "Firewall") { - var providerArray = serviceArray[i].provider; - for(var k = 0; k < providerArray.length; k++) { - if(providerArray[k].name == "JuniperSRX") { - FirewallProviderArrayIncludesJuniperSRX = true; - break; - } - } - break; - } - } - if(FirewallProviderArrayIncludesJuniperSRX == false) { - data.push({ name: 'icmp', description: 'ICMP' }); //show ICMP option only when provider is not JuniperSRX - } - } - }); - - args.response.success({data: data}); + + args.response.success({ + data: [ + { name: 'tcp', description: 'TCP' }, + { name: 'udp', description: 'UDP' }, + { name: 'icmp', description: 'ICMP' } + ] + }); } }, 'startport': { edit: true, label: 'label.start.port' },