apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3487: Add egress default policy to network offering UI

Browse Source
This commit is contained in:
Brian Federle 2013-07-30 12:55:10 -07:00
parent 43dc85cea1
commit f06ad9bcae
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -14,6 +14,7 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
label.egress.default.policy=Egress Default Policy
label.routing=Routing label.routing=Routing
label.about=About label.about=About
label.app.name=CloudStack label.app.name=CloudStack

1
ui/dictionary.jsp
View File

@ -25,6 +25,7 @@ under the License.
<% long now = System.currentTimeMillis(); %> <% long now = System.currentTimeMillis(); %>
<script language="javascript"> <script language="javascript">
dictionary = { dictionary = {
'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
'label.routing': '<fmt:message key="label.routing" />', 'label.routing': '<fmt:message key="label.routing" />',
'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />', 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />',
'label.about': '<fmt:message key="label.about" />', 'label.about': '<fmt:message key="label.about" />',

33
ui/scripts/configuration.js
View File

@ -1932,6 +1932,12 @@
args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').hide(); args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').hide();
} }
if (args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"] input[type=checkbox]').is(':checked') == true) {
args.$form.find('.form-item[rel=\"egresspolicy\"]').css('display', 'inline-block');
} else {
args.$form.find('.form-item[rel=\"egresspolicy\"]').css('display', 'none');
}
//show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5 //show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5
if ((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler' || args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp')) { if ((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler' || args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp')) {
args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block'); args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block');
@ -2361,6 +2367,19 @@
}] }]
}); });
} }
},
egresspolicy: {
label: 'Default egress policy',
isHidden: true,
select: function(args) {
args.response.success({
data: [
{ id: 'ALLOW', description: 'Allow' },
{ id: 'DENY', description: 'Deny' }
]
});
}
} }
} }
}, },
@ -2485,7 +2504,6 @@
inputData['conservemode'] = false; inputData['conservemode'] = false;
} }
// Make service provider map // Make service provider map
var serviceProviderIndex = 0; var serviceProviderIndex = 0;
$.each(serviceProviderMap, function(key, value) { $.each(serviceProviderMap, function(key, value) {
@ -2497,6 +2515,12 @@
if (args.$form.find('.form-item[rel=availability]').css("display") == "none") if (args.$form.find('.form-item[rel=availability]').css("display") == "none")
inputData['availability'] = 'Optional'; inputData['availability'] = 'Optional';
if (args.$form.find('.form-item[rel=egresspolicy]').is(':visible')) {
inputData['egressdefaultpolicy'] = formData.egresspolicy === 'ALLOW' ? true : false;
} else {
delete inputData.egresspolicy;
}
if (args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none") if (args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none")
delete inputData.systemOfferingForRouter; delete inputData.systemOfferingForRouter;
@ -2723,6 +2747,13 @@
converter: cloudStack.converters.toBooleanText converter: cloudStack.converters.toBooleanText
}, },
egressdefaultpolicy: {
label: 'label.egress.default.policy',
converter: function(str) {
return str === true ? 'Allow' : 'Deny';
}
},
availability: { availability: {
label: 'label.availability', label: 'label.availability',
isEditable: true, isEditable: true,