X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fvmware.py;h=8f39464366804c22cacd25f6208e2d8b05bb1437;hb=754a953c2ffe60c944e61a890906a13c7f5cc920;hp=6547ab8c0c3fb3ad0416a5a24df6e26b4b43a264;hpb=0ccdba94d5ca1de0ff26c6aaf5a16aacc3c2fd0d;p=osm%2FMON.git

diff --git a/osm_mon/collector/infra_collectors/vmware.py b/osm_mon/collector/infra_collectors/vmware.py
index 6547ab8..8f39464 100644
--- a/osm_mon/collector/infra_collectors/vmware.py
+++ b/osm_mon/collector/infra_collectors/vmware.py
@@ -25,7 +25,7 @@
 
 import logging
 from typing import List
-from xml.etree import ElementTree as XmlElementTree
+from lxml import etree as XmlElementTree
 
 import requests
 from pyvcloud.vcd.client import BasicLoginCredentials
@@ -52,6 +52,7 @@ class VMwareInfraCollector(BaseVimInfraCollector):
         self.vim_uuid = vim_account["vim_uuid"]
         self.org_name = vim_account["orgname"]
         self.vim_project_id = vim_account["project_id"]
+        self.verify_ssl = vim_account.get("insecure", False)
 
     def connect_vim_as_admin(self):
         """Method connect as pvdc admin user to vCloud director.
@@ -70,7 +71,7 @@ class VMwareInfraCollector(BaseVimInfraCollector):
             admin_user = self.admin_username
             admin_passwd = self.admin_password
             org = "System"
-            client = Client(host, verify_ssl_certs=False)
+            client = Client(host, verify_ssl_certs=self.verify_ssl)
             client.set_highest_supported_version()
             client.set_credentials(BasicLoginCredentials(admin_user, org, admin_passwd))
             return client
@@ -116,6 +117,7 @@ class VMwareInfraCollector(BaseVimInfraCollector):
             client = self.connect_vim_as_admin()
             if client._session:
                 org_list = client.get_org_list()
+                org_uuid = ""
                 for org in org_list.Org:
                     if org.get("name") == self.org_name:
                         org_uuid = org.get("href").split("/")[-1]
@@ -129,7 +131,9 @@ class VMwareInfraCollector(BaseVimInfraCollector):
                     ],
                 }
 
-                response = requests.get(url=url, headers=headers, verify=False)
+                response = requests.get(
+                    url=url, headers=headers, verify=self.verify_ssl
+                )
 
                 if (
                     response.status_code != requests.codes.ok
@@ -168,7 +172,9 @@ class VMwareInfraCollector(BaseVimInfraCollector):
                     ],
                 }
 
-                response = requests.get(url=url, headers=headers, verify=False)
+                response = requests.get(
+                    url=url, headers=headers, verify=self.verify_ssl
+                )
 
                 if (
                     response.status_code != requests.codes.ok
@@ -195,7 +201,9 @@ class VMwareInfraCollector(BaseVimInfraCollector):
         metrics.append(vim_status_metric)
         vnfrs = self.common_db.get_vnfrs(vim_account_id=vim_account_id)
         if self.conf.get("collector", "vm_infra_metrics"):
-            vm_infra_metrics_enabled = str(self.conf.get("collector", "vm_infra_metrics")).lower() in ("yes", "true", "1")
+            vm_infra_metrics_enabled = str(
+                self.conf.get("collector", "vm_infra_metrics")
+            ).lower() in ("yes", "true", "1")
         else:
             vm_infra_metrics_enabled = True
         if vm_infra_metrics_enabled: