diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
index 6e1b9a6bee..c713d4d9c2 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js
@@ -8,7 +8,10 @@ define(function(require) {
var Sunstone = require('sunstone');
var Locale = require('utils/locale');
var Tips = require('utils/tips');
-
+ var CustomTags = require('utils/form-panels/custom-tags');
+ var ArTab = require('tabs/vnets-tab/utils/ar-tab');
+ var SecurityGroupsTable = require('tabs/secgroups-tab/datatable');
+
/*
TEMPLATES
*/
@@ -41,10 +44,10 @@ define(function(require) {
'buttonText': Locale.tr("Update"),
'resetButton': false
}
- }
+ };
BaseFormPanel.call(this);
- };
+ }
FormPanel.FORM_PANEL_ID = FORM_PANEL_ID;
FormPanel.prototype = Object.create(BaseFormPanel.prototype);
@@ -56,6 +59,7 @@ define(function(require) {
FormPanel.prototype.onShow = _onShow;
FormPanel.prototype.fill = _fill;
FormPanel.prototype.setup = _setup;
+ FormPanel.prototype.add_ar_tab = _add_ar_tab;
return FormPanel;
@@ -64,7 +68,19 @@ define(function(require) {
*/
function _htmlWizard() {
- return TemplateWizardHTML({formPanelId: this.formPanelId});
+ var opts = {
+ info: false,
+ select: true,
+ selectOptions: {"multiple_choice": true}
+ };
+
+ this.securityGroupsTable = new SecurityGroupsTable("vnet_create", opts);
+
+ return TemplateWizardHTML({
+ 'formPanelId': this.formPanelId,
+ 'customTagsHTML': CustomTags.html(),
+ 'securityGroupsTableHTML': this.securityGroupsTable.dataTableHTML
+ });
}
function _htmlAdvanced() {
@@ -72,8 +88,21 @@ define(function(require) {
}
function _setup(context) {
+ this.arTabObjects = {};
+ var that = this;
+
var number_of_ar = 0;
+ // add new ar tabs
+ $("#vnet_wizard_ar_btn", context).bind("click", function() {
+ that.add_ar_tab(number_of_ar, context);
+ number_of_ar++;
+
+ context.foundation();
+
+ return false;
+ });
+
// close icon: removing the tab on click
$("#vnetCreateARTab", context).on("click", "i.remove-tab", function() {
var target = $(this).parent().attr("href");
@@ -81,6 +110,8 @@ define(function(require) {
var dl = $(this).closest('dl');
var content = $(target);
+ var ar_id = content.attr("ar_id");
+
dd.remove();
content.remove();
@@ -88,14 +119,7 @@ define(function(require) {
$('a', dl.children('dd').last()).click();
}
- return false;
- });
-
- $("#vnet_wizard_ar_btn", context).bind("click", function() {
- // TODO add_ar_tab(number_of_ar, context);
- number_of_ar++;
-
- context.foundation();
+ delete that.arTabObjects[ar_id];
return false;
});
@@ -187,18 +211,46 @@ define(function(require) {
//Initialize shown options
$('#network_mode', context).trigger("change");
- //TODO setupSecurityGroupTableSelect(context, "vnet_create", {"multiple_choice": true});
- //TODO setupCustomTags($("#vnetCreateContextTab", context));
- //
+ this.securityGroupsTable.initialize();
+ this.securityGroupsTable.refreshResourceTableSelect();
+
+ CustomTags.setup( $("#vnetCreateContextTab", context) );
+
// Add first AR
- //TODO $("#vnet_wizard_ar_btn", context).trigger("click");
+ $("#vnet_wizard_ar_btn", context).trigger("click");
$(document).foundation('reflow', 'tab');
Tips.setup();
return false;
}
+ function _add_ar_tab(ar_id, context) {
+ var str_ar_tab_id = 'ar' + ar_id;
+
+ var ar_tab = new ArTab();
+ this.arTabObjects[ar_id] = ar_tab;
+
+ var html_tab_content =
+ '
'+
+ ar_tab.html(str_ar_tab_id) +
+ '
';
+
+ // Append the new div containing the tab and add the tab to the list
+ var a = $(""+
+ Locale.tr("Address Range")+" "
+ ).appendTo($("dl#vnet_wizard_ar_tabs", context));
+
+ $(html_tab_content).appendTo($("#vnet_wizard_ar_tabs_content", context));
+
+ $("a", a).trigger("click");
+
+ var ar_section = $('#' + str_ar_tab_id + 'Tab', context);
+ ar_tab.setup(ar_section, str_ar_tab_id);
+ }
+
function _submitWizard(context) {
+ var that = this;
+
//Fetch values
var network_json = {};
@@ -206,17 +258,16 @@ define(function(require) {
this.retrieveWizardFields($("#vnetCreateBridgeTab", context), network_json);
this.retrieveWizardFields($("#vnetCreateContextTab", context), network_json);
- /* TODO
- var secgroups = retrieveSecurityGroupTableSelect(context, "vnet_create");
+ var secgroups = this.securityGroupsTable.retrieveResourceTableSelect();
if (secgroups != undefined && secgroups.length != 0) {
network_json["SECURITY_GROUPS"] = secgroups.join(",");
- }*/
+ }
- // TODO retrieveCustomTags($("#vnetCreateContextTab", context), network_json);
+ $.extend(network_json, CustomTags.retrieve( $("#vnetCreateContextTab", context) ));
- /* TODO
$('.ar_tab', context).each(function() {
- hash = retrieve_ar_tab_data(this);
+ var ar_id = $(this).attr("ar_id");
+ var hash = that.arTabObjects[ar_id].retrieve();
if (!$.isEmptyObject(hash)) {
if (!network_json["AR"])
@@ -224,7 +275,7 @@ define(function(require) {
network_json["AR"].push(hash);
}
- });*/
+ });
if (this.action == "create") {
network_json = {
diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
index 54d60fc32c..6bf9a3e665 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs
@@ -196,7 +196,7 @@
- {{! TODO generateSecurityGroupTableSelect("vnet_create")}}
+ {{{securityGroupsTableHTML}}}
@@ -254,9 +254,10 @@
{{tr "Custom attributes"}}
-
+
+
- {{! TODO customTagsHtml()}}
+ {{{customTagsHTML}}}
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js
index 292897e8dd..fc2b5d9905 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js
@@ -292,6 +292,8 @@ define(function(require) {
delete ar["SECURITY_GROUPS"];
+ // TODO bug: extra attributes are not shown
+
var arExtraAttr = ar;
return TemplateARInfo({
diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.hbs b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.hbs
new file mode 100644
index 0000000000..6924443ddf
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.hbs
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+{{#advancedSection (tr "Advanced Options") }}
+
+
+ {{tr "Custom attributes"}}
+
+
+
+
+
+
+
+
+
+
+ {{tr "Security Groups"}}
+
+
+
+
+
+ {{{securityGroupsTableHTML}}}
+
+{{/advancedSection}}
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js
new file mode 100644
index 0000000000..2c264da066
--- /dev/null
+++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js
@@ -0,0 +1,124 @@
+define(function(require) {
+ // Dependencies
+ var Locale = require('utils/locale');
+ var Tips = require('utils/tips');
+ var CustomTags = require('utils/form-panels/custom-tags');
+ var SecurityGroupsTable = require('tabs/secgroups-tab/datatable');
+
+ var TemplateHTML = require('hbs!./ar-tab');
+
+ function ArTab() {
+ return this;
+ }
+
+ ArTab.prototype = {
+ 'html': _generate_ar_tab_content,
+ 'setup': _setup_ar_tab_content,
+ 'retrieve': _retrieve_ar_tab_data
+ };
+
+ return ArTab;
+
+ function _generate_ar_tab_content(str_ar_tab_id){
+ var opts = {
+ info: false,
+ select: true,
+ selectOptions: {"multiple_choice": true}
+ };
+
+ this.securityGroupsTable = new SecurityGroupsTable(str_ar_tab_id, opts);
+
+ return TemplateHTML({
+ 'str_ar_tab_id': str_ar_tab_id,
+ 'customTagsHTML': CustomTags.html(),
+ 'securityGroupsTableHTML': this.securityGroupsTable.dataTableHTML
+ });
+ }
+
+ function _setup_ar_tab_content(ar_section, str_ar_tab_id) {
+
+ this.ar_section = ar_section;
+
+ $('input[name$="ar_type"]',ar_section).change(function(){
+ $('div.ar_input', ar_section).hide();
+
+ $('input[wizard_field="IP"]',ar_section).removeAttr('required');
+
+ switch($(this).val()){
+ case "IP4":
+ $('div.type_ip4', ar_section).show();
+ $('input[wizard_field="IP"]',ar_section).attr('required', '');
+
+ break;
+ case "IP4_6":
+ $('div.type_ip4_6', ar_section).show();
+ $('input[wizard_field="IP"]',ar_section).attr('required', '');
+
+ break;
+ case "IP6":
+ $('div.type_ip6', ar_section).show();
+ break;
+ case "ETHER":
+ $('div.type_ether', ar_section).show();
+ break;
+ }
+ });
+
+ $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).prop('checked', true);
+ $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).change();
+
+ CustomTags.setup($('#'+str_ar_tab_id+'_custom_tags',ar_section));
+
+ this.securityGroupsTable.initialize();
+ this.securityGroupsTable.refreshResourceTableSelect();
+
+ Tips.setup(ar_section);
+ }
+
+ function _retrieve_ar_tab_data(){
+ var data = {};
+
+ var ar_type = $('input[name$="ar_type"]:checked',this.ar_section).val();
+
+ var fields = [];
+
+ switch(ar_type){
+ case "IP4":
+ fields = $('div.type_ip4', this.ar_section).children("input");
+ break;
+ case "IP4_6":
+ fields = $('div.type_ip4_6', this.ar_section).children("input");
+ break;
+ case "IP6":
+ fields = $('div.type_ip6', this.ar_section).children("input");
+ break;
+ case "ETHER":
+ fields = $('div.type_ether', this.ar_section).children("input");
+ break;
+ }
+
+ fields.each(function(){
+ var field=$(this);
+
+ if (field.val() != null && field.val().length){ //if has a length
+ data[field.attr('name')] = field.val();
+ }
+
+ });
+
+ if (!$.isEmptyObject(data)) {
+ data["TYPE"] = ar_type;
+ }
+
+ $.extend(data, CustomTags.retrieve(this.ar_section));
+
+ var str_ar_tab_id = $('div[name="str_ar_tab_id"]', this.ar_section).attr("str_ar_tab_id");
+
+ var secgroups = this.securityGroupsTable.retrieveResourceTableSelect();
+ if (secgroups != undefined && secgroups.length != 0){
+ data["SECURITY_GROUPS"] = secgroups.join(",");
+ }
+
+ return data;
+ }
+});
\ No newline at end of file
diff --git a/src/sunstone/public/app/utils/form-panels/custom-tags.hbs b/src/sunstone/public/app/utils/form-panels/custom-tags.hbs
new file mode 100644
index 0000000000..b205378c3d
--- /dev/null
+++ b/src/sunstone/public/app/utils/form-panels/custom-tags.hbs
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/sunstone/public/app/utils/form-panels/custom-tags.js b/src/sunstone/public/app/utils/form-panels/custom-tags.js
new file mode 100644
index 0000000000..02e9f05951
--- /dev/null
+++ b/src/sunstone/public/app/utils/form-panels/custom-tags.js
@@ -0,0 +1,86 @@
+define(function(require) {
+
+ var Locale = require('utils/locale');
+ var TemplateHTML = require('hbs!./custom-tags');
+
+ function _html(){
+ return TemplateHTML();
+ }
+
+ function _setup(context){
+ $('#add_custom', context).click(function() {
+ var table = $('#custom_tags', context)[0];
+ var rowCount = table.rows.length;
+ var row = table.insertRow(rowCount);
+
+ var cell1 = row.insertCell(0);
+ var element1 = document.createElement("input");
+ element1.id = "KEY";
+ element1.type = "text";
+ element1.value = $('input#KEY', context).val();
+ cell1.appendChild(element1);
+
+ var cell2 = row.insertCell(1);
+ var element2 = document.createElement("input");
+ element2.id = "VALUE";
+ element2.type = "text";
+ element2.value = $('input#VALUE', context).val();
+ cell2.appendChild(element2);
+
+ var cell3 = row.insertCell(2);
+ cell3.innerHTML = "";
+ });
+
+ context.on("click", "i.remove-tab", function() {
+ $(this).closest("tr").remove();
+ });
+ }
+
+ // context is the container div of customTagsHtml()
+ function _retrieveCustomTags(context){
+ var template_json = {};
+
+ $('#custom_tags tr', context).each(function(){
+ if ($('#KEY', $(this)).val()) {
+ template_json[$('#KEY', $(this)).val()] = $('#VALUE', $(this)).val();
+ }
+ });
+
+ return template_json;
+ }
+/*
+ // div is the container div of customTagsHtml()
+ // template_json are the key:values that will be put into the table
+ function fillCustomTags(div, template_json){
+ $.each(template_json, function(key, value){
+ var table = $('#custom_tags', div)[0];
+ var rowCount = table.rows.length;
+ var row = table.insertRow(rowCount);
+
+ var cell1 = row.insertCell(0);
+ var element1 = document.createElement("input");
+ element1.id = "KEY";
+ element1.type = "text";
+ element1.value = htmlDecode(key);
+ cell1.appendChild(element1);
+
+ var cell2 = row.insertCell(1);
+ var element2 = document.createElement("input");
+ element2.id = "VALUE";
+ element2.type = "text";
+ element2.value = htmlDecode(value);
+ cell2.appendChild(element2);
+
+
+ var cell3 = row.insertCell(2);
+ cell3.innerHTML = "";
+ });
+ }
+*/
+
+ return {
+ 'html': _html,
+ 'setup': _setup,
+ 'retrieve': _retrieveCustomTags
+ };
+});
\ No newline at end of file