[Engine-patches] Change in ovirt-engine[master]: core: fix connection resolving in update conn

[abonas]

Alissa Bonas has uploaded a new change for review.

Change subject: core: fix connection resolving in update conn
......................................................................

core: fix connection resolving in update conn

Fix resolving connection attempt result returned from vdsm
in update storage server connection.

Change-Id: Ia16157d57af3619e32e20ede65521f16a6985b89
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
3 files changed, 9 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/17768/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java
index 0485fab..c7645cb 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java
@@ -62,12 +62,6 @@
         return getStorageConnDao().get(connectionId);
     }
 
-    protected Pair<Boolean, Integer> connectHostToStorage() {
-        Guid vdsId = getVds().getId();
-        Pair<Boolean, Integer> result = connect(vdsId);
-        return result;
-    }
-
     protected void saveConnection(StorageServerConnections connection) {
         getDbFacade().getStorageServerConnectionDao().save(connection);
     }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
index 3c7cba8..eeaac03 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java
@@ -40,6 +40,12 @@
         getReturnValue().setFault(fault);
     }
 
+    protected Pair<Boolean, Integer> connectHostToStorage() {
+            Guid vdsId = getVds().getId();
+            Pair<Boolean, Integer> result = connect(vdsId);
+            return result;
+    }
+
     protected Pair<Boolean, Integer> connect(Guid vdsId) {
         java.util.HashMap<String, String> result = (java.util.HashMap<String, 
String>) Backend
                 .getInstance()
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
index a669500..e4ba86e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java
@@ -38,7 +38,7 @@
 
 @NonTransactiveCommandAttribute(forceCompensation = true)
 @LockIdNameAttribute
-public class UpdateStorageServerConnectionCommand<T extends 
StorageServerConnectionParametersBase> extends 
StorageServerConnectionCommandBase<T> {
+public class UpdateStorageServerConnectionCommand<T extends 
StorageServerConnectionParametersBase> extends ConnectStorageToVdsCommand<T> {
     private List<StorageDomain> domains = new ArrayList<>();
     private List<LUNs> luns = new ArrayList<>();
 
@@ -289,12 +289,8 @@
     }
 
     protected boolean connectToStorage() {
-        StorageServerConnectionManagementVDSParameters 
newConnectionParametersForVdsm =
-                createParametersForVdsm(getParameters().getVdsId(),
-                        Guid.Empty,
-                        
getParameters().getStorageServerConnection().getstorage_type(),
-                        getParameters().getStorageServerConnection());
-        return runVdsCommand(VDSCommandType.ConnectStorageServer, 
newConnectionParametersForVdsm).getSucceeded();
+         Pair<Boolean, Integer> result = connectHostToStorage();
+         return result.getFirst();
     }
 
     protected void disconnectFromStorage() {


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

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