diff --git a/src/sunstone/public/js/plugins/secgroups-tab.js b/src/sunstone/public/js/plugins/secgroups-tab.js index fe6d11d9a3..85e7f7c4f6 100644 --- a/src/sunstone/public/js/plugins/secgroups-tab.js +++ b/src/sunstone/public/js/plugins/secgroups-tab.js @@ -21,13 +21,50 @@ function initialize_create_security_group_dialog(dialog){ setupTips(dialog); + $(".add_security_group_rule", dialog).on("click", function(){ + $(".security_group_rules tbody").append( + '\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + '); + }); + + $(".add_security_group_rule", dialog).trigger("click"); + + dialog.on("click", ".security_group_rules i.remove-tab", function(){ + var tr = $(this).closest('tr'); + tr.remove(); + }); + $('#create_security_group_form_wizard',dialog).on('invalid', function () { notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_security_group_form", $("#secgroup-tab")); }).on('valid', function() { if ($('#create_security_group_form_wizard',dialog).attr("action") == "create") { - var name=$('#security_groupname',this).val(); - var security_group_json = { "security_group" : { "name" : name}}; + security_group_json = generate_json_security_group_from_form(this); Sunstone.runAction("SecurityGroup.create",security_group_json); return false; } @@ -36,6 +73,39 @@ function initialize_create_security_group_dialog(dialog){ dialog.foundation(); } +function generate_json_security_group_from_form(dialog) { + var name = $('#security_group_name', dialog).val(); + var description = $('#security_group_description', dialog).val(); + + var rules = []; + + $(".security_group_rules tbody tr").each(function(){ + // TODO: if (x & y & z empty){} else do nothing + var rule = {}; + + rule["PROTOCOL"] = $(".security_group_rule_protocol", $(this)).val(); + rule["TYPE"] = $(".security_group_rule_type", $(this)).val(); + rule["RANGE"] = $(".security_group_rule_range", $(this)).val(); + rule["NETWORK"] = $(".security_group_rule_network", $(this)).val(); + rule["ICMP_TYPE"] = $(".security_group_rule_icmp_type", $(this)).val(); + + rules.push(rule); + }); + + var security_group_json = + { + "security_group" : + { + "name" : name, + "description": description, + "rule" : rules + } + }; + + return security_group_json; +} + + // Security Group clone dialog function setupSecurityGroupCloneDialog(){ //Append to DOM @@ -118,10 +188,48 @@ function popUpSecurityGroupCloneDialog(){ var create_security_group_wizard_html = '
\ +
\ +
\ + \ + \ +
\ +
\ +
\ +
\ + \ +