[Engine-patches] Change in ovirt-engine[master]: engine: Verify host provider exists when it is set

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Verify host provider exists when it is set
......................................................................

engine: Verify host provider exists when it is set

The external host provider should be examined for
existence when it is provided for the host, instead
when it is only changed (which fails for the case
of changing provider from an existing to missing
provider).

Change-Id: Ifb91e124f690edbc8f85d86dd26e2ec379fc24e3
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
2 files changed, 1 insertion(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/37606/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
index 8d86ca7..080a29f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpdateHostValidator.java
@@ -102,16 +102,12 @@
 
     public ValidationResult hostProviderExists() {
         return 
ValidationResult.failWith(VdcBllMessages.ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST)
-                .when(hostProviderConfigured() && getProvider() == null);
+                .when(getHost().getHostProviderId() != null && getProvider() 
== null);
     }
 
     public ValidationResult hostProviderTypeMatches() {
         return 
ValidationResult.failWith(VdcBllMessages.ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH)
                 .when(getProvider() != null && getProvider().getType() != 
ProviderType.FOREMAN);
-    }
-
-    private boolean hostProviderConfigured() {
-        return oldHost.getHostProviderId() == null && 
getHost().getHostProviderId() != null;
     }
 
     private Provider<?> getProvider() {
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
index 6112e2e..cf85dce 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/UpdateHostValidatorTest.java
@@ -331,15 +331,6 @@
         assertThat(validator.hostProviderExists(), isValid());
     }
 
-    @Test
-    public void hostProviderNotChanged() {
-        Guid providerId = Guid.newGuid();
-        when(host.getHostProviderId()).thenReturn(providerId);
-        when(oldHost.getHostProviderId()).thenReturn(providerId);
-
-        assertThat(validator.hostProviderExists(), isValid());
-    }
-
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void hostProviderTypeMatches() {


-- 
To view, visit http://gerrit.ovirt.org/37606
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb91e124f690edbc8f85d86dd26e2ec379fc24e3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches