Change all references from init to prepare.

Change all references from purge to clean.

Log a warning when abstract functions are not used.

5 files changed, 22 insertions, 22 deletions

diff --git a/plugins/sample1Plugin.py b/plugins/sample1Plugin.py
index 2a059c9..223dd4a 100644
--- a/plugins/sample1Plugin.py
+++ b/plugins/sample1Plugin.py
@@ -22,7 +22,7 @@ class Sample1Plugin(Plugin):
     """This plugin uses the predefined flow in the Plugin abstract class."""
     def __init__(self):
         Plugin.__init__(self)
-    def init(self):
+    def prepare(self):
         self._result=ReturnValueTrue
         return self._result
 
diff --git a/plugins/sample2Plugin.py b/plugins/sample2Plugin.py
index 041ecaa..57b446d 100644
--- a/plugins/sample2Plugin.py
+++ b/plugins/sample2Plugin.py
@@ -23,25 +23,25 @@ class Sample2Plugin(Plugin):
         Plugin.__init__(self)
 
         #
-        # Additional flow definition.
+        # Additional flow defprepareion.
         #
         self.customFlow = {
-                self.initial : {ReturnValue: "init"},
-                "init"       : {ReturnValueTrue: "diagnose"},
-                "diagnose"   : {ReturnValueTrue: "purge", ReturnValueFalse: "backup"},
-                "backup"     : {ReturnValueTrue: "fix", ReturnValueFalse: "purge"},
-                "restore"    : {ReturnValueTrue: "purge", ReturnValueFalse: "purge"},
+                self.initial : {ReturnValue: "prepare"},
+                "prepare"       : {ReturnValueTrue: "diagnose"},
+                "diagnose"   : {ReturnValueTrue: "clean", ReturnValueFalse: "backup"},
+                "backup"     : {ReturnValueTrue: "fix", ReturnValueFalse: "clean"},
+                "restore"    : {ReturnValueTrue: "clean", ReturnValueFalse: "clean"},
                 "fix"        : {ReturnValueTrue: "extraStep", ReturnValueFalse: "restore"},
-                "extraStep"  : {ReturnValueTrue: "purge", ReturnValueFalse: "purge"},
-                "purge"      : {ReturnValueTrue: self.final}
+                "extraStep"  : {ReturnValueTrue: "clean", ReturnValueFalse: "clean"},
+                "clean"      : {ReturnValueTrue: self.final}
                 }
         self._flows["default"] = self._defflow
 
-    def init(self):
+    def prepare(self):
         self._result=ReturnValueTrue
         return self._result
 
-    def purge(self):
+    def clean(self):
         self._result=ReturnValueTrue
         return self._result
 
diff --git a/plugins/sample3Plugin/__init__.py b/plugins/sample3Plugin/__init__.py
index 5c2e2c5..59de871 100644
--- a/plugins/sample3Plugin/__init__.py
+++ b/plugins/sample3Plugin/__init__.py
@@ -1,3 +1,3 @@
 import sample3Plugin
 def get_plugin():
-    return FirstAidKit.plugins.sample3Plugin.Sample3Plugin()
+    return sample3Plugin.Sample3Plugin()
diff --git a/plugins/sample3Plugin/plugin b/plugins/sample3Plugin/plugin
index 9cf7e03..c3099a5 100755
--- a/plugins/sample3Plugin/plugin
+++ b/plugins/sample3Plugin/plugin
@@ -21,14 +21,14 @@ else
 fi
 
 
-if [ $TASK = "init" ]; then
-    echo init true
+if [ $TASK = "prepare" ]; then
+    echo prepare true
 fi
 if [ $TASK = "diagnose" ]; then
     echo diagnose false
 fi
-if [ $TASK = "purge" ]; then
-    echo purge true
+if [ $TASK = "clean" ]; then
+    echo clean true
 fi
 if [ $TASK = "fix" ]; then
     echo fix true
diff --git a/plugins/sample3Plugin/sample3Plugin.py b/plugins/sample3Plugin/sample3Plugin.py
index 415d4ba..7e8a4c2 100644
--- a/plugins/sample3Plugin/sample3Plugin.py
+++ b/plugins/sample3Plugin/sample3Plugin.py
@@ -24,10 +24,10 @@ class Sample3Plugin(Plugin):
     def __init__(self):
         Plugin.__init__(self)
 
-    def init(self):
+    def prepare(self):
         # Prepare command line.
-        init = ["/usr/lib/FirstAidKit/plugins/sample3Plugin/plugin", "--task", "init"]
-        proc = subprocess.Popen(init, stdout=subprocess.PIPE)
+        prepare = ["/usr/lib/FirstAidKit/plugins/sample3Plugin/plugin", "--task", "prepare"]
+        proc = subprocess.Popen(prepare, stdout=subprocess.PIPE)
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":
@@ -36,9 +36,9 @@ class Sample3Plugin(Plugin):
             self._result=ReturnValueTrue
         return self._result
 
-    def purge(self):
-        purge = ["/usr/lib/FirstAidKit/plugins/sample3Plugin/plugin", "--task", "purge"]
-        proc = subprocess.Popen(purge, stdout=subprocess.PIPE)
+    def clean(self):
+        clean = ["/usr/lib/FirstAidKit/plugins/sample3Plugin/plugin", "--task", "clean"]
+        proc = subprocess.Popen(clean, stdout=subprocess.PIPE)
         (out, err) = proc.communicate()
         out = out.strip()
         if out[-5:] == "false":