diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index 48b9f9f5be..13e1e3bb3f 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -2826,12 +2826,6 @@ static int vmware_service_get_hv_data(const zbx_vmware_service_t *service, CURL
"datastore" \
"%s" \
"" \
- "" \
- "Datastore" \
- "host[\"%s\"].mountInfo.mounted" \
- "host[\"%s\"].mountInfo.accessible" \
- "host[\"%s\"].mountInfo.accessMode" \
- "" \
"" \
"%s" \
"false" \
@@ -2863,7 +2857,7 @@ static int vmware_service_get_hv_data(const zbx_vmware_service_t *service, CURL
hvid_esc = xml_escape_dyn(hvid);
zbx_snprintf(tmp, sizeof(tmp), ZBX_POST_HV_DETAILS, vmware_service_objects[service->type].property_collector,
- props, hvid_esc, hvid_esc, hvid_esc, hvid_esc);
+ props, hvid_esc);
zbx_free(hvid_esc);
@@ -3061,90 +3055,6 @@ static int vmware_dc_id_compare(const void *d1, const void *d2)
return strcmp(dc1->id, dc2->id);
}
-/******************************************************************************
- * Function: vmware_hv_get_ds_access *
- * *
- * Purpose: populate array of values from a xml data *
- * *
- * Parameters: xdoc - [IN] XML document *
- * ds_id - [IN] datastore id *
- * *
- * Return: Upon successful completion the function return SUCCEED. *
- * Otherwise, FAIL is returned. *
- * *
- ******************************************************************************/
-static zbx_uint64_t vmware_hv_get_ds_access(xmlDoc *xdoc, const char *ds_id)
-{
-
- zbx_uint64_t mi_access = ZBX_VMWARE_DS_NONE;
- char tmp[MAX_STRING_LEN];
- xmlXPathContext *xpathCtx;
- xmlXPathObject *xpathObj;
- xmlNode *xml_node;
- char *value;
-
-
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() for DS:%s", __func__, ds_id);
-
- zbx_snprintf(tmp, sizeof(tmp), ZBX_XPATH_HV_DATASTORE_MOUNTINFO(), ds_id);
- xpathCtx = xmlXPathNewContext(xdoc);
-
- if (NULL == (xpathObj = xmlXPathEvalExpression((xmlChar *)tmp, xpathCtx)))
- {
- zabbix_log(LOG_LEVEL_DEBUG, "Cannot make montinfo parsing query for DS:%s", ds_id);
- goto clean;
- }
-
- if (0 != xmlXPathNodeSetIsEmpty(xpathObj->nodesetval))
- {
- zabbix_log(LOG_LEVEL_DEBUG, "Cannot find items in mountinfo for DS:%s", ds_id);
- goto clean;
- }
-
- xml_node = xpathObj->nodesetval->nodeTab[0];
-
- if (NULL != (value = zbx_xml_read_node_value(xdoc, xml_node, ZBX_XPATH_PROP_SUFFIX("mounted"))))
- {
- if (0 == strcmp(value, "true"))
- mi_access |= ZBX_VMWARE_DS_MOUNTED;
-
- zbx_free(value);
- }
- else
- zabbix_log(LOG_LEVEL_DEBUG, "Cannot find item 'mounted' in mountinfo for DS:%s", ds_id);
-
- if (NULL != (value = zbx_xml_read_node_value(xdoc, xml_node, ZBX_XPATH_PROP_SUFFIX("accessible"))))
- {
- if (0 == strcmp(value, "true"))
- mi_access |= ZBX_VMWARE_DS_ACCESSIBLE;
-
- zbx_free(value);
- }
- else
- zabbix_log(LOG_LEVEL_DEBUG, "Cannot find item 'accessible' in accessible for DS:%s", ds_id);
-
- if (NULL != (value = zbx_xml_read_node_value(xdoc, xml_node, ZBX_XPATH_PROP_SUFFIX("accessMode"))))
- {
- if (0 == strcmp(value, "readWrite"))
- mi_access |= ZBX_VMWARE_DS_READWRITE;
- else
- mi_access |= ZBX_VMWARE_DS_READ;
-
- zbx_free(value);
- }
- else
- zabbix_log(LOG_LEVEL_DEBUG, "Cannot find item 'accessMode' in mountinfo for DS:%s", ds_id);
-
-clean:
- if (NULL != xpathObj)
- xmlXPathFreeObject(xpathObj);
-
- xmlXPathFreeContext(xpathCtx);
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s() mountinfo:" ZBX_FS_UI64, __func__, mi_access);
-
- return mi_access;
-}
-
/******************************************************************************
* *
* Function: vmware_service_init_hv *
@@ -3220,7 +3130,7 @@ static int vmware_service_init_hv(zbx_vmware_service_t *service, CURL *easyhandl
ds = dss->values[j];
hv_ds_access.name = zbx_strdup(NULL, hv->uuid);
- hv_ds_access.value = vmware_hv_get_ds_access(details, ds->id);
+ hv_ds_access.value = ZBX_VMWARE_DS_MOUNTED | ZBX_VMWARE_DS_ACCESSIBLE | ZBX_VMWARE_DS_READWRITE;
zbx_vector_str_uint64_pair_append_ptr(&ds->hv_uuids_access, &hv_ds_access);
zbx_vector_str_append(&hv->ds_names, zbx_strdup(NULL, ds->name));
}