[PATCH] Report debug report's file path instead of uri path.
by Mark Wu
Now the file path displayed on UI is "/data/debugreports/<reportname>/",
It's misleading because people could assume it's path on file system,
but it's the uri path in fact. We don't need expose the URI path because
the download button can help user to get the file.
---
docs/API.md | 3 ++-
src/kimchi/control/debugreports.py | 1 +
src/kimchi/model/debugreports.py | 6 ++++--
ui/js/src/kimchi.host.js | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/API.md b/docs/API.md
index b3b6c49..6f4f03a 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -668,7 +668,8 @@ specific to the low level collection tool being used.
* **GET**: Retrieve the full description of Debug Report
* name: The debug report name used to identify the report
- * file: The debug report file name used to identify the report
+ * file: The debug report's file path on kimchi host
+ * uri: The URI path to download this debug report
* time: The time when the debug report is created
* **DELETE**: Remove the Debug Report
diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py
index 9922cfa..d6ca620 100644
--- a/src/kimchi/control/debugreports.py
+++ b/src/kimchi/control/debugreports.py
@@ -38,6 +38,7 @@ class DebugReport(Resource):
def data(self):
return {'name': self.ident,
'file': self.info['file'],
+ 'uri': self.info['uri'],
'time': self.info['ctime']}
diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py
index c6e698b..b144496 100644
--- a/src/kimchi/model/debugreports.py
+++ b/src/kimchi/model/debugreports.py
@@ -161,8 +161,10 @@ class DebugReportModel(object):
ctime = os.stat(file_target).st_ctime
ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime))
file_target = os.path.split(file_target)[-1]
- file_target = os.path.join("/data/debugreports", file_target)
- return {'file': file_target,
+ file_path = os.path.join(path, file_target)
+ uri_path = os.path.join("/data/debugreports", file_target)
+ return {'file': file_path,
+ 'uri': uri_path,
'ctime': ctime}
def delete(self, name):
diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js
index 7974054..0aaf2f0 100644
--- a/ui/js/src/kimchi.host.js
+++ b/ui/js/src/kimchi.host.js
@@ -87,7 +87,7 @@ kimchi.host_main = function() {
}
kimchi.downloadReport({
- file: report['file']
+ file: report['uri']
});
}
}],
--
1.8.4.2
10 years, 7 months
[PATCH] Report debug report's file path instead of uri path.
by Mark Wu
Now the file path displayed on UI is "/data/debugreports/<reportname>/",
It's misleading because people could assume it's path on file system,
but it's the uri path in fact. We don't need expose the URI path because
the download button can help user to get the file.
---
docs/API.md | 2 +-
src/kimchi/model/debugreports.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/API.md b/docs/API.md
index b3b6c49..dd3b470 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -668,7 +668,7 @@ specific to the low level collection tool being used.
* **GET**: Retrieve the full description of Debug Report
* name: The debug report name used to identify the report
- * file: The debug report file name used to identify the report
+ * file: The debug report's file path on kimchi host.
* time: The time when the debug report is created
* **DELETE**: Remove the Debug Report
diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py
index c6e698b..3dca3ff 100644
--- a/src/kimchi/model/debugreports.py
+++ b/src/kimchi/model/debugreports.py
@@ -161,7 +161,7 @@ class DebugReportModel(object):
ctime = os.stat(file_target).st_ctime
ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime))
file_target = os.path.split(file_target)[-1]
- file_target = os.path.join("/data/debugreports", file_target)
+ file_target = os.path.join(path, file_target)
return {'file': file_target,
'ctime': ctime}
--
1.8.4.2
10 years, 7 months
[PATCH] Add Minimal UI Page for the Sample Plugin
by zhshzhou@linux.vnet.ibm.com
From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Add minimal UI just enough to re-produce issue 342 and 343.
https://github.com/kimchi-project/kimchi/issues/342
https://github.com/kimchi-project/kimchi/issues/343
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
plugins/sample/__init__.py | 3 ++-
plugins/sample/sample.conf | 5 +++++
plugins/sample/ui/config/tab-ext.xml | 9 +++++----
plugins/sample/ui/pages/i18n.html.tmpl | 13 +++++++++++++
plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++
5 files changed, 31 insertions(+), 5 deletions(-)
create mode 100644 plugins/sample/ui/pages/i18n.html.tmpl
create mode 100644 plugins/sample/ui/pages/tab.html.tmpl
diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py
index 3183898..2101aed 100644
--- a/plugins/sample/__init__.py
+++ b/plugins/sample/__init__.py
@@ -26,6 +26,7 @@ from cherrypy import expose
from kimchi.config import PluginPaths
from kimchi.control.base import Collection, Resource
+from kimchi.root import Root
from plugins.sample.i18n import messages
from plugins.sample.model import Model
@@ -33,7 +34,7 @@ from plugins.sample.model import Model
model = Model()
-class Drawings(Resource):
+class Drawings(Root):
def __init__(self):
Resource.__init__(self, model)
self.description = Description(model)
diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf
index c4e80f7..78a9f4e 100644
--- a/plugins/sample/sample.conf
+++ b/plugins/sample/sample.conf
@@ -5,3 +5,8 @@ uri = "/plugins/sample"
[/]
tools.trailing_slash.on = False
+tools.sessions.on = True
+tools.sessions.name = 'kimchi'
+tools.sessions.httponly = True
+tools.sessions.locking = 'explicit'
+tools.sessions.storage_type = 'ram'
diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml
index 948fa07..b98c126 100644
--- a/plugins/sample/ui/config/tab-ext.xml
+++ b/plugins/sample/ui/config/tab-ext.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--<tabs-ext>
+<tabs-ext>
<tab>
- <title>Test</title>
- <filePath>plugins/sample/ui/tab.html</filePath>
+ <title>SampleTab</title>
+ <path>plugins/sample/tab.html</path>
+ <nls>plugins/sample/i18n.html</nls>
</tab>
-</tabs-ext>-->
\ No newline at end of file
+</tabs-ext>
diff --git a/plugins/sample/ui/pages/i18n.html.tmpl b/plugins/sample/ui/pages/i18n.html.tmpl
new file mode 100644
index 0000000..04f32dd
--- /dev/null
+++ b/plugins/sample/ui/pages/i18n.html.tmpl
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="no-js" lang=$lang.lang[0]>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>language</title>
+</head>
+<body>
+<script>
+i18n["SampleTab"] = "SampleTab";
+</script>
+</body>
+</html>
diff --git a/plugins/sample/ui/pages/tab.html.tmpl b/plugins/sample/ui/pages/tab.html.tmpl
new file mode 100644
index 0000000..49fc4ec
--- /dev/null
+++ b/plugins/sample/ui/pages/tab.html.tmpl
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+Hello, world
+</body>
+</html>
--
1.8.5.3
10 years, 7 months
[PATCH v6 0/3] UI: Software Update Support
by Hongliang Wang
Added UI support for software updating. The Host Tab will initially
list available updates to user if there are any; or we will disable
"Update All" Button if no updates available.
Please apply following patch first:
* [PATCH] [UI] Grid Enhancement - Show Message when Loading Data
v5 -> v6:
6a) Added a loading icon on top of grid when loading data
(Adam King's comment)
6b) Removed row number column
(Adam King's comment)
v4 -> v5:
5a) Disable row selection in software update grid
(Thanks to Royce's comment)
v3 -> v4:
4a) Added the last update output
(Thanks to Aline's comment)
4b) Disabled horizontal resize function of output textarea
(Thanks to Aline's comment)
4c) Added "Update Progress" label to the output textarea
(Thanks to Aline's comment)
4d) Added refreshing the software grid after updating is finished
(Thanks to Aline's comment)
4e) Added software updates grid cleanup when host tab is unloaded
v2 -> v3:
3a) Fixed "Update All" Button always being disabled issue
(Thanks to Paulo and Aline's comment)
3b) Updated REST API calling according to back-end change
3c) Added in-progress message when system is being updated
(Thanks to Aline's comment)
v1 -> v2:
2a) Fixed "Update All" Button always being disabled issue
(Thanks to Paulo Ricardo Paz Vital's comment)
Hongliang Wang (3):
Software Update - i18n Translation Strings
Software Update - APIs in kimchi.api.js
Software Update Support in Host Tab
ui/css/theme-default/host.css | 29 ++++++++++++
ui/js/src/kimchi.api.js | 55 +++++++++++++++++++++-
ui/js/src/kimchi.host.js | 104 ++++++++++++++++++++++++++++++++++++++----
ui/pages/i18n.html.tmpl | 10 ++++
ui/pages/tabs/host.html.tmpl | 17 +++++++
5 files changed, 206 insertions(+), 9 deletions(-)
--
1.8.1.4
10 years, 7 months
[PATCH] [UI] Grid Loading Mask - Some Elements are Missing
by Hongliang Wang
Some elements were lost and add them back here:
1) Show a message under the icon
2) Put the icon and text in the center both horizontally and vertically
3) Give the mask a opacity value
4) Hide the mask initially
Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
---
ui/css/theme-default/grid.css | 3 +++
ui/js/src/kimchi.grid.js | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css
index 761d32f..44ae614 100644
--- a/ui/css/theme-default/grid.css
+++ b/ui/css/theme-default/grid.css
@@ -214,10 +214,12 @@
}
.grid-mask {
+ background: rgba(190, 190, 190, .9);
bottom: 0;
left: 0;
position: absolute;
right: 0;
+ z-index: 5;
}
.grid-loading {
@@ -225,6 +227,7 @@
height: 68px;
left: 0;
margin: auto;
+ position: absolute;
right: 0;
text-align: center;
top: 0;
diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js
index c53e584..7360b36 100644
--- a/ui/js/src/kimchi.grid.js
+++ b/ui/js/src/kimchi.grid.js
@@ -54,10 +54,12 @@ kimchi.widget.Grid = function(params) {
'<div class="grid-resizer hidden"></div>',
'</div>',
'<div class="grid-footer"></div>',
- '<div class="grid-mask">',
+ '<div class="grid-mask hidden">',
'<div class="grid-loading">',
'<div class="grid-loading-icon"></div>',
- '<div class="grid-loading-text"></div>',
+ '<div class="grid-loading-text">',
+ i18n['KCHGRD6001M'],
+ '</div>',
'</div>',
'</div>',
'</div>'
--
1.8.1.4
10 years, 7 months
[PATCH] bug fix: encode the args in KimchiException when is is unicode.
by shaohef@linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
I create a pool with name "kīмсhīPool"
When libvirt errors with this pool, it will cause the UnicodeDecodeError.
File "/home/shhfeng/work/workdir/kimchi/src/kimchi/model/storagepools.py",
line 401, in delete
{'name': name, 'err': e.get_error_message()})
File "/home/shhfeng/work/workdir/kimchi/src/kimchi/exception.py", line
37, in __init__
msg = _messages.get(code, code) % args
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc4 in position 49:
ordinal not in range(128)
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
src/kimchi/exception.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py
index 74134be..87982ea 100644
--- a/src/kimchi/exception.py
+++ b/src/kimchi/exception.py
@@ -32,6 +32,9 @@ class KimchiException(Exception):
if cherrypy.request.app:
msg = self._get_translation(args)
else:
+ for key, value in args.iteritems():
+ if isinstance(value, unicode):
+ args[key] = value.encode('utf-8')
msg = _messages.get(code, code) % args
pattern = "%s: %s" % (code, msg)
--
1.8.4.2
10 years, 7 months
[PATCH] [UI] Grid Enhancement - Show Message when Loading Data
by Hongliang Wang
Sometimes when we draw a grid, the data is not ready and it's a time-consuming
task for back-end, so the user will expect that the grid is drawn there, and a
"loading" message is on top of the grid while loading data.
In this patch, we make this enhancement. Meanwhile, we introduce a "loading"
icon which is made based-on Kimchi logo.
Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
---
ui/css/theme-default/grid.css | 24 +++++++++++++++++++++++
ui/images/theme-default/kimchi-loading.gif | Bin 0 -> 6181 bytes
ui/js/src/kimchi.grid.js | 30 ++++++++++++++++++++++++++++-
ui/pages/i18n.html.tmpl | 2 ++
4 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 ui/images/theme-default/kimchi-loading.gif
diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css
index 9f8f98e..761d32f 100644
--- a/ui/css/theme-default/grid.css
+++ b/ui/css/theme-default/grid.css
@@ -212,3 +212,27 @@
width: 0;
z-index: 4;
}
+
+.grid-mask {
+ bottom: 0;
+ left: 0;
+ position: absolute;
+ right: 0;
+}
+
+.grid-loading {
+ bottom: 0;
+ height: 68px;
+ left: 0;
+ margin: auto;
+ right: 0;
+ text-align: center;
+ top: 0;
+ width: 49px;
+}
+
+.grid-loading-icon {
+ background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top;
+ height: 48px;
+ width: 49px;
+}
diff --git a/ui/images/theme-default/kimchi-loading.gif b/ui/images/theme-default/kimchi-loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..af92bfdc0a44170c71fb7406d2c6bc359e176e91
GIT binary patch
literal 6181
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
VeND9!UFjIxpWWs~tzJ(W{~z1)DdhkF
literal 0
HcmV?d00001
diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js
index 20cacc5..b6f6afb 100644
--- a/ui/js/src/kimchi.grid.js
+++ b/ui/js/src/kimchi.grid.js
@@ -54,6 +54,12 @@ kimchi.widget.Grid = function(params) {
'<div class="grid-resizer hidden"></div>',
'</div>',
'<div class="grid-footer"></div>',
+ '<div class="grid-mask">',
+ '<div class="grid-loading">',
+ '<div class="grid-loading-icon"></div>',
+ '<div class="grid-loading-text"></div>',
+ '</div>',
+ '</div>',
'</div>'
];
@@ -150,6 +156,9 @@ kimchi.widget.Grid = function(params) {
var toolbarHeight = toolbarNode && $(toolbarNode).height() || 0;
gridContentNode.css('top', (captionHeight + toolbarHeight) + 'px');
+ var maskNode = $('.grid-mask', gridNode);
+ maskNode.css('top', (captionHeight + toolbarHeight) + 'px');
+
var fillBody = function(container, fields, data) {
var tbody = ($('tbody', container).length && $('tbody', container))
|| $('<tbody></tbody>').appendTo(container);
@@ -263,7 +272,6 @@ kimchi.widget.Grid = function(params) {
setBodyListeners();
};
- this.setData(params['data']);
this.getSelected = function() {
return selectedIndex >= 0
? this.data[selectedIndex]
@@ -374,4 +382,24 @@ kimchi.widget.Grid = function(params) {
$('body').off('mousemove', positionResizer);
$('body').off('mouseup', endResizing);
};
+
+ var data = params['data'];
+ if(!data) {
+ return;
+ }
+
+ if($.isArray(data)) {
+ this.setData(data);
+ return;
+ }
+
+ if($.isFunction(data)) {
+ var self = this;
+ var loadData = data;
+ maskNode.removeClass('hidden');
+ loadData(function(data) {
+ self.setData(data);
+ maskNode.addClass('hidden');
+ });
+ }
};
diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
index ba3a407..1a3a6d2 100644
--- a/ui/pages/i18n.html.tmpl
+++ b/ui/pages/i18n.html.tmpl
@@ -59,6 +59,8 @@ var i18n = {
'KCHAPI6005M': "$_("Create")",
'KCHAPI6006M': "$_("Warning")",
+ 'KCHGRD6001M': "$_("Loading...")",
+
'KCHTMPL6001W': "$_("No iso found")",
'KCHTMPL6002E': "$_("This is not a valid ISO file.")",
--
1.8.1.4
10 years, 7 months
[PATCH 0/4] Fixes on update and repo management features
by Aline Manera
From: Aline Manera <alinefm(a)br.ibm.com>
Aline Manera (4):
bug fix: Identify update tool based on available system tools
bug fix: Identify repository management tool based on available
system tools
Expose repo_mngt_tool to /config/capabilities
Start up Kimchi even if no repo management tool was identified
docs/API.md | 2 ++
src/kimchi/i18n.py | 2 +-
src/kimchi/mockmodel.py | 4 +++-
src/kimchi/model/config.py | 11 ++++++++++-
src/kimchi/model/host.py | 31 +++++++++++++++++++++++++++++--
src/kimchi/repositories.py | 27 +++++++++++----------------
src/kimchi/swupdate.py | 33 ++++++++++++++++-----------------
tests/test_rest.py | 2 ++
8 files changed, 74 insertions(+), 38 deletions(-)
--
1.7.10.4
10 years, 7 months
[PATCH] Correct the Repositories parameter name of is_mirror
by Adam King
As suggested by Paulo, the current implementation of the Repository API
incorrectly looks for a mirrors parameter, when it should look for is_mirror.
Correcting the impl.
Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com>
---
src/kimchi/control/host.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py
index 4fd6b51..edcc0ad 100644
--- a/src/kimchi/control/host.py
+++ b/src/kimchi/control/host.py
@@ -113,7 +113,7 @@ class Repositories(Collection):
class Repository(Resource):
def __init__(self, model, id):
super(Repository, self).__init__(model, id)
- self.update_params = ["repo_id", "repo_name", "baseurl", "mirrors",
+ self.update_params = ["repo_id", "repo_name", "baseurl", "is_mirror",
"url_args", "gpgcheck", "gpgkey"]
self.uri_fmt = "/host/repositories/%s"
self.enable = self.generate_action_handler('enable')
--
1.8.1.4
10 years, 7 months
[PATCH] Added help for host and network tab. Edited help for guests, storage, and templates tab. Signed-off-by: Kersten Richter <kersten@us.ibm.com>
by Kersten Richter
---
ui/pages/help/guests.dita | 146 +++++++++++++++++++++++-----------
ui/pages/help/host.dita | 51 ++++++++++++
ui/pages/help/network.dita | 68 ++++++++++++++++
ui/pages/help/storage.dita | 135 +++++++++++++++++++++-----------
ui/pages/help/templates.dita | 179 ++++++++++++++++++++++++++++--------------
5 files changed, 428 insertions(+), 151 deletions(-)
create mode 100644 ui/pages/help/host.dita
create mode 100644 ui/pages/help/network.dita
diff --git a/ui/pages/help/guests.dita b/ui/pages/help/guests.dita
index cc6294c..bae98bb 100644
--- a/ui/pages/help/guests.dita
+++ b/ui/pages/help/guests.dita
@@ -1,47 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?Pub Sty _display FontColor="red"?>
-<?Pub Inc?>
-<cshelp id="kimhvirtm" xml:lang="en-us">
- <title>Virtual machines</title>
- <shortdesc>The Virtual machines page lists the defined KVM virtual
-machines.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help;
-for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help;
-for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p>For each virtual machine, the following information is displayed:<dl><dlentry><dt>Name</dt><dd>Name of the virtual machine.</dd></dlentry><dlentry><dt>CPU</dt><dd>Percentage of processor utilization in the virtual machine.</dd></dlentry><dlentry><dt>Network I/O</dt><dd>Network input/output transmission rate in KB per seconds.</dd></dlentry><dlentry><dt>Disk I/O</dt><dd> Disk input/output transmission rate in KB per seconds.</dd></dlentry><dlentry><dt>Console</dt><dd>Current state of guest operating system console.</dd></dlentry></dl></p>
- <p>The following actions icons are displayed for each virtual machine:<dl><dlentry><dt>Reload</dt><dd>Click to reload the displayed data. </dd></dlentry><dlentry><dt>Power</dt><dd>Click to power on the virtual machine. If the icon is red, the
-power is off; if the icon is green, the power is on.</dd></dlentry></dl> </p>
- <p>The following actions can be selected for each virtual machine:<ul><li>Select <uicontrol>VNC</uicontrol> to connect to the remote console
-for the virtual machine.</li><li>Select <uicontrol>Delete</uicontrol> to delete the virtual machine.</li></ul>To create a virtual machine, click the <uicontrol>plus (+)</uicontrol> icon
-in the upper right of the page.</p>
- </csbody>
- <cshelp id="kimhvirtmcrt" xml:lang="en-us">
- <title>Create virtual machine</title>
- <shortdesc>Create a virtual machine using an existing template.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help;
-for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help;
-for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p>
- <ol>
- <li>Type the name to be used to identify the virtual machine.</li>
- <li>Click to select a template.</li>
- <li>Click <uicontrol>Create</uicontrol>.</li>
- </ol>
- </p>
- </csbody>
- </cshelp>
- <?Pub Caret -1?>
-</cshelp>
-<?Pub *0000002746?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2011, v.4002-->
+<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
+ "..\dtd\cshelp.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
+<!--This DITA specialized document type is not supported by the Authoring Tools development team.
+For support please see:
+https://w3.opensource.ibm.com/projects/dita-cshelp/-->
+<cshelp id="kimhvirtm" xml:lang="en-us">
+<title>Guests</title>
+<shortdesc>The <wintitle>Guests</wintitle> page lists the defined
+KVM virtual machines.</shortdesc>
+<csbody>
+<p>For each guest, the following information is displayed:<dl><dlentry>
+<dt>Name</dt>
+<dd>Name of the virtual machine.</dd>
+</dlentry><dlentry>
+<dt>CPU</dt>
+<dd>Percentage of processor utilization in the virtual machine.</dd>
+</dlentry><dlentry>
+<dt>Network I/O</dt>
+<dd>Network input/output transmission rate in KB per seconds.</dd>
+</dlentry><dlentry>
+<dt>Disk I/O</dt>
+<dd> Disk input/output transmission rate in KB per seconds.</dd>
+</dlentry><dlentry>
+<dt>Livetile</dt>
+<dd rev="rev1">State of guest operating system console, or an icon
+that represents the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution
+if the guest is not active.</dd>
+</dlentry></dl></p>
+<p>The following actions icons are displayed for each guest:<dl>
+<dlentry>
+<dt rev="rev1">Reset</dt>
+<dd rev="rev1">Click to reset the guest. </dd>
+</dlentry><dlentry>
+<dt><tm tmclass="IGNORE" tmtype="reg" trademark="Power">Power</tm> (Start
+or Stop)</dt>
+<dd>Click to power on or power off the guest. If the icon is red,
+the power is off; if the icon is green, the power is on.</dd>
+</dlentry></dl> </p>
+<p>The following actions can be selected for each guest:<ul>
+<li>Select <uicontrol>VNC</uicontrol> to connect to the remote console
+for the guest operating system.</li>
+<li>Select <uicontrol>Edit</uicontrol> to edit the properties of an
+existing guest. Guests can be edited only while stopped.</li>
+<li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li>
+</ul>To create a guest, or virtual machine, click the <uicontrol>plus
+(+)</uicontrol> icon in the upper right of the page.</p>
+</csbody>
+<cshelp id="kimhvirtmcrt" xml:lang="en-us">
+<title>Create virtual machine</title>
+<shortdesc>Create a virtual machine by using an existing template.</shortdesc>
+<csbody>
+<p> <ol>
+<li>Type the name to be used to identify the virtual machine.</li>
+<li rev="rev1">Select a template. <ul>
+<li>If templates exist, select from displayed templates.</li>
+<li>If no templates exist, click <uicontrol>Create a template</uicontrol> to
+create a template.</li>
+</ul></li>
+<li>Click <uicontrol>Create</uicontrol>.</li>
+</ol> </p>
+</csbody>
+</cshelp>
+<cshelp id="kimhvirtmedit" xml:lang="en-us">
+<title>Edit guest</title>
+<shortdesc rev="rev1">Edit the properties of an existing virtual machine.
+Guests can be edited only while stopped.</shortdesc>
+<csprolog><csmetadata>
+<cswindowtitle>Title of window or panel associated with this help;
+for review output only.</cswindowtitle>
+<cswidgetlabel>Name of field or control associated with this help;
+for review output only</cswidgetlabel>
+</csmetadata></csprolog>
+<csbody>
+<p>For each guest, the following information is displayed:<dl><dlentry>
+<dt>Name</dt>
+<dd>Name of the virtual machine.</dd>
+</dlentry><dlentry>
+<dt>CPUs</dt>
+<dd>Number of processors.</dd>
+</dlentry><dlentry>
+<dt>Memory</dt>
+<dd>Amount of memory in MB.</dd>
+</dlentry><dlentry>
+<dt>Icon</dt>
+<dd rev="rev2"> Graphic image representing the Linux distribution
+to be displayed in place of current status (Livetile) when the guest
+is not active.</dd>
+</dlentry></dl></p>
+<p> Fields that are not disabled can be edited. After you edit a field,
+click <uicontrol>Save</uicontrol>. </p>
+</csbody>
+</cshelp><?Pub Caret -1?>
+<?tm 1391540919 3?>
+</cshelp>
+<?Pub *0000003805?>
diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita
new file mode 100644
index 0000000..d961edc
--- /dev/null
+++ b/ui/pages/help/host.dita
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2011, v.4002-->
+<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
+ "..\dtd\cshelp.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
+<!--This DITA specialized document type is not supported by the Authoring Tools development team.
+For support please see:
+https://w3.opensource.ibm.com/projects/dita-cshelp/-->
+<cshelp id="kimhhost" xml:lang="en-us">
+<title>Host</title>
+<shortdesc rev="rev1">The <wintitle>Host</wintitle> page shows information
+about the host system, and allows you to shut down, restart, and connect
+to the host.</shortdesc>
+<csbody>
+<p>You can perform the following actions on the host:<ul>
+<li>Select <uicontrol>Shut down</uicontrol> to shut down the host
+system.</li>
+<li>Select <uicontrol>Restart</uicontrol> to restart the host system.</li>
+<li rev="rev1">Select <uicontrol>Connect</uicontrol> to open a VNC
+connection to the host system, if it is not already connected.</li>
+</ul></p>
+<p>Click the following sections to display information about the host:<dl>
+<dlentry>
+<dt>Basic information</dt>
+<dd>This section displays the host operating system distribution,
+version, and code name, as well as the processor type and amount of
+memory in GB.</dd>
+</dlentry><dlentry>
+<dt>System statistics</dt>
+<dd rev="rev1">This section displays graphs to show statistics for
+CPU, memory, disk I/O, and network I/O for the host. Select <uicontrol>Collecting
+data after leaving this page</uicontrol> to continue collecting data
+when the host tab is out of view.</dd>
+</dlentry><dlentry>
+<dt>Debug reports</dt>
+<dd rev="rev1">This section displays debug reports, including name
+and file path. You can select from options to generate a new report,
+or rename, remove, or download an existing report.<p>The debug report
+is generated using the <cmdname>sosreport</cmdname> command. It is
+available for Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>,
+Fedora, and Ubuntu distributions. The command generates a .tar file
+that contains configuration and diagnostic information, such as the
+running kernel version, loaded modules, and system and service configuration
+files. The command also runs external programs to collect further
+information and stores this output in the resulting archive.</p> </dd>
+</dlentry></dl></p>
+</csbody><?Pub Caret -2?>
+<?tm 1392659967 1?>
+</cshelp>
+<?Pub *0000002392?>
diff --git a/ui/pages/help/network.dita b/ui/pages/help/network.dita
new file mode 100644
index 0000000..4846d5b
--- /dev/null
+++ b/ui/pages/help/network.dita
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2011, v.4002-->
+<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
+ "..\dtd\cshelp.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
+<!--This DITA specialized document type is not supported by the Authoring Tools development team.
+For support please see:
+https://w3.opensource.ibm.com/projects/dita-cshelp/-->
+<cshelp id="kimhnetw" xml:lang="en-us">
+<title>Network</title>
+<shortdesc>The <wintitle>Network</wintitle> page displays information
+about the network connection.</shortdesc>
+<csbody>
+<p><dl><dlentry>
+<dt>Network Name</dt>
+<dd>Name of the network, or <uicontrol>default</uicontrol>.</dd>
+</dlentry><dlentry>
+<dt>State</dt>
+<dd>State of the network, active (green) or inactive (red). </dd>
+</dlentry><dlentry>
+<dt>Network type</dt>
+<dd>Network type, for example, <uicontrol>NAT</uicontrol> (network
+address translation).</dd>
+</dlentry><dlentry>
+<dt>Interface</dt>
+<dd>Network interface, for example, <uicontrol>virbr0</uicontrol> (default).</dd>
+</dlentry><dlentry>
+<dt>Address space</dt>
+<dd>IP address.</dd>
+</dlentry></dl></p>
+<p>The following actions can be selected:<ul>
+<li rev="rev1">Select <uicontrol>Start</uicontrol> to begin the network
+connection.</li>
+<li>Select <uicontrol>Stop</uicontrol> to end the network connection.</li>
+<li>Select <uicontrol>Delete</uicontrol> to delete the connection
+information.</li>
+</ul>To create a network, click the <uicontrol>plus (+)</uicontrol> icon
+in the upper right of the display.</p>
+</csbody>
+<cshelp id="kimhnetwcrt" xml:lang="en-us">
+<title>Create a network</title>
+<shortdesc>Create a network.</shortdesc>
+<csbody>
+<p> <ol>
+<li>Type the name of the network.</li>
+<li>Click to select the network type. <dl rev="rev1"><dlentry>
+<dt><uicontrol>Isolated</uicontrol></dt>
+<dd>Isolated mode. Guests cannot send or receive communication to
+or from external systems.</dd>
+</dlentry><dlentry>
+<dt><uicontrol>NAT</uicontrol></dt>
+<dd>Network Address Translation mode. Communication from guests to
+external systems uses the host IP address. External systems cannot
+initiate communication to guests.</dd>
+</dlentry><dlentry>
+<dt><uicontrol>Bridged</uicontrol></dt>
+<dd>Bridged mode. Guests can communicate with external systems and
+be contacted by external systems as if they were physical systems
+on the network. For bridged mode, you must specify additional destination
+and VLAN information.</dd>
+</dlentry></dl><?Pub Caret 224?></li>
+<li>Click <uicontrol>Create</uicontrol>.</li>
+</ol> </p>
+</csbody>
+</cshelp>
+</cshelp>
+<?Pub *0000002571?>
diff --git a/ui/pages/help/storage.dita b/ui/pages/help/storage.dita
index f9ae93e..9ad0ea4 100644
--- a/ui/pages/help/storage.dita
+++ b/ui/pages/help/storage.dita
@@ -1,45 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="dita.xsl" type="text/xsl" ?>
-<?Pub Sty _display FontColor="red"?>
-<?Pub Inc?>
-<cshelp id="kimhstor" xml:lang="en-us">
- <title>Storage</title>
- <shortdesc>The Storage page lists the available storage pools, including the default storage pool.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help; for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help; for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p>For each storage pool, the following information is displayed:<dl><dlentry><dt>Name</dt><dd>Name of the storage pool and percentage used.</dd></dlentry><dlentry><dt>State</dt><dd>State of the storage pool, active (green) or inactive (red). </dd></dlentry><dlentry><dt>Location</dt><dd>File path to the location of the storage pool.</dd></dlentry><dlentry><dt>Type</dt><dd><uicontrol>dir</uicontrol> for directory.</dd></dlentry><dlentry><dt>Capacity</dt><dd>Amount of space in the storage pool.</dd></dlentry><dlentry><dt>Allocated</dt><dd>Amount of space already allocated in the storage pool.</dd></dlentry></dl></p>
- <p>The following actions can be selected for each storage pool:<ul><li>Select <uicontrol>Activate</uicontrol> to activate the storage
-pool so that it can be used.</li><li>Select <uicontrol>Undefine</uicontrol> to remove an inactive storage
-pool.</li></ul></p>
- <p>To display storage volume details for a storage pool, click the
-arrow on the right side of the storage pool row. Details include
-the following:<dl><dlentry><dt>Type</dt><dd>The type of storage pool, for example, dir or disk.</dd></dlentry><dlentry><dt>Format</dt><dd>The format, varying dependent on the type.</dd></dlentry><dlentry><dt>Capacity</dt><dd>Size of the storage volume.</dd></dlentry><dlentry><dt>Allocated</dt><dd>Amount of space already allocated in the storage pool.</dd></dlentry></dl>To define a storage pool, click the <uicontrol>plus
-(+)</uicontrol> icon in the upper right of the display.</p>
- </csbody>
- <cshelp id="kimhdefstor" xml:lang="en-us">
- <title>Define a storage pool</title>
- <shortdesc> Define a storage pool.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help; for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help; for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p>
- <ol>
- <li>Type the name to be used to identify the storage pool.</li>
- <li>Type the file path to the storage pool.</li>
- <li>Click <uicontrol>Create</uicontrol>.</li>
- </ol>
- </p>
- </csbody>
- </cshelp>
- <?Pub Caret -1?>
-</cshelp>
-<?Pub *0000003013?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2011, v.4002-->
+<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
+ "..\dtd\cshelp.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
+<!--This DITA specialized document type is not supported by the Authoring Tools development team.
+For support please see:
+https://w3.opensource.ibm.com/projects/dita-cshelp/-->
+<cshelp id="kimhstor" xml:lang="en-us">
+<title>Storage</title>
+<shortdesc>The <wintitle>Storage</wintitle> page lists the available
+storage pools, including the default storage pool.</shortdesc>
+<csbody>
+<p>For each storage pool, the following information is displayed:<dl>
+<dlentry>
+<dt>Name</dt>
+<dd>Name of the storage pool and percentage used.</dd>
+</dlentry><dlentry>
+<dt>State</dt>
+<dd>State of the storage pool, active (green) or inactive (red). </dd>
+</dlentry><dlentry>
+<dt>Location</dt>
+<dd>File path to the location of the storage pool.</dd>
+</dlentry><dlentry>
+<dt>Type</dt>
+<dd>Type of storage pool, for example, <uicontrol>dir</uicontrol>.</dd>
+</dlentry><dlentry>
+<dt>Capacity</dt>
+<dd>Amount of space in the storage pool.</dd>
+</dlentry><dlentry>
+<dt>Allocated</dt>
+<dd>Amount of space that is already allocated in the storage pool.</dd>
+</dlentry></dl></p>
+<p>The following actions can be selected for each storage pool:<ul>
+<li>Select <uicontrol>Activate</uicontrol> to activate the storage
+pool so that it can be used.</li>
+<li>Select <uicontrol>Deactivate</uicontrol> to deactivate an active
+storage pool.</li>
+<li>Select <uicontrol>Undefine</uicontrol> to remove an inactive storage
+pool.</li>
+</ul></p>
+<p>To display storage volume details for a storage pool, click the
+arrow on the right side of the storage pool row. Details include
+the following:<dl><dlentry>
+<dt>Type</dt>
+<dd>The type of volume, for example, <uicontrol>file</uicontrol>.</dd>
+</dlentry><dlentry>
+<dt>Format</dt>
+<dd>The format, varying dependent on the type.</dd>
+</dlentry><dlentry>
+<dt>Capacity</dt>
+<dd>Size of the storage volume.</dd>
+</dlentry><dlentry>
+<dt>Allocation</dt>
+<dd>Amount of space that is already allocated in the storage pool.</dd>
+</dlentry></dl><?Pub Caret -2?>To define a storage pool, click the <uicontrol>plus
+(+)</uicontrol> icon in the upper right of the display.</p>
+</csbody>
+<cshelp id="kimhdefstor" xml:lang="en-us">
+<title>Define a storage pool</title>
+<shortdesc> Define a storage pool.</shortdesc>
+<csbody>
+<p> <ol>
+<li>In the <uicontrol>Storage pool name</uicontrol> field, type the
+name to be used to identify the storage pool.</li>
+<li>In the <uicontrol>Storage pool type</uicontrol> list, select the
+type: <dl rev="rev1"><dlentry>
+<dt><uicontrol>DIR</uicontrol></dt>
+<dd>Specifies a directory pool. When selecting <uicontrol>DIR</uicontrol>,
+type the <uicontrol>Storage path</uicontrol> (file path to the storage
+pool).</dd>
+</dlentry><dlentry>
+<dt><uicontrol>NFS</uicontrol></dt>
+<dd>Specifies a network filesystem pool. When selecting <uicontrol>NFS</uicontrol>,
+type the <uicontrol>NFS server IP</uicontrol> address and <uicontrol>NFS
+path</uicontrol> (path of the exported directory).</dd>
+</dlentry><dlentry>
+<dt><uicontrol>iSCSI</uicontrol></dt>
+<dd>Specifies a pool based on a target allocated on an iSCSI server.
+When selecting <uicontrol>iSCSI</uicontrol>, type the <uicontrol>iSCSI
+server</uicontrol> IP address and <uicontrol>Target</uicontrol> on
+the iSCSI server. You can optionally select to add iSCSI authentication.</dd>
+</dlentry></dl></li>
+<li>Click <uicontrol>Create</uicontrol>.</li>
+</ol> </p>
+</csbody>
+</cshelp>
+</cshelp>
+<?Pub *0000003580?>
diff --git a/ui/pages/help/templates.dita b/ui/pages/help/templates.dita
index 0a9bcff..5048fc8 100644
--- a/ui/pages/help/templates.dita
+++ b/ui/pages/help/templates.dita
@@ -1,59 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?Pub Sty _display FontColor="red"?>
-<?Pub Inc?>
-<cshelp id="kimhtempl" xml:lang="en-us">
- <title>Templates</title>
- <shortdesc>The Templates page shows the defined virtual machine templates
-that can be used to create KVM virtual machines.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help;
-for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help;
-for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p>For each template, the following information is displayed:<dl><dlentry><dt>OS</dt><dd>Name of the operating system or distribution.</dd></dlentry><dlentry><dt>Version</dt><dd>Version of the operating system or distribution.</dd></dlentry><dlentry><dt>CPU</dt><dd>Number of processors defined for the template.</dd></dlentry><dlentry><dt>Memory</dt><dd>Amount of random access memory to be allocated, in MB.</dd></dlentry></dl></p>
- <p>The following actions can be selected for each template:<ul><li>Select <uicontrol>Edit</uicontrol> to edit the template.</li><li>Select <uicontrol>Delete</uicontrol> to delete the template.</li></ul>To add a template, click the <uicontrol>plus (+)</uicontrol> icon
-in the upper right of the display.</p>
- </csbody>
- <cshelp id="kimhedittempl" xml:lang="en-us">
- <title>Edit template</title>
- <shortdesc>Edit an existing template.</shortdesc>
- <csprolog>
- <csmetadata>
- <cswindowtitle>Title of window or panel associated with this help;
-for review output only.</cswindowtitle>
- <cswidgetlabel>Name of field or control associated with this help;
-for review output only</cswidgetlabel>
- </csmetadata>
- </csprolog>
- <csbody>
- <p><ol><li>Edit the following information for the template:<dl><dlentry><dt>Name</dt><dd>Name of the template.</dd></dlentry><dlentry><dt>CPU</dt><dd>Number of processors defined for the template.</dd></dlentry><dlentry><dt>Memory</dt><dd>Memory to be allocated to the virtual machine.</dd></dlentry></dl></li><li>Click <uicontrol>Save</uicontrol>.</li></ol>The following information is displayed but cannot be edited:<dl><dlentry><dt>Vendor</dt><dd>The name of the company that created the operating system or distribution
-that the template is configured to use.</dd></dlentry><dlentry><dt>Version</dt><dd>The version of the operating system or distribution that the template
-is configured to use.</dd></dlentry></dl></p>
- </csbody>
- </cshelp>
- <?Pub Caret -1?>
- <cshelp id="kimhaddtempl">
- <title>Add template</title>
- <shortdesc>Add a template from source media.</shortdesc>
- <csbody>
- <p>Select the location from the following options:<ol><li>Select the location of the source media from the following options:<dl><dlentry><dt>Local ISO image</dt><dd>Select to scan storage pools for installation ISO images available
-on the system.</dd></dlentry><dlentry><dt>Remote ISO image</dt><dd>Select to specify a remote location for an installation ISO image.</dd></dlentry></dl></li><li>Click <uicontrol>Create</uicontrol>.</li></ol></p>
- </csbody>
- </cshelp>
- <cshelp id="kimhaddloct">
- <title>Add template - local ISO image</title>
- <shortdesc>Add a template from a local ISO image.</shortdesc>
- <csbody>
- <p>The ISO images available on the system are displayed.<dl><dlentry><dt>OS</dt><dd>Name of the operating system or distribution.</dd></dlentry><dlentry><dt>Version</dt><dd>Version of the operating system or distribution.</dd></dlentry><dlentry><dt>Size</dt><dd>Size of the ISO image.</dd></dlentry></dl></p>
- <p>To create a template from an ISO image, complete the following
-steps:<ol><li>Choose from the following options:<ul><li>Select an ISO image from which to create a template.</li><li>Select the <uicontrol>All</uicontrol> check box to create a template
-from each listed ISO image.</li><li>Select the <uicontrol>I want to use a specific file</uicontrol> check
-box to specify a path to the ISO image.</li></ul></li><li>Click <uicontrol>Create</uicontrol>.</li></ol></p>
- </csbody>
- </cshelp>
-</cshelp>
-<?Pub *0000004376?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Arbortext, Inc., 1988-2011, v.4002-->
+<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
+ "..\dtd\cshelp.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
+<!--This DITA specialized document type is not supported by the Authoring Tools development team.
+For support please see:
+https://w3.opensource.ibm.com/projects/dita-cshelp/-->
+<cshelp id="kimhtempl" xml:lang="en-us">
+<title>Templates</title>
+<shortdesc>The <wintitle>Templates</wintitle> page shows the defined
+virtual machine templates that can be used to create KVM guests.</shortdesc>
+<csbody>
+<p>For each template, the following information is displayed:<dl>
+<dlentry>
+<dt>OS</dt>
+<dd>Name of the operating system or distribution.</dd>
+</dlentry><dlentry>
+<dt>Version</dt>
+<dd>Version of the operating system or distribution.</dd>
+</dlentry><dlentry>
+<dt>CPUs</dt>
+<dd>Number of processors that are defined for the template.</dd>
+</dlentry><dlentry>
+<dt>Memory</dt>
+<dd>Amount of random access memory to be allocated, in MB.</dd>
+</dlentry></dl></p>
+<p>The following actions can be selected for each template:<ul>
+<li>Select <uicontrol>Edit</uicontrol> to edit the template.</li>
+<li>Select <uicontrol>Delete</uicontrol> to delete the template.</li>
+</ul>To add a template, click the <uicontrol>plus (+)</uicontrol> icon
+in the upper right of the display.</p>
+</csbody>
+<cshelp id="kimhedittempl" xml:lang="en-us">
+<title>Edit template</title>
+<shortdesc>Edit an existing template.</shortdesc>
+<csbody>
+<p>For each template, the following information is displayed: <dl>
+<dlentry>
+<dt>Name</dt>
+<dd>Name of the template.</dd>
+</dlentry><dlentry>
+<dt>Vendor</dt>
+<dd>The name of the company that created the operating system or distribution
+that the template is configured to use.</dd>
+</dlentry><dlentry>
+<dt>Version</dt>
+<dd>The version of the operating system or distribution that the template
+is configured to use.</dd>
+</dlentry><dlentry>
+<dt>CPU number</dt>
+<dd>Number of processors that are defined for the template.</dd>
+</dlentry><dlentry>
+<dt>Memory</dt>
+<dd>Amount of memory in MB to be allocated to the virtual machine.</dd>
+</dlentry><dlentry>
+<dt>Disk</dt>
+<dd rev="rev1">Disk size in GB.</dd>
+</dlentry><dlentry>
+<dt>CDROM</dt>
+<dd>File path to the location of the template.</dd>
+</dlentry><dlentry>
+<dt>Storage pool</dt>
+<dd>Specific storage pool or the default storage pool.</dd>
+</dlentry><dlentry>
+<dt>Network</dt>
+<dd rev="rev1">Default network.</dd>
+</dlentry></dl><?Pub Caret 427?> Fields that are not disabled can
+be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p>
+</csbody>
+</cshelp>
+<cshelp id="kimhaddtempl">
+<title>Add template</title>
+<shortdesc>Add a template from source media.</shortdesc>
+<csbody>
+<p>Select the location of the source media from the following options:<dl>
+<dlentry>
+<dt>Local ISO image</dt>
+<dd>Select to scan storage pools for installation ISO images available
+on the system.</dd>
+</dlentry><dlentry>
+<dt>Remote ISO image</dt>
+<dd>Select to specify a remote location for an installation ISO image.</dd>
+</dlentry></dl></p>
+</csbody>
+</cshelp>
+<cshelp id="kimhaddloct">
+<title>Add template - local ISO image</title>
+<shortdesc>Add a template from a local ISO image.</shortdesc>
+<csbody>
+<p>The ISO images available on the system are displayed.<dl><dlentry>
+<dt>OS</dt>
+<dd>Name of the operating system or distribution.</dd>
+</dlentry><dlentry>
+<dt>Version</dt>
+<dd>Version of the operating system or distribution.</dd>
+</dlentry><dlentry>
+<dt>Size</dt>
+<dd>Size of the ISO image.</dd>
+</dlentry></dl></p>
+<p>To create a template from an ISO image, choose from the following
+options:<ul>
+<li>Select an ISO image from which to create a template, then click <uicontrol>Create
+Templates from Selected ISO</uicontrol>.</li>
+<li>Select <uicontrol>All</uicontrol> to create a template from each
+ listed ISO image, then click <uicontrol>Create Templates from Selected
+ISO</uicontrol>.</li>
+<li rev="rev1">If the ISO image that you want to use does not appear
+in the scan results, you can select from the following options:<ul>
+<li>Select <uicontrol>I want to use a specific ISO file</uicontrol> to
+specify a path to the ISO image.</li>
+<li>Click <uicontrol>Search more ISOs</uicontrol> to search for more
+ISO images.</li>
+</ul></li>
+</ul></p>
+</csbody>
+</cshelp>
+</cshelp>
+<?Pub *0000004366?>
--
1.7.1
10 years, 7 months