Douglas Schilling Landgraf has uploaded a new change for review. Change subject: engine: Rename UseSecureConnectionWithServers ......................................................................
engine: Rename UseSecureConnectionWithServers Rename UseSecureConnectionWithServers for EncryptHostCommunication to be more descriptive. Change-Id: Ia25ed8e39a1a0bc737fb198e90d92489a8fe346c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1003117 Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/setup/plugins/ovirt-engine-setup/config/options.py 10 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/19305/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index 6f60124..54a8d2a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -260,7 +260,7 @@ private void AddVdsStaticToDb() { getParameters().getVdsStaticData().setServerSslEnabled( - Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers)); + Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication)); DbFacade.getInstance().getVdsStaticDao().save(getParameters().getVdsStaticData()); getCompensationContext().snapshotNewEntity(getParameters().getVdsStaticData()); setVdsIdRef(getParameters().getVdsStaticData().getId()); @@ -327,7 +327,7 @@ } else { returnValue = returnValue && validateSingleHostAttachedToLocalStorage(); - if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers) + if (Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication) && !EngineEncryptionUtils.haveKey()) { returnValue = failCanDoAction(VdcBllMessages.VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND); } else if (!getParameters().getAddPending() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index e32108e..aadffe3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -354,7 +354,7 @@ "%svars/ssl", VdsmEnv.CONFIG_PREFIX ), - Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers).toString() + Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication).toString() ); return null; }}, diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java index c245be8..97eff80 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java @@ -58,7 +58,7 @@ @ClassRule public static MockConfigRule configRule = new MockConfigRule(MockConfigRule.mockConfig(ConfigValues.MaxVdsNameLength, 4), - MockConfigRule.mockConfig(ConfigValues.UseSecureConnectionWithServers, false), + MockConfigRule.mockConfig(ConfigValues.EncryptHostCommunication, false), MockConfigRule.mockConfig(ConfigValues.InstallVds, true)); private VDS makeTestVds(Guid vdsId) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 6dcab75..88c34bd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -341,7 +341,7 @@ SpiceUsbAutoShare(121), @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") - UseSecureConnectionWithServers(123), + EncryptHostCommunication(123), @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("oVirt") diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index e0b63a3..c14b395 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -148,7 +148,7 @@ _vds.setPreviousStatus(VDSStatus.Up); } // if ssl is on and no certificate file - if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers) + if (Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication) && !EngineEncryptionUtils.haveKey()) { if (_vds.getStatus() != VDSStatus.Maintenance && _vds.getStatus() != VDSStatus.InstallFailed) { setStatus(VDSStatus.NonResponsive, _vds); @@ -196,7 +196,7 @@ connectionTimeOut, clientRetries, VdsServerConnector.class, - Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers)); + Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication)); _vdsProxy = new VdsServerWrapper(returnValue.getFirst(), returnValue.getSecond()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 0279371..8a82533 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -539,7 +539,7 @@ connectionTimeOut, clientRetries, IrsServerConnector.class, - Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers)); + Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication)); privatemIrsProxy = new IrsServerWrapper(returnValue.getFirst(), returnValue.getSecond()); runStoragePoolUpEvent(storagePool); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java index 362c76e..0d2ab60 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/xmlrpc/XmlRpcUtils.java @@ -45,7 +45,7 @@ private static final String HTTPS = "https://";; private static Log log = LogFactory.getLog(XmlRpcUtils.class); static { - if (Config.<Boolean> GetValue(ConfigValues.UseSecureConnectionWithServers)) { + if (Config.<Boolean> GetValue(ConfigValues.EncryptHostCommunication)) { URL keystoreUrl; try { // registering the https protocol with a socket factory that diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java index c5860df..d03f617 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java @@ -75,7 +75,7 @@ // when(mockConfigUtils.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMintues, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); // when(mockConfigUtils.<Integer> getValue(ConfigValues.NumberVmRefreshesBeforeSave, ConfigCommon.defaultConfigurationVersion)).thenReturn(1); // when(mockConfigUtils.<Integer> getValue(ConfigValues.vdsTimeout, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Boolean> getValue(ConfigValues.UseSecureConnectionWithServers, ConfigCommon.defaultConfigurationVersion)).thenReturn(false); +// when(mockConfigUtils.<Boolean> getValue(ConfigValues.EncryptHostCommunication, ConfigCommon.defaultConfigurationVersion)).thenReturn(false); // } // // public void setMockups() { diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index a02d727..daa7bf2 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -504,7 +504,7 @@ select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); select fn_db_add_config_value('UserSessionTimeOutInvalidationInterval','30','general'); --Handling Use Secure Connection with Hosts -select fn_db_add_config_value('UseSecureConnectionWithServers','true','general'); +select fn_db_add_config_value('EncryptHostCommunication','true','general'); select fn_db_add_config_value('UtilizationThresholdInPercent','80','general'); select fn_db_add_config_value('ValidNumOfMonitors','1,2,4','general'); select fn_db_add_config_value('VcpuConsumptionPercentage','10','general'); diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/config/options.py index 2c1d128..558fd1d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/config/options.py @@ -161,11 +161,11 @@ 'value': 'true', }, { - 'name': 'UseSecureConnectionWithServers', + 'name': 'EncryptHostCommunication', 'value': 'true', }, { - 'name': 'UseSecureConnectionWithServers', + 'name': 'EncryptHostCommunication', 'value': 'true', }, { -- To view, visit http://gerrit.ovirt.org/19305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25ed8e39a1a0bc737fb198e90d92489a8fe346c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
