BUEC528-HIL-QUADS · vsemp · Apr 12, 2017 · Apr 12, 2017
diff --git a/.gitignore b/.gitignore
diff --git a/.gitreview b/.gitreview
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/__init__.py b/__init__.py
diff --git a/ansible/racadm-setup-boot-r620-director.yml b/ansible/racadm-setup-boot-r620-director.yml
diff --git a/ansible/racadm-setup-boot-r620-foreman.yml b/ansible/racadm-setup-boot-r620-foreman.yml
diff --git a/ansible/racadm-setup-boot-r630-director.yml b/ansible/racadm-setup-boot-r630-director.yml
diff --git a/ansible/racadm-setup-boot-r630-foreman.yml b/ansible/racadm-setup-boot-r630-foreman.yml
diff --git a/ansible/racadm-setup-boot-r730xd-director.yml b/ansible/racadm-setup-boot-r730xd-director.yml
diff --git a/ansible/racadm-setup-boot-r730xd-foreman.yml b/ansible/racadm-setup-boot-r730xd-foreman.yml
diff --git a/ansible/racadm-setup-boot-r930-director.yml b/ansible/racadm-setup-boot-r930-director.yml
diff --git a/ansible/racadm-setup-boot-r930-foreman.yml b/ansible/racadm-setup-boot-r930-foreman.yml
diff --git a/bin/__init__.py b/bin/__init__.py
diff --git a/bin/quads-validate-env.sh b/bin/quads-validate-env.sh
diff --git a/conf/quads.yml b/conf/quads.yml
diff --git a/cron/quads b/cron/quads
diff --git a/image/jenkins.png b/image/jenkins.png
diff --git a/image/quads-assignments.png b/image/quads-assignments.png
diff --git a/image/quads-calendar.png b/image/quads-calendar.png
diff --git a/image/quads-visual.png b/image/quads-visual.png
diff --git a/image/quads-wiki.png b/image/quads-wiki.png
diff --git a/image/quads-workflow.png b/image/quads-workflow.png
diff --git a/image/quads.jpg b/image/quads.jpg
diff --git a/lib/.DS_Store b/lib/.DS_Store
diff --git a/lib/__init__.py b/lib/__init__.py
diff --git a/lib/hardware_services/.DS_Store b/lib/hardware_services/.DS_Store
diff --git a/lib/hardware_services/__init__.py b/lib/hardware_services/__init__.py
diff --git a/lib/hardware_services/inventory_drivers/QuadsNativeInventoryDriver.py b/lib/hardware_services/inventory_drivers/QuadsNativeInventoryDriver.py
@@ -118,11 +118,11 @@ def load_data(self, quadsinstance, force):
             exit(1)
 
     def write_data(self, quadsinstance, doexit = True):
-        quadsinstance.quads_write_data(doexit)
+        quadsinstance.quads_write_data_(doexit)
 
     def sync_state(self, quadsinstance):
-        quadsinstance.quads_sync_state()
+        quadsinstance.quads_sync_state_()
 
     def init_data(self, quadsinstance, force):
-        quadsinstance.quads_init_data(force)
+        quadsinstance.quads_init_data_(force)
 
diff --git a/lib/hardware_services/inventory_drivers/__init__.py b/lib/hardware_services/inventory_drivers/__init__.py
diff --git a/lib/libquads.py b/lib/libquads.py
@@ -101,15 +101,7 @@ def __init__(self, config, statedir, movecommand, datearg, syncstate, initialize
         self.inventory_service = get_inventory_service()
         self.network_service = get_network_service()
 
-        if initialize:
-            self.quads_init_data(force)
-        try:
-            stream = open(config, 'r')
-            self.data = yaml.load(stream)
-            stream.close()
-        except Exception, ex:
-            self.logger.error(ex)
-            exit(1)
+        self.inventory_service.load_data(self, force)
 
         self.quads = QuadsData(self.data)
         self._quads_history_init()
@@ -133,6 +125,10 @@ def _quads_history_init(self):
 
     # we occasionally need to write the data back out
     def quads_write_data(self, doexit = True):
+        self.inventory_service.write_data(self, doexit)
+
+
+    def quads_write_data_(self, doexit = True):
         try:
             stream = open(self.config, 'w')
             self.data = {"clouds":self.quads.clouds.data, "hosts":self.quads.hosts.data, "history":self.quads.history.data}
@@ -143,10 +139,13 @@ def quads_write_data(self, doexit = True):
             self.logger.error("There was a problem with your file %s" % ex)
             if doexit:
                 exit(1)
+
 
+    def quads_init_data(self, force):
+        self.inventory_service.init_data(self, force)
     # if passed --init, the config data is wiped.
     # typically we will not want to continue execution if user asks to initialize
-    def quads_init_data(self, force):
+    def quads_init_data_(self, force):
         if not force:
             if os.path.isfile(self.config):
                 self.logger.warn("Warning: " + self.config + " exists. Use --force to initialize.")
@@ -200,9 +199,12 @@ def _quads_find_current(self, host, datearg):
 
         else:
             return None, None, None
+
 
-    # sync the statedir db for hosts with schedule
     def quads_sync_state(self):
+        self.inventory_service.init_data(self)
+    # sync the statedir db for hosts with schedule
+    def quads_sync_state_(self):
         # sync state
         if self.datearg is not None:
             self.logger.error("--sync and --date are mutually exclusive.")

diff --git a/templates/README.md b/templates/README.md
diff --git a/templates/foreman/foreman-post-configure-snippet.txt b/templates/foreman/foreman-post-configure-snippet.txt
diff --git a/testing/README.md b/testing/README.md
diff --git a/testing/test-quads.sh b/testing/test-quads.sh
diff --git a/testing/update-racks-page.md b/testing/update-racks-page.md