[Engine-patches] Change in ovirt-engine[master]: engine: VmInit root-password not set on Pool creation

[shavivi]

Shahar Havivi has uploaded a new change for review.

Change subject: engine: VmInit root-password not set on Pool creation
......................................................................

engine: VmInit root-password not set on Pool creation

Change-Id: I9206906e3b61551023b21e4358663a4842018c7c
Signed-off-by: Shahar Havivi <shah...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
2 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/23971/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index ba652e7..a05dad5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -510,7 +510,7 @@
         getCompensationContext().snapshotNewEntity(getVmTemplate());
         setActionReturnValue(getVmTemplate().getId());
         // Load Vm Init from DB and set it to the template
-        VmHandler.updateVmInitFromDB(getParameters().getMasterVm(), true);
+        VmHandler.updateVmInitFromDB(getParameters().getMasterVm(), false);
         getVmTemplate().setVmInit(getParameters().getMasterVm().getVmInit());
         VmHandler.addVmInitToDB(getVmTemplate());
     }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index 4e6490c..2337a89 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -24,6 +24,7 @@
 import org.ovirt.engine.core.common.businessentities.DiskImage;
 import org.ovirt.engine.core.common.businessentities.StorageDomain;
 import org.ovirt.engine.core.common.businessentities.StorageDomainType;
+import org.ovirt.engine.core.common.businessentities.VmBase;
 import org.ovirt.engine.core.common.businessentities.VmPool;
 import org.ovirt.engine.core.common.businessentities.VmStatic;
 import org.ovirt.engine.core.common.businessentities.VmTemplate;
@@ -109,6 +110,7 @@
      */
     @Override
     protected void executeCommand() {
+        UpdateVmInitPassword();
         VmHandler.warnMemorySizeLegal(getParameters().getVmStaticData(), 
getVdsGroup().getcompatibility_version());
 
         Guid poolId = getPoolId();
@@ -175,6 +177,17 @@
         getCompensationContext().resetCompensation();
     }
 
+    private void UpdateVmInitPassword() {
+        // We are not passing the VmInit password to the UI,
+        // so we need to update the VmInit password from its template.
+        if (getParameters().getVmStaticData().getVmInit() != null) {
+            VmBase temp = new VmBase();
+            temp.setId(getParameters().getVmStaticData().getVmtGuid());
+            VmHandler.updateVmInitFromDB(temp, false);
+            
getParameters().getVmStaticData().getVmInit().setRootPassword(temp.getVmInit().getRootPassword());
+        }
+    }
+
     private CommandContext createAddVmStepContext(String currentVmName) {
         CommandContext commandCtx = null;
 


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

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