From a55ddc87746d57f6e3d1f766cca6cb084dc3b0d2 Mon Sep 17 00:00:00 2001 From: Olga Krishtal Date: Tue, 17 Jan 2017 17:10:59 +0300 Subject: [PATCH] storage: vstorage pool documentation and simple test Signed-off-by: Olga Krishtal --- docs/formatstorage.html.in | 7 +++-- docs/news.xml | 12 +++++++- docs/schemas/storagepool.rng | 21 ++++++++++++++ docs/storage.html.in | 28 +++++++++++++++++++ tests/storagepoolxml2xmlin/pool-vstorage.xml | 10 +++++++ tests/storagepoolxml2xmlout/pool-vstorage.xml | 18 ++++++++++++ tests/storagepoolxml2xmltest.c | 3 ++ 7 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-vstorage.xml create mode 100644 tests/storagepoolxml2xmlout/pool-vstorage.xml diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 31fa6d6473..c787a059df 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -24,8 +24,9 @@ (since 0.9.13), sheepdog (since 0.10.0), gluster (since - 1.2.0) or zfs (since - 1.2.8). This corresponds to the + 1.2.0), zfs (since + 1.2.8) or vstorage (since + 3.1.0). This corresponds to the storage backend drivers listed further along in this document.

General metadata

@@ -124,7 +125,7 @@
device
Provides the source for pools backed by physical devices (pool types fs, logical, disk, - iscsi, zfs). + iscsi, zfs, vstorage). May be repeated multiple times depending on backend driver. Contains a required attribute path which is either the fully qualified path to the block device node or for iscsi diff --git a/docs/news.xml b/docs/news.xml index fdbb80f441..f408293a19 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -12,7 +12,17 @@
- + + + storage: Add Virtuozzo storage backend storage pool + + + Add new storage backend to support pool and volume management + within the Virtuozzo Storage environment. Virtuozzo Storage is + a highly available distributed software defined storage with + built-in replication and disaster recovery. + +
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 49d212f7c7..6219ce5afe 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -24,6 +24,7 @@ + @@ -173,6 +174,18 @@ + + + vstorage + + + + + + + + + @@ -373,6 +386,14 @@ + + + + + + + + diff --git a/docs/storage.html.in b/docs/storage.html.in index 2e5b65e13f..5ca13010a6 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -120,6 +120,9 @@
  • ZFS backend
    • +
  • + Virtuozzo storage backend +

    • Directory pool

    @@ -791,6 +794,31 @@

    The ZFS volume pool does not use the volume format type element.

    +

    Vstorage pools

    +

    + This provides a pool based on Virtuozzo storage. Virtuozzo Storage is + a highly available distributed software-defined storage with built-in + replication and disaster recovery. More detailed information about + Virtuozzo storage and its managment can be found here: + Virtuozzo Storage). +

    +

    Please refer to the Virtuozzo Storage documentation for details + on storage management and usage.

    +

    Example pool input

    +

    In order to create storage pool with Virtuozzo Storage backend you + have to provide cluster name and be authorized within the cluster.

    + 
    +<pool type="vstorage">
+  <name>myvstoragepool</name>
+  <source>
+    <name>clustername</name>
+  </source>
+  <target>
+    <path>/mnt/clustername</path>
+  </target>
+</pool>
    +

    Valid volume format types

    +

    The valid volume types are the same as for the directory pool.

    diff --git a/tests/storagepoolxml2xmlin/pool-vstorage.xml b/tests/storagepoolxml2xmlin/pool-vstorage.xml new file mode 100644 index 0000000000..31e36a219f --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-vstorage.xml @@ -0,0 +1,10 @@ + + vstorage + cfd270f9-acc7-4394-8685-4977eb318171 + + vzstorage-cluster + + + /mnt/vstorage_cluster + + diff --git a/tests/storagepoolxml2xmlout/pool-vstorage.xml b/tests/storagepoolxml2xmlout/pool-vstorage.xml new file mode 100644 index 0000000000..8b2aecb641 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-vstorage.xml @@ -0,0 +1,18 @@ + + vstorage + cfd270f9-acc7-4394-8685-4977eb318171 + 0 + 0 + 0 + + vstorage-cluster + + + /mnt/vstorage-cluster + + 0755 + -1 + -1 + + + diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 2e1e811aec..98a8449269 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -104,6 +104,9 @@ mymain(void) #ifdef WITH_STORAGE_RBD DO_TEST("pool-rbd"); #endif +#ifdef WITH_STORAGE_VSTORAGE + DO_TEST("pool-vstorage"); +#endif return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- GitLab