Ravi Nori has uploaded a new change for review. Change subject: tools: engine-config cleanup all 2.2 keys from db ......................................................................
tools: engine-config cleanup all 2.2 keys from db Remove deprecated config values for version 2.2 from engine-config Removed all version 2.2 keys from vdc_options and action_version_map tables and test classes Change-Id: I1fdfed4efa2c4d1f52189943fd1dd38ea0c3cbb0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859045 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/dbscripts/action_version_map_sp.sql M backend/manager/dbscripts/common_sp.sql M backend/manager/dbscripts/insert_data.sql A backend/manager/dbscripts/upgrade/03_02_0000_delete_action_version_map.sql M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java 6 files changed, 40 insertions(+), 77 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/9492/1 diff --git a/backend/manager/dbscripts/action_version_map_sp.sql b/backend/manager/dbscripts/action_version_map_sp.sql index b1a8e88..d2f6317 100644 --- a/backend/manager/dbscripts/action_version_map_sp.sql +++ b/backend/manager/dbscripts/action_version_map_sp.sql @@ -57,3 +57,11 @@ END; $procedure$ LANGUAGE plpgsql; +-- Deletes keys from action_version_map for the given versions +create or replace FUNCTION fn_db_delete_version_map(v_cluster_version varchar(10), v_sp_version varchar(40)) +returns void +AS $procedure$ +BEGIN + delete from action_version_map where cluster_minimal_version = v_cluster_version and storage_pool_minimal_version = v_sp_version; +END; $procedure$ +LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/common_sp.sql b/backend/manager/dbscripts/common_sp.sql index 0013742..dd991e8 100644 --- a/backend/manager/dbscripts/common_sp.sql +++ b/backend/manager/dbscripts/common_sp.sql @@ -99,6 +99,23 @@ END; $procedure$ LANGUAGE plpgsql; +-- Deletes a key from vdc_options by version +create or replace FUNCTION fn_db_delete_config_for_version(v_version varchar(40)) +returns void +AS $procedure$ +BEGIN + delete from vdc_options where version = v_version; +END; $procedure$ +LANGUAGE plpgsql; + +-- Deletes a key from vdc_options by name +create or replace FUNCTION fn_db_delete_config_by_name(v_option_name varchar(100)) +returns void +AS $procedure$ +BEGIN + delete from vdc_options where option_name ilike v_option_name; +END; $procedure$ +LANGUAGE plpgsql; -- Updates a value in vdc_options (if exists) create or replace FUNCTION fn_db_update_config_value(v_option_name varchar(100), v_option_value varchar(4000), diff --git a/backend/manager/dbscripts/insert_data.sql b/backend/manager/dbscripts/insert_data.sql index f412d12..3621d26 100644 --- a/backend/manager/dbscripts/insert_data.sql +++ b/backend/manager/dbscripts/insert_data.sql @@ -58,24 +58,6 @@ delete from action_version_map; -- Inserting data to history timekeeping Insert into dwh_history_timekeeping VALUES('lastSync',NULL,to_timestamp('01/01/2000', 'DD/MM/YYYY')); --- AddVmFromTemplate -insert into action_version_map values(2, '2.2', '2.2'); --- MoveVm -insert into action_version_map values(33, '2.2', '2.2'); --- ImportVm -insert into action_version_map values(36, '2.2', '2.2'); --- ExportVm -insert into action_version_map values(23, '2.2', '2.2'); --- ImportVmTemplate -insert into action_version_map values(39, '2.2', '2.2'); --- ExportVmTemplate -insert into action_version_map values(24, '2.2', '2.2'); --- AddExistingNFSStorageDomain -insert into action_version_map values(960, '2.2', '2.2'); --- AddExistingSANStorageDomainCommand -insert into action_version_map values(961, '2.2', '2.2'); --- RecoveryStoragePool -insert into action_version_map values(915, '2.2', '2.2'); RETURN; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/upgrade/03_02_0000_delete_action_version_map.sql b/backend/manager/dbscripts/upgrade/03_02_0000_delete_action_version_map.sql new file mode 100644 index 0000000..67a0dd4 --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_02_0000_delete_action_version_map.sql @@ -0,0 +1,5 @@ +--#source action_version_map_sp.sql +------------------------------------------------------------------------------------ +-- Cleanup deprecated action version section +------------------------------------------------------------------------------------ +select fn_db_delete_version_map('2.2','2.2'); diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index c268ee1..2122c5e 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -23,7 +23,6 @@ ------------------------------------------------------------------------------------ select fn_db_add_config_value('CpuPinMigrationEnabled','true','general'); -select fn_db_add_config_value('CpuPinningEnabled','false','2.2'); select fn_db_add_config_value('CpuPinningEnabled','false','3.0'); select fn_db_add_config_value('CpuPinningEnabled','true','3.1'); select fn_db_add_config_value('CpuPinningEnabled','true','3.2'); @@ -33,7 +32,6 @@ select fn_db_add_config_value('AdUserId','','general'); select fn_db_add_config_value('AdUserName','','general'); select fn_db_add_config_value('AdUserPassword','','general'); -select fn_db_add_config_value('AdvancedNFSOptionsEnabled','false','2.2'); select fn_db_add_config_value('AdvancedNFSOptionsEnabled','false','3.0'); select fn_db_add_config_value('AdvancedNFSOptionsEnabled','true','3.1'); select fn_db_add_config_value('AdvancedNFSOptionsEnabled','true','3.2'); @@ -88,20 +86,17 @@ select fn_db_add_config_value('DefaultTimeZone','(GMT) GMT Standard Time','general'); --Handling Default Workgroup select fn_db_add_config_value('DefaultWorkgroup','WORKGROUP','general'); -select fn_db_add_config_value('DesktopAudioDeviceType','default,ac97','2.2'); select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.0'); select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.1'); select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.2'); select fn_db_add_config_value('DisableFenceAtStartupInSec','300','general'); select fn_db_add_config_value('DiskConfigurationList','System,Sparse,COW,true;Data,Preallocated,RAW,false;Shared,Preallocated,RAW,false;Swap,Preallocated,RAW,false;Temp,Sparse,COW,false','general'); -select fn_db_add_config_value('DirectLUNDiskEnabled','false','2.2'); select fn_db_add_config_value('DirectLUNDiskEnabled','false','3.0'); select fn_db_add_config_value('DirectLUNDiskEnabled','true','3.1'); select fn_db_add_config_value('DirectLUNDiskEnabled','true','3.2'); select fn_db_add_config_value('DocsURL','docs','general'); --Handling NetBIOS Domain Name select fn_db_add_config_value('DomainName','example.com','general'); -select fn_db_add_config_value('EmulatedMachine','rhel5.5.0','2.2'); select fn_db_add_config_value('EmulatedMachine','rhel6.0.0','3.0'); select fn_db_add_config_value('EmulatedMachine','pc-0.14','3.1'); select fn_db_add_config_value('EmulatedMachine','pc-0.14','3.2'); @@ -131,7 +126,6 @@ select fn_db_add_config_value('FenceStartStatusRetries','3','general'); select fn_db_add_config_value('FenceStopStatusDelayBetweenRetriesInSec','60','general'); select fn_db_add_config_value('FenceStopStatusRetries','3','general'); -select fn_db_add_config_value('FilteringLUNsEnabled','true','2.2'); select fn_db_add_config_value('FilteringLUNsEnabled','true','3.0'); select fn_db_add_config_value('FilteringLUNsEnabled','false','3.1'); select fn_db_add_config_value('FilteringLUNsEnabled','false','3.2'); @@ -146,7 +140,6 @@ select fn_db_add_config_value('HighUtilizationForEvenlyDistribute','75','general'); select fn_db_add_config_value('HighUtilizationForPowerSave','75','general'); select fn_db_add_config_value('HostTimeDriftInSec','300','general'); -select fn_db_add_config_value('HotPlugEnabled','false','2.2'); select fn_db_add_config_value('HotPlugEnabled','false','3.0'); select fn_db_add_config_value('HotPlugEnabled','true','3.1'); select fn_db_add_config_value('HotPlugEnabled','true','3.2'); @@ -246,11 +239,9 @@ select fn_db_add_config_value('LeaseRetries','3','general'); select fn_db_add_config_value('LeaseTimeSec','60','general'); select fn_db_add_config_value('LicenseCertificateFingerPrint','5f 38 41 89 b1 33 49 0c 24 13 6b b3 e5 ba 9e c7 fd 83 80 3b','general'); -select fn_db_add_config_value('LiveSnapshotEnabled','false','2.2'); select fn_db_add_config_value('LiveSnapshotEnabled','false','3.0'); select fn_db_add_config_value('LiveSnapshotEnabled','true','3.1'); select fn_db_add_config_value('LiveSnapshotEnabled','true','3.2'); -select fn_db_add_config_value('LiveStorageMigrationEnabled','false','2.2'); select fn_db_add_config_value('LiveStorageMigrationEnabled','false','3.0'); select fn_db_add_config_value('LiveStorageMigrationEnabled','false','3.1'); select fn_db_add_config_value('LiveStorageMigrationEnabled','true','3.2'); @@ -272,15 +263,12 @@ select fn_db_add_config_value('MaxLDAPQueryPartsNumber','100','general'); select fn_db_add_config_value('MaxMacsCountInPool','100000','general'); select fn_db_add_config_value('MaxNumberOfHostsInStoragePool','250','general'); -select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','2.2'); select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.0'); select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.1'); select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.2'); -select fn_db_add_config_value('MaxNumOfVmCpus','16','2.2'); select fn_db_add_config_value('MaxNumOfVmCpus','64','3.0'); select fn_db_add_config_value('MaxNumOfVmCpus','64','3.1'); select fn_db_add_config_value('MaxNumOfVmCpus','64','3.2'); -select fn_db_add_config_value('MaxNumOfVmSockets','16','2.2'); select fn_db_add_config_value('MaxNumOfVmSockets','16','3.0'); select fn_db_add_config_value('MaxNumOfVmSockets','16','3.1'); select fn_db_add_config_value('MaxNumOfVmSockets','16','3.2'); @@ -294,12 +282,10 @@ select fn_db_add_config_value('MaxVmNameLengthWindows','15','general'); select fn_db_add_config_value('MaxVmsInPool','1000','general'); select fn_db_add_config_value('MinimalETLVersion','3.0.0','general'); -select fn_db_add_config_value('NativeUSBEnabled','false','2.2'); select fn_db_add_config_value('NativeUSBEnabled','false','3.0'); select fn_db_add_config_value('NativeUSBEnabled','true','3.1'); select fn_db_add_config_value('NativeUSBEnabled','true','3.2'); select fn_db_add_config_value('NicDHCPDelayGraceInMS','60','general'); -select fn_db_add_config_value('NonVmNetworkSupported','false','2.2'); select fn_db_add_config_value('NonVmNetworkSupported','false','3.0'); select fn_db_add_config_value('NonVmNetworkSupported','true','3.1'); select fn_db_add_config_value('NonVmNetworkSupported','true','3.2'); @@ -307,15 +293,12 @@ select fn_db_add_config_value('NumberOfUSBSlots','4','general'); select fn_db_add_config_value('NumberOfVmsForTopSizeVms','10','general'); select fn_db_add_config_value('NumberVmRefreshesBeforeSave','5','general'); -select fn_db_add_config_value('SupportBridgesReportByVDSM','false','2.2'); select fn_db_add_config_value('SupportBridgesReportByVDSM','false','3.0'); select fn_db_add_config_value('SupportBridgesReportByVDSM','false','3.1'); select fn_db_add_config_value('SupportBridgesReportByVDSM','true','3.2'); -select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '2.2'); select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '3.0'); select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '3.1'); select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','true', '3.2'); -select fn_db_add_config_value('MTUOverrideSupported','false','2.2'); select fn_db_add_config_value('MTUOverrideSupported','false','3.0'); select fn_db_add_config_value('MTUOverrideSupported','true','3.1'); select fn_db_add_config_value('MTUOverrideSupported','true','3.2'); @@ -330,7 +313,6 @@ select fn_db_add_config_value('oVirtUpgradeScriptName','/usr/share/vdsm-reg/vdsm-upgrade','general'); select fn_db_add_config_value('oVirtUploadPath','/data/updates/ovirt-node-image.iso','general'); select fn_db_add_config_value('PayloadSize','8192','general'); -select fn_db_add_config_value('PosixStorageEnabled','false','2.2'); select fn_db_add_config_value('PosixStorageEnabled','false','3.0'); select fn_db_add_config_value('PosixStorageEnabled','true','3.1'); select fn_db_add_config_value('PosixStorageEnabled','true','3.2'); @@ -368,7 +350,6 @@ select fn_db_add_config_value('PowerClientRunVmShouldVerifyPendingVMsAsWell','false','general'); --Handling Spice Dynamic Compression Management select fn_db_add_config_value('PowerClientSpiceDynamicCompressionManagement','false','general'); -select fn_db_add_config_value('PredefinedVMProperties','','2.2'); select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.0'); select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.1'); select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.2'); @@ -401,18 +382,15 @@ select fn_db_add_config_value('SearchResultsLimit','100','general'); select fn_db_add_config_value('SelectCommandTimeout','120','general'); select fn_db_add_config_value('SendSMPOnRunVm','true','general'); -select fn_db_add_config_value('SendVmTicketUID','false','2.2'); select fn_db_add_config_value('SendVmTicketUID','false','3.0'); select fn_db_add_config_value('SendVmTicketUID','true','3.1'); select fn_db_add_config_value('SendVmTicketUID','true','3.2'); -select fn_db_add_config_value('ServerCPUList','2:Intel Xeon w/o XD/NX:vmx,sse2:qemu64,-nx,+sse2; 3:Intel Xeon:vmx,sse2,nx:qemu64,+sse2; 4:Intel Conroe Family:vmx,sse2,nx,cx16,ssse3:qemu64,+sse2,+cx16,+ssse3; 5:Intel Penryn Family:vmx,sse2,nx,cx16,ssse3,sse4_1:qemu64,+sse2,+cx16,+ssse3,+sse4.1; 6:Intel Nehalem Family:vmx,sse2,nx,cx16,ssse3,sse4_1,sse4_2,popcnt:qemu64,+sse2,+cx16,+ssse3,+sse4.1,+sse4.2,+popcnt; 2:AMD Opteron G1 w/o NX:svm,sse2:qemu64,-nx,+sse2; 3:AMD Opteron G1:svm,sse2,nx:qemu64,+sse2; 4:AMD Opteron G2:svm,sse2,nx,cx16:qemu64,+sse2,+cx16; 5:AMD Opteron G3:svm,sse2,nx,cx16,sse4a,misalignsse,popcnt,abm:qemu64,+sse2,+cx16,+sse4a,+misalignsse,+popcnt,+abm;','2.2'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.0'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.1'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4;','3.2'); select fn_db_add_config_value('ServerRebootTimeout','300','general'); select fn_db_add_config_value('SetupNetworksPollingTimeout','3','general'); -- Add shareable disk property in vdc_options to support only 3.1 version. -select fn_db_add_config_value('ShareableDiskEnabled','false','2.2'); select fn_db_add_config_value('ShareableDiskEnabled','false','3.0'); select fn_db_add_config_value('ShareableDiskEnabled','true','3.1'); select fn_db_add_config_value('ShareableDiskEnabled','true','3.2'); @@ -445,13 +423,11 @@ select fn_db_add_config_value('StoragePoolNonOperationalResetTimeoutInMin','3','general'); select fn_db_add_config_value('StoragePoolRefreshTimeInSeconds','10','general'); select fn_db_add_config_value('SucceededJobCleanupTimeInMinutes','10','general'); -select fn_db_add_config_value('SupportedClusterLevels','2.2,3.0','general'); -select fn_db_add_config_value('SupportedStorageFormats','0','2.2'); +select fn_db_add_config_value('SupportedClusterLevels','3.0','general'); select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0'); select fn_db_add_config_value('SupportedStorageFormats','0,2,3','3.1'); select fn_db_add_config_value('SupportedStorageFormats','0,2,3','3.2'); select fn_db_add_config_value('SupportedVDSMVersions','4.5,4.9','general'); -select fn_db_add_config_value('SupportForceCreateVG','false','2.2'); select fn_db_add_config_value('SupportForceCreateVG','false','3.0'); select fn_db_add_config_value('SupportForceCreateVG','true','3.1'); select fn_db_add_config_value('SupportForceCreateVG','true','3.2'); @@ -472,7 +448,6 @@ --Handling Truststore URL select fn_db_add_config_value('TruststoreUrl','.truststore','general'); select fn_db_add_config_value('UknownTaskPrePollingLapse','60000','general'); -select fn_db_add_config_value('UserDefinedVMProperties','','2.2'); select fn_db_add_config_value('UserDefinedVMProperties','','3.0'); select fn_db_add_config_value('UserDefinedVMProperties','','3.1'); select fn_db_add_config_value('UserDefinedVMProperties','','3.2'); @@ -491,7 +466,6 @@ select fn_db_add_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,port=ipport;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port','general'); select fn_db_add_config_value('VdsFenceOptions','','general'); select fn_db_add_config_value('VdsFenceOptionTypes','secure=bool,port=int,slot=int','general'); -select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','2.2'); select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.0'); select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.2'); @@ -506,7 +480,6 @@ --Handling Virtual Machine Domain Name select fn_db_add_config_value('VirtualMachineDomainName','VirtualMachineDomainName','general'); select fn_db_add_config_value('VM32BitMaxMemorySizeInMB','20480','general'); -select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','262144','2.2'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.0'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.1'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.2'); @@ -574,13 +547,12 @@ select fn_db_update_config_value('PostgresPagingSyntax','OFFSET (%1$s -1) LIMIT %2$s','general'); select fn_db_update_config_value('PostgresSearchTemplate','SELECT * FROM (%2$s) %1$s) as T1 %3$s','general'); select fn_db_update_config_value('RhevhLocalFSPath','/data/images/','general'); -select fn_db_update_config_value('ServerCPUList','2:Intel Xeon w/o XD/NX:vmx,sse2:qemu64,-nx,+sse2; 3:Intel Xeon:vmx,sse2,nx:qemu64,+sse2; 4:Intel Conroe Family:vmx,sse2,nx,cx16,ssse3:qemu64,+sse2,+cx16,+ssse3; 5:Intel Penryn Family:vmx,sse2,nx,cx16,ssse3,sse4_1:qemu64,+sse2,+cx16,+ssse3,+sse4.1; 6:Intel Nehalem Family:vmx,sse2,nx,cx16,ssse3,sse4_1,sse4_2,popcnt:qemu64,+sse2,+cx16,+ssse3,+sse4.1,+sse4.2,+popcnt; 2:AMD Opteron G1 w/o NX:svm,sse2:qemu64,-nx,+sse2; 3:AMD Opteron G1:svm,sse2,nx:qemu64,+sse2; 4:AMD Opteron G2:svm,sse2,nx,cx16:qemu64,+sse2,+cx16; 5:AMD Opteron G3:svm,sse2,nx,cx16,sse4a,misalignsse,popcnt,abm:qemu64,+sse2,+cx16,+sse4a,+misalignsse,+popcnt,+abm;','2.2'); select fn_db_update_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.0'); select fn_db_update_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.1'); select fn_db_update_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4;','3.1'); select fn_db_update_config_value('SignLockFile','/var/lock/ovirt-engine/.openssl.exclusivelock','general'); select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": "RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general'); -select fn_db_update_config_value('SupportedClusterLevels','2.2,3.0,3.1,3.2','general'); +select fn_db_update_config_value('SupportedClusterLevels','3.0,3.1,3.2','general'); select fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1'); select fn_db_update_config_value('SupportedVDSMVersions','4.5,4.9,4.10','general'); select fn_db_update_config_value('TruststoreUrl','.truststore','general'); @@ -590,7 +562,6 @@ select fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,port=ipport;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;ilo3:','general'); select fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port','general'); select fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;ilo3:','general'); -select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','2.2'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.0'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); select fn_db_update_config_value('VmGracefulShutdownMessage','The Engine is shutting down this Virtual Machine','general'); @@ -636,32 +607,14 @@ select fn_db_delete_config_value('VdsErrorsFileName','general'); select fn_db_delete_config_value('VM64BitMaxMemorySizeInMB','general'); select fn_db_delete_config_value('LogVdsRegistration','general'); -select fn_db_delete_config_value('IsNeedSupportForOldVgAPI','2.2'); -select fn_db_delete_config_value('IsNeedSupportForOldVgAPI','3.0'); -select fn_db_delete_config_value('LimitNumberOfNetworkInterfaces','2.2'); -select fn_db_delete_config_value('LimitNumberOfNetworkInterfaces','3.0'); -select fn_db_delete_config_value('LimitNumberOfNetworkInterfaces','3.1'); -select fn_db_delete_config_value('LimitNumberOfNetworkInterfaces','3.2'); -select fn_db_delete_config_value('LocalStorageEnabled','2.2'); -select fn_db_delete_config_value('LocalStorageEnabled','3.0'); -select fn_db_delete_config_value('LocalStorageEnabled','3.1'); -select fn_db_delete_config_value('LocalStorageEnabled','3.2'); -select fn_db_delete_config_value('SupportCustomProperties','2.2'); -select fn_db_delete_config_value('SupportCustomProperties','3.0'); -select fn_db_delete_config_value('SupportCustomProperties','3.1'); -select fn_db_delete_config_value('SupportCustomProperties','3.2'); -select fn_db_delete_config_value('SupportGetDevicesVisibility','2.2'); -select fn_db_delete_config_value('SupportGetDevicesVisibility','3.0'); -select fn_db_delete_config_value('SupportGetDevicesVisibility','3.1'); -select fn_db_delete_config_value('SupportGetDevicesVisibility','3.2'); -select fn_db_delete_config_value('SupportStorageFormat','2.2'); -select fn_db_delete_config_value('SupportStorageFormat','3.0'); -select fn_db_delete_config_value('SupportStorageFormat','3.1'); -select fn_db_delete_config_value('SupportStorageFormat','3.2'); -select fn_db_delete_config_value('UseRtl8139_pv','2.2'); -select fn_db_delete_config_value('UseRtl8139_pv','3.0'); -select fn_db_delete_config_value('UseRtl8139_pv','3.1'); -select fn_db_delete_config_value('UseRtl8139_pv','3.2'); +select fn_db_delete_config_for_version('2.2'); +select fn_db_delete_config_by_name('IsNeedSupportForOldVgAPI'); +select fn_db_delete_config_by_name('LimitNumberOfNetworkInterfaces'); +select fn_db_delete_config_by_name('LocalStorageEnabled'); +select fn_db_delete_config_by_name('SupportCustomProperties'); +select fn_db_delete_config_by_name('SupportGetDevicesVisibility'); +select fn_db_delete_config_by_name('SupportStorageFormat'); +select fn_db_delete_config_by_name('UseRtl8139_pv'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java index 02ef88e..bcb5ff8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java @@ -68,8 +68,6 @@ mockConfig(ConfigValues.UserDefinedVMProperties, "3.1", ""), mockConfig(ConfigValues.PredefinedVMProperties, "3.0", ""), mockConfig(ConfigValues.UserDefinedVMProperties, "3.0", ""), - mockConfig(ConfigValues.PredefinedVMProperties, "2.2", ""), - mockConfig(ConfigValues.UserDefinedVMProperties, "2.2", ""), mockConfig(ConfigValues.ValidNumOfMonitors, "1,2,4"), mockConfig(ConfigValues.VmPriorityMaxValue, 100), mockConfig(ConfigValues.MaxNumOfVmCpus, "3.0", 16), -- To view, visit http://gerrit.ovirt.org/9492 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fdfed4efa2c4d1f52189943fd1dd38ea0c3cbb0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
