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

bug 13629: system page - network providers section - no F5 and SRX for Basic zone. [Reviewed-By: Brian]

This commit is contained in:
Jessica Wang 2012-02-15 16:26:11 -08:00
parent 492e835ba5
commit e34cd2ca4e
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/scripts/system.js
View File

@ -237,17 +237,7 @@
id: 'netscaler',
name: 'NetScaler',
state: nspMap.netscaler? nspMap.netscaler.state : 'Disabled'
},
{
id: 'srx',
name: 'SRX',
state: nspMap.srx ? nspMap.srx.state : 'Disabled'
},
{
id: 'f5',
name: 'F5',
state: nspMap.f5 ? nspMap.f5.state : 'Disabled'
},
},
{
id: 'virtualRouter',
name: 'Virtual Router',
@ -256,13 +246,30 @@
];
if(selectedZoneObj.networktype == "Basic") {
networkProviderData.push({
networkProviderData.push(
{
id: 'securityGroups',
name: 'Security Groups',
state: nspMap.securityGroups ? nspMap.securityGroups.state : 'Disabled'
}
);
}
else if(selectedZoneObj.networktype == "Advanced"){
networkProviderData.push(
{
id: 'f5',
name: 'F5',
state: nspMap.f5 ? nspMap.f5.state : 'Disabled'
}
);
networkProviderData.push(
{
id: 'srx',
name: 'SRX',
state: nspMap.srx ? nspMap.srx.state : 'Disabled'
}
);
}
args.response.success({
data: networkProviderData