<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hi Socorro,<br>
<br>
I tried again and I was not able to get the 'unavailable' on
interfaces neither. <br>
But the interface list only display one interface right after the
network creation. Only when I switched tabs, I could see more
interfaces listed there.<br>
<br>
<br>
<img src="cid:part1.AEDF0573.07C70506@linux.vnet.ibm.com" alt=""><img
src="cid:part2.28D2CE78.4DF3B3B5@linux.vnet.ibm.com" alt=""><br>
<br>
<div class="moz-cite-prefix">On 05/27/2016 07:37 PM, Socorro
Stoppler wrote:<br>
</div>
<blockquote cite="mid:5748CC1C.8020708@linux.vnet.ibm.com"
type="cite">Hi Aline,
<br>
<br>
I tried this w/a test env (i.e. --test) so I could have an
interface and when I created a VEPA network, it showed the
interface. What showed up as unavailable was the Address Space
column. Would you mind sending me a picture?
<br>
<br>
Thanks
<br>
-Socorro
<br>
<br>
On 05/27/2016 12:36 PM, Aline Manera wrote:
<br>
<blockquote type="cite">
<br>
Hi Socorro,
<br>
<br>
1. Once I create a VEPA or Passthrough Bridged network, the
interface column displays "unavailable". If I switch tabs and go
back to Network tab, the interface column displays the interface
values as proposed by this patch.
<br>
<br>
2. I'd suggest to rename the variable name to 'interfaces' just
to reflect that this field can list multiple values.
<br>
<br>
Regards,
<br>
Aline Manera
<br>
<br>
On 05/25/2016 03:03 PM, Socorro Stoppler wrote:
<br>
<blockquote type="cite">This patch fixes a bug in the listing of
networks in that only one network
<br>
interface is being shown regardless of the number of
interfaces that exist for
<br>
that network.
<br>
<br>
In addition to now displaying all of the interfaces, in the
case
<br>
that there's too many to fit in the column, an ellipsis has
been added to indicate
<br>
that there's more interfaces than what it being shown. A
tooltip will be seen when
<br>
the user hovers over the interface(s) to show all of the
interfaces.
<br>
<br>
<br>
Signed-off-by: Socorro Stoppler
<a class="moz-txt-link-rfc2396E" href="mailto:socorro@linux.vnet.ibm.com"><socorro@linux.vnet.ibm.com></a>
<br>
---
<br>
ui/css/kimchi.css | 8 ++++++--
<br>
ui/css/src/modules/_network.scss | 9 ++++++---
<br>
ui/js/src/kimchi.network.js | 4 +++-
<br>
ui/pages/tabs/network.html.tmpl | 4 ++--
<br>
4 files changed, 17 insertions(+), 8 deletions(-)
<br>
<br>
diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css
<br>
index 49ea39a..72f340c 100644
<br>
--- a/ui/css/kimchi.css
<br>
+++ b/ui/css/kimchi.css
<br>
@@ -2156,12 +2156,16 @@ body.wok-gallery {
<br>
<br>
#network-root-container .wok-datagrid >
.wok-datagrid-header > span.column-interface,
<br>
#network-root-container .wok-datagrid >
.wok-datagrid-body > .wok-datagrid-row >
span.column-interface {
<br>
- width: 10.3896%;
<br>
+ width: 15.3896%;
<br>
+ padding-right: 40px;
<br>
+ white-space: nowrap;
<br>
+ overflow: hidden;
<br>
+ text-overflow: ellipsis;
<br>
}
<br>
<br>
#network-root-container .wok-datagrid >
.wok-datagrid-header > span.column-space,
<br>
#network-root-container .wok-datagrid >
.wok-datagrid-body > .wok-datagrid-row >
span.column-space {
<br>
- width: 30%;
<br>
+ width: 25%;
<br>
}
<br>
<br>
#network-root-container .wok-datagrid >
.wok-datagrid-header > span.column-action,
<br>
diff --git a/ui/css/src/modules/_network.scss
b/ui/css/src/modules/_network.scss
<br>
index 4627ab5..ab47c89 100644
<br>
--- a/ui/css/src/modules/_network.scss
<br>
+++ b/ui/css/src/modules/_network.scss
<br>
@@ -93,18 +93,21 @@
<br>
}
<br>
<br>
> span.column-interface {
<br>
- width: 10.3896%;
<br>
+ width: 15.3896%;
<br>
+ padding-right: 40px;
<br>
+ white-space: nowrap;
<br>
+ overflow: hidden;
<br>
+ text-overflow: ellipsis;
<br>
}
<br>
<br>
> span.column-space {
<br>
- width: 30%;
<br>
+ width: 25%;
<br>
}
<br>
<br>
> span.column-action {
<br>
width: 25.909%;
<br>
text-align: right;
<br>
}
<br>
-
<br>
}
<br>
<br>
.wok-datagrid > .wok-datagrid-body >
.wok-datagrid-row > span {
<br>
diff --git a/ui/js/src/kimchi.network.js
b/ui/js/src/kimchi.network.js
<br>
index 381449d..ac6bf74 100644
<br>
--- a/ui/js/src/kimchi.network.js
<br>
+++ b/ui/js/src/kimchi.network.js
<br>
@@ -35,6 +35,7 @@ kimchi.initNetwork = function() {
<br>
kimchi.initNetworkListView = function() {
<br>
$('.wok-mask').removeClass('hidden');
<br>
kimchi.listNetworks(function(data) {
<br>
+ $('[data-toggle="tooltip"]').tooltip();
<br>
for (var i = 0; i < data.length; i++) {
<br>
var network = {
<br>
name : data[i].name,
<br>
@@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() {
<br>
} else {
<br>
network.type = data[i].connection;
<br>
}
<br>
- network.interface = data[i].interfaces ?
data[i].interfaces[0] : null;
<br>
+ network.interface = data[i].interfaces ?
data[i].interfaces : null;
<br>
+ network.interface.join();
<br>
network.addrSpace = data[i].subnet ?
data[i].subnet : null;
<br>
network.persistent = data[i].persistent;
<br>
kimchi.addNetworkItem(network);
<br>
diff --git a/ui/pages/tabs/network.html.tmpl
b/ui/pages/tabs/network.html.tmpl
<br>
index 6ddabaa..7e2825d 100644
<br>
--- a/ui/pages/tabs/network.html.tmpl
<br>
+++ b/ui/pages/tabs/network.html.tmpl
<br>
@@ -85,11 +85,11 @@
<br>
</div>
<br>
<div id="modalWindow" class="modal fade network-modal"
tabindex="-1" role="dialog"
aria-labelledby="networkModalLabel" aria-hidden="true">
</div>
<br>
<script id="networkItem" type="text/html">
<br>
- <div id='{name}' class='wok-nw-grid-body
remove-when-logged-off '>
<br>
+ <div id='{name}' class='wok-nw-grid-body
remove-when-logged-off'>
<br>
<span class='column-state'
val="{state}"><span class='network-state
{state}'><i class="fa
fa-power-off"></i><span
class="wok-nw-loading-icon"></span></span></span><!--<br>
--><span class='column-name'
title="{name}" val="{name}">{name}</span><!--
<br>
--><span class='column-type'
val="{type}">{type}</span><!--
<br>
- --><span class='column-interface'
val="{interface}">{interface}</span><!--
<br>
+ --><span class='column-interface'
data-placement="top" data-toggle="tooltip" title="{interface}"
val="{interface}">{interface}</span><!--
<br>
--><span class='column-space'
val="{addrSpace}">{addrSpace}</span><!--
<br>
--><span class='column-action'
style="display:none">
<br>
<span
class="pull-right">
<br>
</blockquote>
<br>
</blockquote>
<br>
</blockquote>
<br>
</body>
</html>