documented base plugin interfaces

1 files changed, 15 insertions, 16 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/ServiceCompat.py b/src/lib/Bcfg2/Server/Plugins/ServiceCompat.py
index aad92b7c7..f1309412a 100644
--- a/src/lib/Bcfg2/Server/Plugins/ServiceCompat.py
+++ b/src/lib/Bcfg2/Server/Plugins/ServiceCompat.py
@@ -1,7 +1,7 @@
 import Bcfg2.Server.Plugin
 
 class ServiceCompat(Bcfg2.Server.Plugin.Plugin,
-                    Bcfg2.Server.Plugin.StructureValidator):
+                    Bcfg2.Server.Plugin.GoalValidator):
     """ Use old-style service modes for older clients """
     name = 'ServiceCompat'
     __author__ = 'bcfg-dev@mcs.anl.gov'
@@ -9,24 +9,23 @@ class ServiceCompat(Bcfg2.Server.Plugin.Plugin,
                 ('interactive', 'true'): 'interactive_only',
                 ('false', 'false'): 'manual'}
 
-    def validate_structures(self, metadata, structures):
+    def validate_goals(self, metadata, config):
         """ Apply defaults """
         if metadata.version_info and metadata.version_info > (1, 3, 0, '', 0):
             # do not care about a client that is _any_ 1.3.0 release
             # (including prereleases and RCs)
             return
 
-        for struct in structures:
-            for entry in struct.xpath("//BoundService|//Service"):
-                mode_key = (entry.get("restart", "true").lower(),
-                            entry.get("install", "true").lower())
-                try:
-                    mode = self.mode_map[mode_key]
-                except KeyError:
-                    self.logger.info("Could not map restart and install "
-                                     "settings of %s:%s to an old-style "
-                                     "Service mode for %s; using 'manual'" %
-                                     (entry.tag, entry.get("name"),
-                                      metadata.hostname))
-                    mode = "manual"
-                entry.set("mode", mode)
+        for entry in config.xpath("//BoundService|//Service"):
+            mode_key = (entry.get("restart", "true").lower(),
+                        entry.get("install", "true").lower())
+            try:
+                mode = self.mode_map[mode_key]
+            except KeyError:
+                self.logger.info("Could not map restart and install settings "
+                                 "of %s:%s to an old-style Service mode for "
+                                 "%s; using 'manual'" %
+                                 (entry.tag, entry.get("name"),
+                                  metadata.hostname))
+                mode = "manual"
+            entry.set("mode", mode)