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 ca5adc902f..797ea28a27 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
@@ -260,6 +260,7 @@ define(function(require) {
$.extend(network_json, WizardFields.retrieve($("#vnetCreateGeneralTab", context)));
$.extend(network_json, WizardFields.retrieve($("#vnetCreateBridgeTab", context)));
+ $.extend(network_json, WizardFields.retrieve($("#vnetCreateQoSTab", context)));
$.extend(network_json, WizardFields.retrieve($("#vnetCreateContextTab", context)));
var secgroups = this.securityGroupsTable.retrieveResourceTableSelect();
@@ -349,6 +350,7 @@ define(function(require) {
WizardFields.fill($("#vnetCreateGeneralTab", context), element.TEMPLATE);
WizardFields.fill($("#vnetCreateBridgeTab", context), element.TEMPLATE);
+ WizardFields.fill($("#vnetCreateQoSTab", context), element.TEMPLATE);
WizardFields.fill($("#vnetCreateContextTab", context), element.TEMPLATE);
if ($('#network_mode', context).val() == undefined){
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 54901a6cb3..a4a35bcfd8 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
@@ -33,6 +33,11 @@
{{tr "Security"}}
+
+
+
+
{{tr "QoS"}}
+
@@ -194,6 +199,61 @@
+
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
index 0b02667289..140d3febd1 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js
@@ -68,8 +68,20 @@ define(function(require) {
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
// TODO: simplify interface?
+ var hiddenKeys = [
+ "SECURITY_GROUPS",
+ "INBOUND_AVG_BW",
+ "INBOUND_PEAK_BW",
+ "INBOUND_PEAK_KB",
+ "OUTBOUNDD_AVG_BW",
+ "OUTBOUND_PEAK_BW",
+ "OUTBOUND_PEAK_KB" ];
+
var strippedTemplate = $.extend({}, this.element.TEMPLATE);
- delete strippedTemplate["SECURITY_GROUPS"];
+
+ $.each(hiddenKeys, function(i, key){
+ delete strippedTemplate[key];
+ });
var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
Locale.tr("Attributes"));
@@ -106,18 +118,34 @@ define(function(require) {
}
function _setup(context) {
+ var that = this;
+
RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
// TODO: simplify interface?
+ var hiddenKeys = [
+ "SECURITY_GROUPS",
+ "INBOUND_AVG_BW",
+ "INBOUND_PEAK_BW",
+ "INBOUND_PEAK_KB",
+ "OUTBOUNDD_AVG_BW",
+ "OUTBOUND_PEAK_BW",
+ "OUTBOUND_PEAK_KB" ];
+
var strippedTemplate = $.extend({}, this.element.TEMPLATE);
- delete strippedTemplate["SECURITY_GROUPS"];
+
+ $.each(hiddenKeys, function(i, key){
+ delete strippedTemplate[key];
+ });
var hiddenValues = {};
- if (this.element.TEMPLATE.SECURITY_GROUPS != undefined){
- hiddenValues.SECURITY_GROUPS = this.element.TEMPLATE.SECURITY_GROUPS;
- }
+ $.each(hiddenKeys, function(i, key){
+ if (that.element.TEMPLATE[key] != undefined){
+ hiddenValues[key] = that.element.TEMPLATE[key];
+ }
+ });
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
//===
diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs
index 533278d283..837d3d87a0 100644
--- a/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs
@@ -42,6 +42,60 @@
{{{permissionsTableHTML}}}
+
+
+
+
+
+ | {{tr "Inbound QoS"}} |
+
+
+
+
+ | {{tr "Average bandwidth"}} |
+ {{valOrDefault element.TEMPLATE.INBOUND_AVG_BW "--"}}
+ | {{tr "KBytes/s"}} |
+
+
+ | {{tr "Peak bandwidth"}} |
+ {{valOrDefault element.TEMPLATE.INBOUND_PEAK_BW "--"}}
+ | {{tr "KBytes/s"}} |
+
+
+ | {{tr "Peak burst"}} |
+ {{valOrDefault element.TEMPLATE.INBOUND_PEAK_KB "--"}}
+ | {{tr "KBytes"}} |
+
+
+
+
+
+
+
+
+ | {{tr "Outbound QoS"}} |
+
+
+
+
+ | {{tr "Average bandwidth"}} |
+ {{valOrDefault element.TEMPLATE.OUTBOUNDD_AVG_BW "--"}}
+ | {{tr "KBytes/s"}} |
+
+
+ | {{tr "Peak bandwidth"}} |
+ {{valOrDefault element.TEMPLATE.OUTBOUND_PEAK_BW "--"}}
+ | {{tr "KBytes/s"}} |
+
+
+ | {{tr "Peak burst"}} |
+ {{valOrDefault element.TEMPLATE.OUTBOUND_PEAK_KB "--"}}
+ | {{tr "KBytes/s"}} |
+
+
+
+
+