From: John Garbutt Date: Fri, 9 Nov 2012 14:38:56 +0000 (+0000) Subject: Removes the xensm driver X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aa874981998d605209b7cd0614800552db10a957;p=openstack-build%2Fcinder-build.git Removes the xensm driver This code does not work, and is slowly being replaced by alternative XenServer specific drivers. Fixes LP bug #1077011 Change-Id: I1af92ecdbb49a57a0ff4c05a70d77bcb69958cb2 --- diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po index 1da8bfc70..556e8d50a 100644 --- a/cinder/locale/bs/LC_MESSAGES/cinder.po +++ b/cinder/locale/bs/LC_MESSAGES/cinder.po @@ -7311,81 +7311,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot index 4d73c415b..40fe5987a 100644 --- a/cinder/locale/cinder.pot +++ b/cinder/locale/cinder.pot @@ -7309,81 +7309,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po index 793490ce1..8453166c3 100644 --- a/cinder/locale/cs/LC_MESSAGES/cinder.po +++ b/cinder/locale/cs/LC_MESSAGES/cinder.po @@ -7391,81 +7391,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po index 20bfc7509..c744921d1 100644 --- a/cinder/locale/da/LC_MESSAGES/cinder.po +++ b/cinder/locale/da/LC_MESSAGES/cinder.po @@ -7310,81 +7310,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po index e3fbc8b8d..f20301cd4 100644 --- a/cinder/locale/de/LC_MESSAGES/cinder.po +++ b/cinder/locale/de/LC_MESSAGES/cinder.po @@ -7315,81 +7315,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po index 2e6550ade..6df79bc50 100644 --- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po +++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po @@ -7352,81 +7352,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po index 8695b9e09..a80d170bf 100644 --- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po +++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po @@ -7331,81 +7331,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po index de1787bc8..dd3a8024d 100644 --- a/cinder/locale/es/LC_MESSAGES/cinder.po +++ b/cinder/locale/es/LC_MESSAGES/cinder.po @@ -7360,81 +7360,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po index 106f77d43..51193392c 100644 --- a/cinder/locale/fr/LC_MESSAGES/cinder.po +++ b/cinder/locale/fr/LC_MESSAGES/cinder.po @@ -7392,81 +7392,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po index 02af73097..e88469d5c 100644 --- a/cinder/locale/it/LC_MESSAGES/cinder.po +++ b/cinder/locale/it/LC_MESSAGES/cinder.po @@ -7326,81 +7326,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po index c905b0762..e2eef6afa 100644 --- a/cinder/locale/ja/LC_MESSAGES/cinder.po +++ b/cinder/locale/ja/LC_MESSAGES/cinder.po @@ -7339,81 +7339,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po index 01a7f7b38..27da16fce 100644 --- a/cinder/locale/ko/LC_MESSAGES/cinder.po +++ b/cinder/locale/ko/LC_MESSAGES/cinder.po @@ -7317,81 +7317,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po index 7eae377e5..35fd8c6bb 100644 --- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po +++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po @@ -7336,81 +7336,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po index 0917f0d3f..f99928a9d 100644 --- a/cinder/locale/ru/LC_MESSAGES/cinder.po +++ b/cinder/locale/ru/LC_MESSAGES/cinder.po @@ -7503,81 +7503,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "Ошибка создания sr %s...продолжение" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "Ошибка создания" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "Ошибка обновления базы данных" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "Ошибка внедрения sr %s...продолжение" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "XenSMDriver необходимо xenapi соединение" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "Ошибка начала сеанса" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "Том будет создан во внутреннем интерфейсе - %d" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "Ошибка обновления тома в базе данных" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "Невозможно создать том" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "Ошибка удаления vdi" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "Ошибка удаления тома в базе данных" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "Ошибка поиска тома в базе данных" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "Ошибка поиска внутреннего интерфейса в базе данных" - #: cinder/volume/nexenta/__init__.py:27 #, fuzzy, python-format msgid "Nexenta SA returned the error" diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po index 386fdafda..3844366c6 100644 --- a/cinder/locale/tl/LC_MESSAGES/cinder.po +++ b/cinder/locale/tl/LC_MESSAGES/cinder.po @@ -7310,81 +7310,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po index 0afc067b8..7eccc4e62 100644 --- a/cinder/locale/tr/LC_MESSAGES/cinder.po +++ b/cinder/locale/tr/LC_MESSAGES/cinder.po @@ -7309,81 +7309,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po index 845c6c028..f808dd0ce 100644 --- a/cinder/locale/uk/LC_MESSAGES/cinder.po +++ b/cinder/locale/uk/LC_MESSAGES/cinder.po @@ -7312,81 +7312,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po index bbea22887..a92cd5c32 100644 --- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po +++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po @@ -7413,81 +7413,6 @@ msgstr "name不能是None" msgid "id cannot be None" msgstr "id不能是None" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "存储库 name = %s" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "参数：%s" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "创建存储库 %s失败... 继续" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "创建失败" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "新存储库的存储库 UUID：%s" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "更新数据库失败" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "引入存储库 %s 失败... 继续" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "到达后台 %d 失败" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "XenSMDriver要求xenapi连接" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "初始化会话失败" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "卷会在后台创建 - %d" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "在数据库更新卷失败" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "无法创建卷" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "删除VDI失败" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "在数据库删除卷失败" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "没有在数据库找到卷" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "没有在数据库中找到后台(backend)" - #: cinder/volume/nexenta/__init__.py:27 #, fuzzy, python-format msgid "Nexenta SA returned the error" diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po index 6b12bc8f2..b2f63f80c 100644 --- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po +++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po @@ -7317,81 +7317,6 @@ msgstr "" msgid "id cannot be None" msgstr "" -#: cinder/volume/xensm.py:55 -#, python-format -msgid "SR name = %s" -msgstr "" - -#: cinder/volume/xensm.py:56 -#, python-format -msgid "Params: %s" -msgstr "" - -#: cinder/volume/xensm.py:60 -#, python-format -msgid "Failed to create sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:62 -msgid "Create failed" -msgstr "" - -#: cinder/volume/xensm.py:64 -#, python-format -msgid "SR UUID of new SR is: %s" -msgstr "" - -#: cinder/volume/xensm.py:71 -msgid "Failed to update db" -msgstr "" - -#: cinder/volume/xensm.py:80 -#, python-format -msgid "Failed to introduce sr %s...continuing" -msgstr "" - -#: cinder/volume/xensm.py:91 -#, python-format -msgid "Failed to reach backend %d" -msgstr "" - -#: cinder/volume/xensm.py:100 -msgid "XenSMDriver requires xenapi connection" -msgstr "" - -#: cinder/volume/xensm.py:110 -msgid "Failed to initiate session" -msgstr "" - -#: cinder/volume/xensm.py:142 -#, python-format -msgid "Volume will be created in backend - %d" -msgstr "" - -#: cinder/volume/xensm.py:154 -msgid "Failed to update volume in db" -msgstr "" - -#: cinder/volume/xensm.py:157 -msgid "Unable to create volume" -msgstr "" - -#: cinder/volume/xensm.py:171 -msgid "Failed to delete vdi" -msgstr "" - -#: cinder/volume/xensm.py:177 -msgid "Failed to delete volume in db" -msgstr "" - -#: cinder/volume/xensm.py:210 -msgid "Failed to find volume in db" -msgstr "" - -#: cinder/volume/xensm.py:221 -msgid "Failed to find backend in db" -msgstr "" - #: cinder/volume/nexenta/__init__.py:27 msgid "Nexenta SA returned the error" msgstr "" diff --git a/cinder/volume/xensm.py b/cinder/volume/xensm.py deleted file mode 100644 index 4068ca312..000000000 --- a/cinder/volume/xensm.py +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright (c) 2011 Citrix Systems, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from cinder import exception -from cinder import flags -from cinder.openstack.common import log as logging -from cinder import utils -from cinder.virt.xenapi import connection as xenapi_conn -from cinder.virt.xenapi import volumeops -import cinder.volume.driver - -LOG = logging.getLogger(__name__) -FLAGS = flags.FLAGS - - -class XenSMDriver(cinder.volume.driver.VolumeDriver): - - def _convert_config_params(self, conf_str): - params = dict([item.split("=") for item in conf_str.split()]) - return params - - def _get_introduce_sr_keys(self, params): - if 'name_label' in params: - del params['name_label'] - keys = params.keys() - keys.append('sr_type') - return keys - - def _create_storage_repo(self, context, backend_ref): - """Either creates or introduces SR on host - depending on whether it exists in xapi db.""" - params = self._convert_config_params(backend_ref['config_params']) - if 'name_label' in params: - label = params['name_label'] - del params['name_label'] - else: - label = 'SR-' + str(backend_ref['id']) - - params['sr_type'] = backend_ref['sr_type'] - - if backend_ref['sr_uuid'] is None: - # run the sr create command - try: - LOG.debug(_('SR name = %s') % label) - LOG.debug(_('Params: %s') % str(params)) - sr_uuid = self._volumeops.create_sr(label, params) - # update sr_uuid and created in db - except Exception as ex: - LOG.debug(_("Failed to create sr %s...continuing") % - str(backend_ref['id'])) - msg = _('Create failed') - raise exception.VolumeBackendAPIException(data=msg) - - LOG.debug(_('SR UUID of new SR is: %s') % sr_uuid) - try: - self.db.sm_backend_conf_update(context, - backend_ref['id'], - dict(sr_uuid=sr_uuid)) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to update db") - raise exception.VolumeBackendAPIException(data=msg) - - else: - # sr introduce, if not already done - try: - self._volumeops.introduce_sr(backend_ref['sr_uuid'], label, - params) - except Exception as ex: - LOG.exception(ex) - LOG.debug(_("Failed to introduce sr %s...continuing") - % str(backend_ref['id'])) - - def _create_storage_repos(self, context): - """Create/Introduce storage repositories at start.""" - backends = self.db.sm_backend_conf_get_all(context) - for backend in backends: - try: - self._create_storage_repo(context, backend) - except Exception as ex: - LOG.exception(ex) - msg = _('Failed to reach backend %d') % backend['id'] - raise exception.VolumeBackendAPIException(data=msg) - - def __init__(self, *args, **kwargs): - """Connect to the hypervisor.""" - - # This driver leverages Xen storage manager, and hence requires - # hypervisor to be Xen - if FLAGS.connection_type != 'xenapi': - msg = _('XenSMDriver requires xenapi connection') - raise exception.VolumeBackendAPIException(data=msg) - - url = FLAGS.xenapi_connection_url - username = FLAGS.xenapi_connection_username - password = FLAGS.xenapi_connection_password - try: - session = xenapi_conn.XenAPISession(url, username, password) - self._volumeops = volumeops.VolumeOps(session) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to initiate session") - raise exception.VolumeBackendAPIException(data=msg) - - super(XenSMDriver, self).__init__(execute=utils.execute, - sync_exec=utils.execute, - *args, **kwargs) - - def do_setup(self, ctxt): - """Setup includes creating or introducing storage repos - existing in the database and destroying deleted ones.""" - - # TODO(renukaapte) purge storage repos - self.ctxt = ctxt - self._create_storage_repos(ctxt) - - def create_volume(self, volume): - """Creates a logical volume. Can optionally return a Dictionary of - changes to the volume object to be persisted.""" - - # For now the scheduling logic will be to try to fit the volume in - # the first available backend. - # TODO(renukaapte) better scheduling once APIs are in place - sm_vol_rec = None - backends = self.db.sm_backend_conf_get_all(self.ctxt) - for backend in backends: - # Ensure that storage repo exists, if not create. - # This needs to be done because if cinder compute and - # volume are both running on this host, then, as a - # part of detach_volume, compute could potentially forget SR - self._create_storage_repo(self.ctxt, backend) - sm_vol_rec = self._volumeops.create_volume_for_sm(volume, - backend['sr_uuid']) - if sm_vol_rec: - LOG.debug(_('Volume will be created in backend - %d') - % backend['id']) - break - - if sm_vol_rec: - # Update db - sm_vol_rec['id'] = volume['id'] - sm_vol_rec['backend_id'] = backend['id'] - try: - self.db.sm_volume_create(self.ctxt, sm_vol_rec) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to update volume in db") - raise exception.VolumeBackendAPIException(data=msg) - - else: - msg = _('Unable to create volume') - raise exception.VolumeBackendAPIException(data=msg) - - def delete_volume(self, volume): - - vol_rec = self.db.sm_volume_get(self.ctxt, volume['id']) - - try: - # If compute runs on this node, detach could have disconnected SR - backend_ref = self.db.sm_backend_conf_get(self.ctxt, - vol_rec['backend_id']) - self._create_storage_repo(self.ctxt, backend_ref) - self._volumeops.delete_volume_for_sm(vol_rec['vdi_uuid']) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to delete vdi") - raise exception.VolumeBackendAPIException(data=msg) - - try: - self.db.sm_volume_delete(self.ctxt, volume['id']) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to delete volume in db") - raise exception.VolumeBackendAPIException(data=msg) - - def local_path(self, volume): - return str(volume['id']) - - def undiscover_volume(self, volume): - """Undiscover volume on a remote host.""" - pass - - def discover_volume(self, context, volume): - return str(volume['id']) - - def check_for_setup_error(self): - pass - - def create_export(self, context, volume): - """Exports the volume.""" - pass - - def remove_export(self, context, volume): - """Removes an export for a logical volume.""" - pass - - def ensure_export(self, context, volume): - """Safely, synchronously recreates an export for a logical volume.""" - pass - - def initialize_connection(self, volume, connector): - try: - xensm_properties = dict(self.db.sm_volume_get(self.ctxt, - volume['id'])) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to find volume in db") - raise exception.VolumeBackendAPIException(data=msg) - - # Keep the volume id key consistent with what ISCSI driver calls it - xensm_properties['volume_id'] = xensm_properties['id'] - del xensm_properties['id'] - - try: - backend_conf = self.db.sm_backend_conf_get(self.ctxt, - xensm_properties['backend_id']) - except Exception as ex: - LOG.exception(ex) - msg = _("Failed to find backend in db") - raise exception.VolumeBackendAPIException(data=msg) - - params = self._convert_config_params(backend_conf['config_params']) - - xensm_properties['flavor_id'] = backend_conf['flavor_id'] - xensm_properties['sr_uuid'] = backend_conf['sr_uuid'] - xensm_properties['sr_type'] = backend_conf['sr_type'] - xensm_properties.update(params) - _introduce_sr_keys = self._get_introduce_sr_keys(params) - xensm_properties['introduce_sr_keys'] = _introduce_sr_keys - return { - 'driver_volume_type': 'xensm', - 'data': xensm_properties - } - - def terminate_connection(self, volume, connector, **kwargs): - pass diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst index 675c05fbc..4e7950107 100644 --- a/doc/source/devref/index.rst +++ b/doc/source/devref/index.rst @@ -65,7 +65,6 @@ Module Reference services database volume - xensmvolume auth api scheduler diff --git a/doc/source/devref/xensmvolume.rst b/doc/source/devref/xensmvolume.rst deleted file mode 100644 index 1221c5ec0..000000000 --- a/doc/source/devref/xensmvolume.rst +++ /dev/null @@ -1,88 +0,0 @@ -Xen Storage Manager Volume Driver -================================= - -The Xen Storage Manager (xensm) driver for Cinder-Volume is based on XenAPI Storage Manager. This will not only provide basic storage functionality (like volume creation, and destruction) on a number of different storage back-ends, such as Netapp, NFS, etc. but it will also enable the capability of using more sophisticated storage back-ends for operations like cloning/snapshotting etc. To have an idea of the benefits of using XenAPI SM to provide back-end storage services, the list below shows some of the storage plugins already supported in XenServer/XCP: - -- NFS VHD: SR plugin which stores disks as VHD files on a remote NFS filesystem -- Local VHD on LVM: SR plugin which represents disks as VHD disks on Logical Volumes within a locally-attached Volume Group -- HBA LUN-per-VDI driver: SR plugin which represents LUNs as VDIs sourced by hardware HBA adapters, e.g. hardware-based iSCSI or FC support -- NetApp: SR driver for mapping of LUNs to VDIs on a NETAPP server, providing use of fast snapshot and clone features on the filer -- LVHD over FC: SR plugin which represents disks as VHDs on Logical Volumes within a Volume Group created on an HBA LUN, e.g. hardware-based iSCSI or FC support -- iSCSI: Base ISCSI SR driver, provides a LUN-per-VDI. Does not support creation of VDIs but accesses existing LUNs on a target. -- LVHD over iSCSI: SR plugin which represents disks as Logical Volumes within a Volume Group created on an iSCSI LUN -- EqualLogic: SR driver for mapping of LUNs to VDIs on a EQUALLOGIC array group, providing use of fast snapshot and clone features on the array - -Glossary -========= - - XenServer: Commercial, supported product from Citrix - - Xen Cloud Platform (XCP): Open-source equivalent of XenServer (and the development project for the toolstack). Everything said about XenServer below applies equally to XCP - - XenAPI: The management API exposed by XenServer and XCP - - xapi: The primary daemon on XenServer and Xen Cloud Platform; the one that exposes the XenAPI - - -Design -======= - -Definitions ------------ - -Backend: A term for a particular storage backend. This could be iSCSI, NFS, Netapp etc. -Backend-config: All the parameters required to connect to a specific backend. For e.g. For NFS, this would be the server, path, etc. -Flavor: This term is equivalent to volume "types". A user friendly term to specify some notion of quality of service. For example, "gold" might mean that the volumes will use a backend where backups are possible. - -A flavor can be associated with multiple backends. The volume scheduler, with the help of the driver, will decide which backend will be used to create a volume of a particular flavor. Currently, the driver uses a simple "first-fit" policy, where the first backend that can successfully create this volume is the one that is used. - -Operation ----------- - -Using the cinder-manage command detailed in the implementation, an admin can add flavors and backends. - -One or more cinder-volume service instances will be deployed per availability zone. When an instance is started, it will create storage repositories (SRs) to connect to the backends available within that zone. All cinder-volume instances within a zone can see all the available backends. These instances are completely symmetric and hence should be able to service any create_volume request within the zone. - - -Commands -========= - -A category called "sm" has been added to cinder-manage in the class StorageManagerCommands. - -The following actions will be added: - -- flavor_list -- flavor_create -- flavor_delete -- backend_list -- backend_add -- backend_remove - -Usage: ------- - -cinder-manage sm flavor_create