commit decf41b9dd92ab23752b34c21e4f57dc780be334
author Denis Egorenko <degorenko@mirantis.com> Wed Nov 07 13:04:18 2018 +0400
committer Denis Egorenko <degorenko@mirantis.com> Wed Nov 28 10:40:35 2018 +0000
tree 6a7b8b10774fcebcedda379109b4d96327695ed8
parent 05393f661976a0e7aecd8a347b88cf26f1025c4e

Fix maas deprecation warning for maasng.disk_partition_present state

Rename 'disk' state field to 'name' for disk_partition_present
state to avoid warning message.

Change-Id: I1e2b4bc5e04a1f47a83568d91f6dbc6eabf15a01
Related-bug: PROD-24193

_states/maasng.py

diff --git a/_states/maasng.py b/_states/maasng.py
index 7bfdcd8..96fe529 100644
--- a/_states/maasng.py
+++ b/_states/maasng.py
@@ -149,7 +149,7 @@
     return ret
 
 
-def disk_partition_present(hostname, disk, partition_schema={}):
+def disk_partition_present(hostname, name, partition_schema={}):
     '''
     Ensure that the disk has correct partititioning schema
 
@@ -169,7 +169,7 @@
     ret = {'name': hostname,
            'changes': {},
            'result': True,
-           'comment': 'Disk layout {0} presented'.format(disk)}
+           'comment': 'Disk layout {0} presented'.format(name)}
 
     machine = __salt__['maasng.get_machine'](hostname)
     if "error" in machine:
@@ -189,10 +189,10 @@
 
     if __opts__['test']:
         ret['result'] = None
-        ret['comment'] = 'Partition schema will be changed on {0}'.format(disk)
+        ret['comment'] = 'Partition schema will be changed on {0}'.format(name)
         return ret
 
-    partitions = __salt__['maasng.list_partitions'](hostname, disk)
+    partitions = __salt__['maasng.list_partitions'](hostname, name)
 
     # Calculate actual size in bytes from provided data
     for part_name, part in partition_schema.iteritems():
@@ -204,8 +204,8 @@
         for part_name, part in partition_schema.iteritems():
             LOG.info('validated {0}'.format(part["calc_size"]))
             LOG.info('validated {0}'.format(
-                int(partitions[disk+"-"+part_name.split("-")[-1]]["size"])))
-            if part["calc_size"] == int(partitions[disk+"-"+part_name.split("-")[-1]]["size"]):
+                int(partitions[name+"-"+part_name.split("-")[-1]]["size"])))
+            if part["calc_size"] == int(partitions[name+"-"+part_name.split("-")[-1]]["size"]):
                 LOG.info('validated')
                 # TODO validate size (size from maas is not same as calculate?)
                 # TODO validate mount
@@ -221,7 +221,7 @@
         LOG.info(partition)
         # TODO IF LVM create ERROR
         ret["changes"] = __salt__['maasng.delete_partition_by_id'](
-            hostname, disk, partition["id"])
+            hostname, name, partition["id"])
 
     LOG.info('recreating')
     for part_name, part in partition_schema.iteritems():
@@ -232,7 +232,7 @@
         if "type" not in part:
             part["type"] = None
         ret["changes"] = __salt__['maasng.create_partition'](
-            hostname, disk, part["size"], part["type"], part["mount"])
+            hostname, name, part["size"], part["type"], part["mount"])
 
     if "error" in ret["changes"]:
         ret["result"] = False

maas/machines/storage.sls

diff --git a/maas/machines/storage.sls b/maas/machines/storage.sls
index 6e138f9..e658f06 100644
--- a/maas/machines/storage.sls
+++ b/maas/machines/storage.sls
@@ -56,7 +56,7 @@
 maas_machine_{{ machine_name }}_{{ disk_name }}:
   maasng.disk_partition_present:
     - hostname: {{ machine_name }}
-    - disk: {{ disk_name }}
+    - name: {{ disk_name }}
     - partition_schema: {{ disk.get("partition_schema", {}) }}
 
 {%- endif %}