commit 1438426f827452323cc7da3a3f90e1bc4014d03f
author Oleksiy Petrenko <opetrenko@mirantis.com> Thu Apr 12 13:59:04 2018 +0300
committer Oleksiy Petrenko <opetrenko@mirantis.com> Fri Apr 13 13:35:34 2018 +0300
tree 3f7c94150e53950eca4848a495acf7759db5be08
parent 0343ebf8962b672dd3b760aaa40595bf0b9793ae

Fix update share_type

Fixed errors when api returns bool as a string but sls has bool
as bool.

Change-Id: I64caa0871f21c9cab802e27e214a7a0e1990c7a8

_states/manilang.py

diff --git a/_states/manilang.py b/_states/manilang.py
index 38d90de..964518a 100644
--- a/_states/manilang.py
+++ b/_states/manilang.py
@@ -12,7 +12,7 @@
 #    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 oslo_utils.strutils import bool_from_string
 import logging
 log = logging.getLogger(__name__)
 
@@ -33,7 +33,8 @@
 }
 
 
-def share_type_present(name, extra_specs, cloud_name, **kwargs):
+def share_type_present(name, extra_specs, cloud_name, microversion=None,
+                       **kwargs):
     """
     Ensure that share_type is present and has desired parameters
 
@@ -48,6 +49,14 @@
         dictionary to be POSTed, if specified.
 
     """
+    for key in extra_specs:
+        try:
+            extra_specs[key] = str(
+                bool_from_string(extra_specs[key], strict=True)
+            )
+        except ValueError:
+            extra_specs[key] = str(extra_specs[key])
+
     origin_share_types = __salt__[
         manilang_func['list_types']
     ](cloud_name=cloud_name)['share_types']
@@ -59,7 +68,8 @@
         try:
             res = __salt__[
                 manilang_func['create_type']
-            ](name, extra_specs, cloud_name=cloud_name, **kwargs)
+            ](name, extra_specs, cloud_name=cloud_name,
+              microversion=microversion, **kwargs)
         except Exception as e:
             log.error('Manila share type create failed with {}'.format(e))
             return _create_failed(name, 'resource')
@@ -81,14 +91,15 @@
             try:
                 __salt__[
                     manilang_func['unset_type_specs']
-                ](exact_share_type['id'], key, cloud_name=cloud_name)
+                ](exact_share_type['id'], key, cloud_name=cloud_name,
+                  microversion=microversion)
             except Exception as e:
                 log.error(
                     'Manila share type delete '
                     'extra specs failed with {}'.format(e)
                 )
                 return _update_failed(name, 'share_type_extra_specs')
-            resp.update({'deleted_extra_specs': to_delete})
+            resp.update({'deleted_extra_specs': tuple(to_delete)})
 
         diff = {}
 
@@ -102,8 +113,8 @@
                 resp.update(
                     __salt__[
                         manilang_func['set_type_specs']
-                    ](exact_share_type['id'], {'extra_specs': diff},
-                      cloud_name=cloud_name)
+                    ](exact_share_type['id'],  diff,
+                      cloud_name=cloud_name, microversion=microversion)
                 )
             except Exception as e:
                 log.error(