[Engine-patches] Change in ovirt-engine[master]: Revert "engine: VdsDeploy cleanup 1"

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: Revert "engine: VdsDeploy cleanup 1"
......................................................................

Revert "engine: VdsDeploy cleanup 1"

This reverts commit ee531b788e880e60cae87d82c3553239f2eb7778.

Change-Id: I1f964a0474dbd6ffabe531bd995ad4abbf4381d6
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java
1 file changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/13079/1

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 e3c262a..a9f902d 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
@@ -102,7 +102,7 @@
      * update the vds object.
      * @param vdsmid unique id read from host.
      */
-    private void setVdsmId(String vdsmid) {
+    private void _setVdsmId(String vdsmid) {
         if (vdsmid == null) {
             throw new SoftError("Cannot acquire node id");
         }
@@ -162,7 +162,7 @@
     /**
      * Set host to be node.
      */
-    private void setNode() {
+    private void _setNode() {
         _isNode = true;
 
         _vds.setVdsType(VDSType.oVirtNode);
@@ -181,7 +181,7 @@
      * For this simple task, no need to go via command mechanism.
      * @param status new status.
      */
-    private void setVdsStatus(VDSStatus status) {
+    private void _setVdsStatus(VDSStatus status) {
         _vds.setStatus(status);
 
         TransactionSupport.executeInNewTransaction(new 
TransactionMethod<Void>() {
@@ -310,7 +310,7 @@
                     InstallerMessages.Severity.INFO,
                     "Host is ovirt-node"
                 );
-                setNode();
+                _setNode();
             }
             return null;
         }},
@@ -367,7 +367,7 @@
             return null;
         }},
         new Callable<Object>() { public Object call() throws Exception {
-            setVdsmId((String)_parser.cliEnvironmentGet(VdsmEnv.VDSM_ID));
+            _setVdsmId((String)_parser.cliEnvironmentGet(VdsmEnv.VDSM_ID));
             return null;
         }},
         new Callable<Object>() { public Object call() throws Exception {
@@ -625,7 +625,7 @@
     /**
      * Execute the next termination vector entry.
      */
-    private void nextTerminationEntry() throws Exception {
+    private void _nextTerminationEntry() throws Exception {
         try {
             _terminationDialog[_terminationIndex++].call();
         }
@@ -638,7 +638,7 @@
      * Dialog implementation.
      * Handle events incoming from host.
      */
-    private void threadMain() {
+    private void _threadMain() {
         try {
             boolean terminate = false;
 
@@ -698,7 +698,7 @@
                         _nextCustomizationEntry();
                     }
                     else if (Queries.TERMINATION_COMMAND.equals(event.name)) {
-                        nextTerminationEntry();
+                        _nextTerminationEntry();
                     }
                     else {
                         throw new Exception(
@@ -787,7 +787,7 @@
             new Runnable() {
                 @Override
                 public void run() {
-                    threadMain();
+                    _threadMain();
                 }
             },
             "VdsDeploy"
@@ -884,7 +884,7 @@
     public void execute() throws Exception {
         InputStream in = null;
         try {
-            setVdsStatus(VDSStatus.Installing);
+            _setVdsStatus(VDSStatus.Installing);
 
             _dialog.setHost(_vds.getHostName());
             _dialog.connect();
@@ -932,13 +932,13 @@
                 );
             }
             else if (_goingToReboot) {
-                setVdsStatus(VDSStatus.Reboot);
+                _setVdsStatus(VDSStatus.Reboot);
             }
             else if (_installIncomplete) {
-                setVdsStatus(VDSStatus.InstallFailed);
+                _setVdsStatus(VDSStatus.InstallFailed);
             }
             else {
-                setVdsStatus(VDSStatus.NonResponsive);
+                _setVdsStatus(VDSStatus.NonResponsive);
             }
         }
         catch (TimeLimitExceededException e){
@@ -951,7 +951,7 @@
                 InstallerMessages.Severity.ERROR,
                 "Processing stopped due to timeout"
             );
-            setVdsStatus(VDSStatus.InstallFailed);
+            _setVdsStatus(VDSStatus.InstallFailed);
             throw e;
         }
         catch(Exception e) {
@@ -960,7 +960,7 @@
                 _vds.getHostName(),
                 e
             );
-            setVdsStatus(VDSStatus.InstallFailed);
+            _setVdsStatus(VDSStatus.InstallFailed);
 
             if (_failException == null) {
                 throw e;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f964a0474dbd6ffabe531bd995ad4abbf4381d6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches