mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 03:42:52 +09:00
F #4913: Add VCENTER_ to some vcenter specific attributes. Replace deprecated toolsVersionStatus
This commit is contained in:
1 parent
0e55adba5d
commit
db141b0769
7 files changed
+18
-18
No files matched your search
@@ -833,10 +833,10 @@ INHERIT_DATASTORE_ATTR = "GLUSTER_HOST"
|
||||
INHERIT_DATASTORE_ATTR = "GLUSTER_VOLUME"
|
||||
|
||||
INHERIT_DATASTORE_ATTR = "DISK_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
|
||||
INHERIT_IMAGE_ATTR = "DISK_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
|
||||
INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"
|
||||
INHERIT_VNET_ATTR = "FILTER_IP_SPOOFING"
|
||||
|
||||
+2
-2
@@ -886,11 +886,11 @@ INHERIT_DATASTORE_ATTR = "GLUSTER_HOST"
|
||||
INHERIT_DATASTORE_ATTR = "GLUSTER_VOLUME"
|
||||
|
||||
INHERIT_DATASTORE_ATTR = "DISK_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "VCENTER_DS_REF"
|
||||
|
||||
INHERIT_IMAGE_ATTR = "DISK_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
|
||||
INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"
|
||||
INHERIT_VNET_ATTR = "FILTER_IP_SPOOFING"
|
||||
|
||||
@@ -43,7 +43,7 @@ ds_ref = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_
|
||||
host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE_HOST_ID"]
|
||||
ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one"
|
||||
img_id = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/ID"]
|
||||
adapter_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/ADAPTER_TYPE"]
|
||||
adapter_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/VCENTER_ADAPTER_TYPE"]
|
||||
disk_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/DISK_TYPE"]
|
||||
size = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/SIZE"]
|
||||
fs_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE"]
|
||||
|
||||
@@ -833,10 +833,10 @@ INHERIT_DATASTORE_ATTR = "GLUSTER_HOST"
|
||||
INHERIT_DATASTORE_ATTR = "GLUSTER_VOLUME"
|
||||
|
||||
INHERIT_DATASTORE_ATTR = "DISK_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_DATASTORE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
|
||||
INHERIT_IMAGE_ATTR = "DISK_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "ADAPTER_TYPE"
|
||||
INHERIT_IMAGE_ATTR = "VCENTER_ADAPTER_TYPE"
|
||||
|
||||
INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"
|
||||
INHERIT_VNET_ATTR = "FILTER_IP_SPOOFING"
|
||||
|
||||
@@ -356,7 +356,7 @@ define(function(require) {
|
||||
ProgressBar.html(this.progress(), 1, fileName) );
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@ define(function(require) {
|
||||
result = '';
|
||||
for( var index = 0; index < iterations; index++ ) {
|
||||
result += chars.charAt( Math.floor( Math.random() * chars.length ) );
|
||||
};
|
||||
};
|
||||
return result;
|
||||
};
|
||||
};
|
||||
@@ -454,7 +454,7 @@ define(function(require) {
|
||||
if (adapter_type == "custom") {
|
||||
adapter_type = WizardFields.retrieveInput($('#custom_adapter_type', context));
|
||||
}
|
||||
img_json["ADAPTER_TYPE"] = adapter_type;
|
||||
img_json["VCENTER_ADAPTER_TYPE"] = adapter_type;
|
||||
}
|
||||
|
||||
switch ($('#src_path_select input:checked', context).val()){
|
||||
|
||||
@@ -61,7 +61,7 @@ ds_ref = one_ds['TEMPLATE/VCENTER_DS_REF']
|
||||
|
||||
# Get adapter and disk type
|
||||
one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, vmid)
|
||||
adapter_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/ADAPTER_TYPE"]
|
||||
adapter_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/VCENTER_ADAPTER_TYPE"]
|
||||
|
||||
# TODO disk_type support, that info is not coming thin, thick...
|
||||
# disk_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/DISK_TYPE"]
|
||||
|
||||
@@ -1574,7 +1574,7 @@ class VirtualMachine
|
||||
guest_state = self["guest.guestState"].to_s
|
||||
vmware_tools = self["guest.toolsRunningStatus"].to_s
|
||||
vmtools_ver = self["guest.toolsVersion"].to_s
|
||||
vmtools_verst = self["guest.toolsVersionStatus"].to_s
|
||||
vmtools_verst = self["guest.toolsVersionStatus2"].to_s
|
||||
|
||||
str_info = ""
|
||||
|
||||
@@ -1597,12 +1597,12 @@ class VirtualMachine
|
||||
str_info << "DISKRDIOPS=" << diskrdiops.to_s << " "
|
||||
str_info << "DISKWRIOPS=" << diskwriops.to_s << " "
|
||||
|
||||
str_info << "ESX_HOST=\"" << esx_host << "\" "
|
||||
str_info << "GUEST_STATE=" << guest_state << " "
|
||||
str_info << "VMWARETOOLS_RUNNING_STATUS=" << vmware_tools << " "
|
||||
str_info << "VMWARETOOLS_VERSION=" << vmtools_ver << " "
|
||||
str_info << "VMWARETOOLS_VERSION_STATUS=" << vmtools_verst << " "
|
||||
str_info << "VCENTER_RP_REF=\"" << self["resourcePool"]._ref << "\" "
|
||||
str_info << "VCENTER_ESX_HOST=\"" << esx_host << "\" "
|
||||
str_info << "VCENTER_GUEST_STATE=" << guest_state << " "
|
||||
str_info << "VCENTER_VMWARETOOLS_RUNNING_STATUS=" << vmware_tools << " "
|
||||
str_info << "VCENTER_VMWARETOOLS_VERSION=" << vmtools_ver << " "
|
||||
str_info << "VCENTER_VMWARETOOLS_VERSION_STATUS=" << vmtools_verst << " "
|
||||
str_info << "VCENTER_RP_REF=\"" << self["resourcePool"]._ref << "\" "
|
||||
end
|
||||
|
||||
def reset_monitor
|
||||
|
||||
Reference in new issue
Block a user