Rename the Return* classes to more sane names and update everything to use them

Fix the NoOptionError exception throwing in configuration
Add the -a|--auto parameter to launch the automatic mode of operation

6 files changed, 51 insertions, 51 deletions

diff --git a/plugins/plugin_examples/dep1.py b/plugins/plugin_examples/dep1.py
index 0556561..0fe673a 100644
--- a/plugins/plugin_examples/dep1.py
+++ b/plugins/plugin_examples/dep1.py
@@ -31,23 +31,23 @@ class Sample1Plugin(Plugin):
         return set(["sample_dependency"]).union(Plugin.getDeps())
 
     def prepare(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def backup(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def restore(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def diagnose(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.provide("sample_dependency2")
 
     def fix(self):
-        self._result=ReturnUnfavorable
+        self._result=ReturnFailure
 
     def clean(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
 def get_plugin():
     return Sample1Plugin
diff --git a/plugins/plugin_examples/dep2.py b/plugins/plugin_examples/dep2.py
index 3c49b40..e8e8f43 100644
--- a/plugins/plugin_examples/dep2.py
+++ b/plugins/plugin_examples/dep2.py
@@ -31,22 +31,22 @@ class Sample1Plugin(Plugin):
         return set(["sample_dependency", "sample_dependency2"]).union(Plugin.getDeps())
 
     def prepare(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def backup(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def restore(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def diagnose(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def fix(self):
-        self._result=ReturnUnfavorable
+        self._result=ReturnFailure
 
     def clean(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
 def get_plugin():
     return Sample1Plugin
diff --git a/plugins/plugin_examples/dep3.py b/plugins/plugin_examples/dep3.py
index f3a329c..3da70ea 100644
--- a/plugins/plugin_examples/dep3.py
+++ b/plugins/plugin_examples/dep3.py
@@ -27,23 +27,23 @@ class Sample1Plugin(Plugin):
         Plugin.__init__(self, *args, **kwargs)
 
     def prepare(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def backup(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def restore(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def diagnose(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.provide("sample_dependency")
 
     def fix(self):
-        self._result=ReturnUnfavorable
+        self._result=ReturnFailure
 
     def clean(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
 def get_plugin():
     return Sample1Plugin
diff --git a/plugins/plugin_examples/sample1Plugin.py b/plugins/plugin_examples/sample1Plugin.py
index 8218104..22d033f 100644
--- a/plugins/plugin_examples/sample1Plugin.py
+++ b/plugins/plugin_examples/sample1Plugin.py
@@ -28,27 +28,27 @@ class Sample1Plugin(Plugin):
         self.reporting = kwargs.get('reporting')
 
     def prepare(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.reporting.info("Sample1Plugin in Prepare task", self)
 
     def backup(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.reporting.info("Sample1Plugin in backup task", self)
 
     def restore(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.reporting.info("Sample1Plugin in Restore task", self)
 
     def diagnose(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.reporting.info("Sample1Plugin in diagnose task", self)
 
     def fix(self):
-        self._result=ReturnUnfavorable
+        self._result=ReturnFailure
         self.reporting.info("Sample1Plugin in Fix task", self)
 
     def clean(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
         self.reporting.info("Sample1Plugin in Clean task", self)
 
 def get_plugin():
diff --git a/plugins/plugin_examples/sample2Plugin.py b/plugins/plugin_examples/sample2Plugin.py
index 4b4764d..5b471e0 100644
--- a/plugins/plugin_examples/sample2Plugin.py
+++ b/plugins/plugin_examples/sample2Plugin.py
@@ -25,14 +25,14 @@ class Sample2Plugin(Plugin):
     #
     flows = Flow.init(Plugin)
     flows["extra"] = Flow({
-                    Plugin.initial: {ReturnValue: "prepare"},
-                    "prepare"     : {ReturnFavorable: "diagnose"},
-                    "diagnose"    : {ReturnFavorable: "clean", ReturnUnfavorable: "backup"},
-                    "backup"      : {ReturnFavorable: "fix", ReturnUnfavorable: "clean"},
-                    "restore"     : {ReturnFavorable: "clean", ReturnUnfavorable: "clean"},
-                    "fix"         : {ReturnFavorable: "extraStep", ReturnUnfavorable: "restore"},
-                    "extraStep"   : {ReturnFavorable: "clean", ReturnUnfavorable: "clean"},
-                    "clean"       : {ReturnFavorable: Plugin.final}
+                    Plugin.initial: {Return: "prepare"},
+                    "prepare"     : {ReturnSuccess: "diagnose"},
+                    "diagnose"    : {ReturnSuccess: "clean", ReturnFailure: "backup"},
+                    "backup"      : {ReturnSuccess: "fix", ReturnFailure: "clean"},
+                    "restore"     : {ReturnSuccess: "clean", ReturnFailure: "clean"},
+                    "fix"         : {ReturnSuccess: "extraStep", ReturnFailure: "restore"},
+                    "extraStep"   : {ReturnSuccess: "clean", ReturnFailure: "clean"},
+                    "clean"       : {ReturnSuccess: Plugin.final}
                     }, description="Fixing sequence with one added extraStep")
     default_flow = "extra"
 
@@ -44,25 +44,25 @@ class Sample2Plugin(Plugin):
         Plugin.__init__(self, *args, **kwargs)
 
     def prepare(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def clean(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def backup(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def restore(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def diagnose(self):
-        self._result=ReturnUnfavorable
+        self._result=ReturnFailure
 
     def fix(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
     def extraStep(self):
-        self._result=ReturnFavorable
+        self._result=ReturnSuccess
 
 def get_plugin():
     return Sample2Plugin
diff --git a/plugins/plugin_examples/sample3Plugin/sample3Plugin.py b/plugins/plugin_examples/sample3Plugin/sample3Plugin.py
index 5d2e362..e58c8dc 100644
--- a/plugins/plugin_examples/sample3Plugin/sample3Plugin.py
+++ b/plugins/plugin_examples/sample3Plugin/sample3Plugin.py
@@ -36,9 +36,9 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess
 
     def clean(self):
         clean = [Config.plugin.path+"/sample3Plugin/plugin", "--task", "clean"]
@@ -46,9 +46,9 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess
 
     def backup(self):
         backup = [Config.plugin.path+"/sample3Plugin/plugin", "--task", "backup"]
@@ -56,9 +56,9 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess
 
     def restore(self):
         restore = [Config.plugin.path+"/sample3Plugin/plugin", "--task", "restore"]
@@ -66,9 +66,9 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess
 
     def diagnose(self):
         diagnose = [Config.plugin.path+"/sample3Plugin/plugin", "--task", "diagnose"]
@@ -76,9 +76,9 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess
 
     def fix(self):
         fix = [Config.plugin.path+"/sample3Plugin/plugin", "--task", "fix"]
@@ -86,6 +86,6 @@ class Sample3Plugin(Plugin):
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
-            self._result=ReturnUnfavorable
+            self._result=ReturnFailure
         elif out[-4:] == "true":
-            self._result=ReturnFavorable
+            self._result=ReturnSuccess