Partial-Bug: #1458016 Added "database_minimum_diskGB" variable to clu…

…ster config in the SM WebUI Change-Id: I1e7de079073bd402f3470d733731d3cea740ec41
Juniper · May 23, 2015 · 46d92f5 · 46d92f5
1 parent d338053
commit 46d92f5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/webroot/common/ui/js/sm.detail.tmpls.js b/webroot/common/ui/js/sm.detail.tmpls.js
@@ -97,6 +97,10 @@ define([
                                             key: 'parameters.database_dir',
                                             templateGenerator: 'TextGenerator'
                                         },
+                                        {
+                                            key: 'parameters.database_minimum_diskGB',
+                                            templateGenerator: 'TextGenerator'
+                                        },
                                         {
                                             key: 'parameters.hc_interval',
                                             templateGenerator: 'TextGenerator'

diff --git a/webroot/common/ui/js/sm.labels.js b/webroot/common/ui/js/sm.labels.js
@@ -123,6 +123,7 @@ define([
             "total_servers": "Total Servers",
             "external_bgp": "External BGP",
             "database_dir": "Database Dir",
+            "database_minimum_diskGB": "Database Min Disk (GB)",
             "database_token": "Database Token",
             "service_token": "Service Token",
             "storage_mon_secret": "Monitoring Key",

diff --git a/webroot/common/ui/js/sm.model.config.js b/webroot/common/ui/js/sm.model.config.js
@@ -45,6 +45,7 @@ define([
                     password: 'c0ntrail123',
 
                     database_dir: '/var/lib/cassandra',
+                    database_minimum_diskGB: "",
                     service_token: 'contrail123',
 
                     storage_mon_secret: "AQBM78tTEMz+GhAA3WiOXQI7UVdIy0YFFuTGdw==",

diff --git a/webroot/setting/sm/ui/js/views/ClusterEditView.js b/webroot/setting/sm/ui/js/views/ClusterEditView.js
@@ -331,12 +331,17 @@ define([
                     {
                         columns: [
                             {elementId: 'database_dir', view: "FormInputView", viewConfig: {path: 'parameters.database_dir', dataBindValue: 'parameters().database_dir', class: "span6"}},
-                            {elementId: 'service_token', view: "FormInputView", viewConfig: {path: 'parameters.service_token', type: 'password', dataBindValue: 'parameters().service_token', class: "span6"}}
+                            {elementId: 'database_minimum_diskGB', view: "FormInputView", viewConfig: {path: 'parameters.database_minimum_diskGB', dataBindValue: 'parameters().database_minimum_diskGB', class: "span6"}}
+                        ]
+                    },
+                    {
+                        columns: [
+                            {elementId: 'service_token', view: "FormInputView", viewConfig: {path: 'parameters.service_token', type: 'password', dataBindValue: 'parameters().service_token', class: "span6"}},
+                            {elementId: 'encapsulation_priority', view: "FormInputView", viewConfig: {path: 'parameters.encapsulation_priority', dataBindValue: 'parameters().encapsulation_priority', class: "span6"}}
                         ]
                     },
                     {
                         columns: [
-                            {elementId: 'encapsulation_priority', view: "FormInputView", viewConfig: {path: 'parameters.encapsulation_priority', dataBindValue: 'parameters().encapsulation_priority', class: "span6"}},
                             {elementId: 'hc_interval', view: "FormInputView", viewConfig: {path: 'parameters.hc_interval', dataBindValue: 'parameters().hc_interval', class: "span6"}}
                         ]
                     }