[PATCH][Ginger] Issue #527.Adding /dev/dasd based swap device yields an error.

[mesm...@linux.vnet.ibm.com]

From: Megha Smriti <mesm...@linux.vnet.ibm.com>

Signed-off-by: Megha Smriti <mesm...@linux.vnet.ibm.com>
---
ui/css/ginger.css | 22 ++++++++++++++++++++++
ui/css/src/modules/_storage.scss | 22 ++++++++++++++++++++++
ui/js/host-storage-addswap.js | 9 ++++++++-
3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/ui/css/ginger.css b/ui/css/ginger.css
index 87d7c4e..a6495dd 100644
--- a/ui/css/ginger.css
+++ b/ui/css/ginger.css
@@ -2022,6 +2022,28 @@ hr {
cursor: not-allowed;
}

+#AddSwap-device-container .absolute-middle,
+#AddSwap-device-container .wok-mask,
+#AddSwap-device-container .wok-grid-mask,
+#AddSwap-device-container .wok-list-mask,
+#AddSwap-device-container .wok-mask-loading,
+#AddSwap-device-container .wok-grid-loading,
+#AddSwap-device-container .wok-list-loading,
+#AddSwap-device-container .wok-mask-loader-container,
+#AddSwap-device-container .wok-grid-loader-container,
+#AddSwap-device-container .wok-list-loader-container,
+#AddSwap-device-container .wok-mask-loading-icon,
+#AddSwap-device-container .wok-grid-loading-icon,
+#AddSwap-device-container .wok-list-loading-icon {
+ top: 65px !important;
+}
+
+#AddSwap-device-container .wok-mask-loading-text,
+#AddSwap-device-container .wok-grid-loading-text,
+#AddSwap-device-container .wok-list-loading-text {
+ padding-top: 85px !important;
+}
+
#host-sysmodules-root-container .well {
overflow-y: scroll;
border: 0;
diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss
index 138d336..5944829 100644
--- a/ui/css/src/modules/_storage.scss
+++ b/ui/css/src/modules/_storage.scss
@@ -531,3 +531,25 @@ hr {
cursor: not-allowed;
}
}
+
+#AddSwap-device-container .absolute-middle,
+#AddSwap-device-container .wok-mask,
+#AddSwap-device-container .wok-grid-mask,
+#AddSwap-device-container .wok-list-mask,
+#AddSwap-device-container .wok-mask-loading,
+#AddSwap-device-container .wok-grid-loading,
+#AddSwap-device-container .wok-list-loading,
+#AddSwap-device-container .wok-mask-loader-container,
+#AddSwap-device-container .wok-grid-loader-container,
+#AddSwap-device-container .wok-list-loader-container,
+#AddSwap-device-container .wok-mask-loading-icon,
+#AddSwap-device-container .wok-grid-loading-icon,
+#AddSwap-device-container .wok-list-loading-icon {
+ top: 65px !important;
+}
+
+#AddSwap-device-container .wok-mask-loading-text,
+#AddSwap-device-container .wok-grid-loading-text,
+#AddSwap-device-container .wok-list-loading-text {
+ padding-top : 85px !important;
+}
diff --git a/ui/js/host-storage-addswap.js b/ui/js/host-storage-addswap.js
index 87b2de3..bd37e7d 100644
--- a/ui/js/host-storage-addswap.js
+++ b/ui/js/host-storage-addswap.js
@@ -91,6 +91,7 @@ ginger.loadSwapDeviceList = function() {
opts['gridFields'] = JSON.stringify(gridFields);
opts['converters'] = wok.localeConverters;
var grid = ginger.createBootgrid(opts);
+ ginger.showBootgridLoading(opts);
grid.on("loaded.rs.jquery.bootgrid", function(e) {
$('#AddSwapGrid .select-box').hide();
}).on("selected.rs.jquery.bootgrid", function(e) {
@@ -107,11 +108,17 @@ ginger.initSwapDeviceGridData = function() {
var opts = [];
opts['gridId'] = "AddSwapGrid";
ginger.SwapDeviceList(function(result) {
+ var filtered_results = [];
for (i = 0; i < result.length; i++) {
result[i]['size'] = parseInt(result[i]['size']) / 1024;
result[i]['size'] = Number(result[i]['size'].toFixed(2));
+ // Above condition tells that it is a block device and it's not partition
+ if((result[i].name).startsWith("dasd") && result[i].pkname == "") {
+ continue
+ }
+ filtered_results.push(result[i]);
}
- ginger.loadBootgridData(opts['gridId'], result);
+ ginger.loadBootgridData(opts['gridId'], filtered_results);
ginger.showBootgridData(opts);
ginger.hideBootgridLoading(opts);
});
--
2.7.4

[Daniel Henrique Barboza]

Applied. Thanks!