[vmware]device_id duplicated for multiple data disks after VM import

[borisstoyanov]

ISSUE TYPE

• Bug Report

COMPONENT NAME

API

CLOUDSTACK VERSION

4.16

CONFIGURATION

OS / ENVIRONMENT

SUMMARY

STEPS TO REPRODUCE

1. Import a VM with multiple disks
2. Observe device_id has been duplicated

EXPECTED RESULTS

There shouldn't be duplication 

ACTUAL RESULTS

MariaDB [cloud]> select id,instance_id,device_id from volumes where instance_id=9;
+----+-------------+-----------+
| id | instance_id | device_id |
+----+-------------+-----------+
| 11 |           9 |         0 |
| 12 |           9 |         1 |
| 13 |           9 |         1 |
| 14 |           9 |         2 |
+----+-------------+-----------+
4 rows in set (0.00 sec)

[yadvr]

Merged in #6123