From: Ananda Baitharu <ananda.baitharu@riftio.com>
Date: Fri, 10 May 2019 15:43:18 +0000 (+0000)
Subject: Bug 692 vmware vcd vimconnnector: Fix parsing vAppTemplate response
X-Git-Tag: v6.0.0~17
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=94be48ab8cd84681de9f0e8600bdf08c7c8c8997

Bug 692 vmware vcd vimconnnector: Fix parsing vAppTemplate response

Change-Id: I1d69e984dc1c8ef05d8cff29059c6b2893edeb0e
Signed-off-by: Ananda Baitharu <ananda.baitharu@riftio.com>
---

diff --git a/osm_ro/vimconn_vmware.py b/osm_ro/vimconn_vmware.py
index 94bae393..128e8e11 100644
--- a/osm_ro/vimconn_vmware.py
+++ b/osm_ro/vimconn_vmware.py
@@ -1665,13 +1665,12 @@ class vimconnector(vimconn.vimconnector):
                 else:
                     result = (response.content).replace("\n"," ")
 
-                src = re.search('<Vm goldMaster="false"\sstatus="\d+"\sname="(.*?)"\s'
-                                               'id="(\w+:\w+:vm:.*?)"\shref="(.*?)"\s'
-                              'type="application/vnd\.vmware\.vcloud\.vm\+xml',result)
-                if src:
-                    vm_name = src.group(1)
-                    vm_id = src.group(2)
-                    vm_href = src.group(3)
+                vapp_template_tree = XmlElementTree.fromstring(response.content)
+                children_element = [child for child in vapp_template_tree if 'Children' in child.tag][0]
+                vm_element = [child for child in children_element if 'Vm' in child.tag][0]
+                vm_name = vm_element.get('name')
+                vm_id = vm_element.get('id')
+                vm_href = vm_element.get('href')
 
                 cpus = re.search('<rasd:Description>Number of Virtual CPUs</.*?>(\d+)</rasd:VirtualQuantity>',result).group(1)
                 memory_mb = re.search('<rasd:Description>Memory Size</.*?>(\d+)</rasd:VirtualQuantity>',result).group(1)