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

################################# 80 chars ##################################### 

Summary:

Detail:

BUG-ID :
Reviewed-by:
Reported-by:
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1350596640 -0600

################################# 80 chars #####################################
# The following is an example of how to fill out the above form. Please limit
# your formatting to 80 cols.
#
# Summary: One line description of commit, followed by blank line
#
# Detail: Multi-line description, followed by blank line
#
# BUG-ID: CLOUDSTACK-9999
# Reviewed-by: Bar Barlington <bar@example.com>, Foo McFooson <foo@example.com>
# Reported-by: Baz Bazelli <baz@example.com>
# Signed-off-by: You <you@yourdomain.com>
#
This commit is contained in:
Marcus Sorensen 2012-10-18 15:44:00 -06:00
parent 9ba7509c70 714b0593d3
commit 4d3b81cf36
1 changed files with 75 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ui/scripts/network.js
View File

@ -1820,8 +1820,10 @@
var havingFirewallService = false;
var havingPortForwardingService = false;
var havingLbService = false;
var havingVpnService = false;
var havingVpnService = false;
var FirewallProviderArrayIncludesJuniperSRX = false;
if('networks' in args.context && args.context.networks[0].vpcid == null) { //a non-VPC network from Guest Network section
$.ajax({
url: createURL('listNetworkOfferings'),
@ -1834,14 +1836,25 @@
var networkoffering = json.listnetworkofferingsresponse.networkoffering[0];
$(networkoffering.service).each(function(){
var thisService = this;
if(thisService.name == "Firewall")
if(thisService.name == "Firewall") {
havingFirewallService = true;
if(thisService.name == "PortForwarding")
var providerArray = thisService.provider;
for(var k = 0; k < providerArray.length; k++) {
if(providerArray[k].name == "JuniperSRX") {
FirewallProviderArrayIncludesJuniperSRX = true;
break;
}
}
}
if(thisService.name == "PortForwarding") {
havingPortForwardingService = true;
if(thisService.name == "Lb")
}
if(thisService.name == "Lb") {
havingLbService = true;
if(thisService.name == "Vpn")
}
if(thisService.name == "Vpn") {
havingVpnService = true;
}
});
}
});
@ -1960,7 +1973,24 @@
});
}
}
if(FirewallProviderArrayIncludesJuniperSRX == true) { //if Firewall is provided by JuniperSRX
$.ajax({
url: createURL('listPortForwardingRules'),
data: {
ipaddressid: args.context.ipAddresses[0].id,
listAll: true
},
async: false,
success: function(json) {
var rules = json.listportforwardingrulesresponse.portforwardingrule;
if(rules != null && rules.length > 0) {
disallowedActions.push("firewall"); //hide Firewall icon when Port forwarding is configured on IP Address
}
}
});
}
return disallowedActions;
},
@ -2003,14 +2033,44 @@
$icmpFields.parent().find('label.error').hide();
}
});
args.response.success({
data: [
{ name: 'tcp', description: 'TCP' },
{ name: 'udp', description: 'UDP' },
{ name: 'icmp', description: 'ICMP' }
]
});
var data = [
{ name: 'tcp', description: 'TCP' },
{ name: 'udp', description: 'UDP' }
];
//ICMP portocol is not supported in Firewall provided by JuniperSRX
var FirewallProviderArrayIncludesJuniperSRX = false;
if('networks' in args.context) {
$.ajax({
url: createURL('listNetworkOfferings'),
data: {
id: args.context.networks[0].networkofferingid
},
async: false,
success: function(json) {
var serviceArray = json.listnetworkofferingsresponse.networkoffering[0].service;
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});
}
},
'startport': { edit: true, label: 'label.start.port' },