[Kimchi-devel] [PATCHv3 3/3] Add doc and test case for dedicate iso pool

[lvroyce at linux.vnet.ibm.com]

From: Royce Lv <lvroyce at linux.vnet.ibm.com>

Add doc for user to upload the iso to a dedicate pool,
add testcase to validate correctness.

Signed-off-by: Royce Lv <lvroyce at linux.vnet.ibm.com>
---
 docs/README.md                     | 5 +++++
 tests/test_model.py                | 3 +++
 ui/pages/help/en_US/storage.dita   | 3 ++-
 ui/pages/help/en_US/templates.dita | 3 ++-
 ui/pages/help/pt_BR/storage.dita   | 3 ++-
 ui/pages/help/pt_BR/templates.dita | 3 ++-
 ui/pages/help/zh_CN/storage.dita   | 3 ++-
 ui/pages/help/zh_CN/templates.dita | 3 ++-
 8 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index c658637..2591f7c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -143,6 +143,11 @@ The template screen looks like:
 From this view, you can change the parameters of a template or create a
 new template using the "+" button in the upper right corner.
 
+To create a template, you need an ISO on your host or using remote one.
+If you are willing to use your own ISO,
+please copy it to out of box storage pool (default path is:
+/var/lib/libvirt/isos).
+
 Known Issues
 ------------
 
diff --git a/tests/test_model.py b/tests/test_model.py
index 142e4fc..ea38f59 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -416,6 +416,9 @@ class ModelTests(unittest.TestCase):
         self.assertIn('default', pools)
         poolinfo = inst.storagepool_lookup('default')
         self.assertEquals('active', poolinfo['state'])
+        self.assertIn('ISO', pools)
+        poolinfo = inst.storagepool_lookup('ISO')
+        self.assertEquals('active', poolinfo['state'])
         self.assertEquals((num - 1), len(pools))
 
     @unittest.skipUnless(utils.running_as_root(), 'Must be run as root')
diff --git a/ui/pages/help/en_US/storage.dita b/ui/pages/help/en_US/storage.dita
index 12ce15c..7ab74a9 100644
--- a/ui/pages/help/en_US/storage.dita
+++ b/ui/pages/help/en_US/storage.dita
@@ -10,7 +10,8 @@ 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>
+storage pools, including the out of box 'default' and 'ISO' storage pool.
+If you want to use your own ISO, please scp it to 'ISO' storage pool path.</shortdesc>
 <csbody>
 <p>For each storage pool, the following information is displayed:<dl>
 <dlentry>
diff --git a/ui/pages/help/en_US/templates.dita b/ui/pages/help/en_US/templates.dita
index aee0726..f5f5a43 100644
--- a/ui/pages/help/en_US/templates.dita
+++ b/ui/pages/help/en_US/templates.dita
@@ -74,7 +74,8 @@ you edit a field, click <uicontrol>Save</uicontrol>. </p>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Add template</title>
-<shortdesc>Add a template from source media.</shortdesc>
+<shortdesc>Add a template from source media.
+You can scp your own ISO image to 'ISO' storage pool for following discovery.</shortdesc>
 <csbody>
 <p>Select the location of the source media from the following options:<dl>
 <dlentry>
diff --git a/ui/pages/help/pt_BR/storage.dita b/ui/pages/help/pt_BR/storage.dita
index 12ce15c..7ab74a9 100644
--- a/ui/pages/help/pt_BR/storage.dita
+++ b/ui/pages/help/pt_BR/storage.dita
@@ -10,7 +10,8 @@ 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>
+storage pools, including the out of box 'default' and 'ISO' storage pool.
+If you want to use your own ISO, please scp it to 'ISO' storage pool path.</shortdesc>
 <csbody>
 <p>For each storage pool, the following information is displayed:<dl>
 <dlentry>
diff --git a/ui/pages/help/pt_BR/templates.dita b/ui/pages/help/pt_BR/templates.dita
index aee0726..f5f5a43 100644
--- a/ui/pages/help/pt_BR/templates.dita
+++ b/ui/pages/help/pt_BR/templates.dita
@@ -74,7 +74,8 @@ you edit a field, click <uicontrol>Save</uicontrol>. </p>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Add template</title>
-<shortdesc>Add a template from source media.</shortdesc>
+<shortdesc>Add a template from source media.
+You can scp your own ISO image to 'ISO' storage pool for following discovery.</shortdesc>
 <csbody>
 <p>Select the location of the source media from the following options:<dl>
 <dlentry>
diff --git a/ui/pages/help/zh_CN/storage.dita b/ui/pages/help/zh_CN/storage.dita
index 12ce15c..7ab74a9 100644
--- a/ui/pages/help/zh_CN/storage.dita
+++ b/ui/pages/help/zh_CN/storage.dita
@@ -10,7 +10,8 @@ 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>
+storage pools, including the out of box 'default' and 'ISO' storage pool.
+If you want to use your own ISO, please scp it to 'ISO' storage pool path.</shortdesc>
 <csbody>
 <p>For each storage pool, the following information is displayed:<dl>
 <dlentry>
diff --git a/ui/pages/help/zh_CN/templates.dita b/ui/pages/help/zh_CN/templates.dita
index aee0726..f5f5a43 100644
--- a/ui/pages/help/zh_CN/templates.dita
+++ b/ui/pages/help/zh_CN/templates.dita
@@ -74,7 +74,8 @@ you edit a field, click <uicontrol>Save</uicontrol>. </p>
 </cshelp>
 <cshelp id="kimhaddtempl">
 <title>Add template</title>
-<shortdesc>Add a template from source media.</shortdesc>
+<shortdesc>Add a template from source media.
+You can scp your own ISO image to 'ISO' storage pool for following discovery.</shortdesc>
 <csbody>
 <p>Select the location of the source media from the following options:<dl>
 <dlentry>
-- 
1.8.3.2