Added basic appliance config handling (specifically package installation and removal)

Also added unit tests for the above.

2 files changed, 120 insertions, 11 deletions

diff --git a/ec2-run-user-data.py b/ec2-run-user-data.py
index 51e0d68d..784a1b3f 100755
--- a/ec2-run-user-data.py
+++ b/ec2-run-user-data.py
@@ -22,20 +22,10 @@ import email
 import os
 import subprocess
 import tempfile
+from xml.dom.minidom import parse, parseString
 
 import ec2init
 
-content_type_handlers = { 'text/x-shellscript' : handle_shell_script,
-                          'text/x-ebs-mount-description' : handle_ebs_mount_description }
-
-def main():
-    ec2 = ec2init.EC2Init()
-
-    user_data = ec2.get_user_data()
-
-    msg = email.message_from_string(user_data)
-    handle_part(msg)
-
 def handle_part(part):
     if part.is_multipart():
         for p in part.get_payload():
@@ -51,6 +41,14 @@ def handle_unknown_payload(payload):
     # Try to detect magic
     if payload.startswith('#!'):
         content_type_handlers['text/x-shellscript'](payload)
+        return
+    if payload.startswith('<appliance>'):
+        content_type_handlers['text/x-appliance-config'](payload)
+
+
+def handle_appliance_config(payload):
+    app = ApplianceConfig(payload)
+    app.handle()
 
 def handle_ebs_mount_description(payload):
     (volume_description, path) = payload.split(':')
@@ -79,5 +77,57 @@ def handle_shell_script(payload):
     
     os.unlink(path)
 
+content_type_handlers = { 'text/x-shellscript' : handle_shell_script,
+                          'text/x-ebs-mount-description' : handle_ebs_mount_description,
+                          'text/x-appliance-config': handle_appliance_config }
+
+class ApplianceConfig(object):
+    def __init__(self, data):
+        self.data = data
+
+    def handle(self):
+        self.dom = parseString(self.data)
+
+        if self.dom.childNodes[0].tagName == 'appliance':
+            root = self.dom.childNodes[0]
+        else:
+            return
+
+        for node in root.childNodes:
+            if node.tagName == 'package':
+                pkg = None
+                for subnode in node.childNodes:
+                    if subnode.nodeType == root.TEXT_NODE:
+                        pkg = subnode.nodeValue
+                if not pkg:
+                    # Something's fishy. We should have been passed the name of
+                    # a package.
+                    return
+                if node.getAttribute('action') == 'remove':
+                    remove_package(pkg)
+                else:
+                    install_package(pkg)
+
+def main():
+    ec2 = ec2init.EC2Init()
+
+    user_data = ec2.get_user_data()
+    msg = parse_user_data(user_data)
+    handle_part(msg)
+
+def parse_user_data(user_data):
+    return email.message_from_string(user_data)
+
+def install_remove_package(pkg, action):
+    apt_get = subprocess.Popen(['apt-get', action, pkg], stdout=subprocess.PIPE)
+    logger_process = subprocess.Popen(['logger', '-t', 'user-data'], stdin=apt_get.stdout)
+    logger_process.communicate()
+
+def install_package(pkg):
+    return install_remove_package(pkg, 'install')
+
+def remove_package(pkg):
+    return install_remove_package(pkg, 'remove')
+
 if __name__ == '__main__':
     main()
diff --git a/tests.py b/tests.py
new file mode 100644
index 00000000..fa3383a2
--- /dev/null
+++ b/tests.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+#
+#    Unit tests for EC2-init
+#    Copyright (C) 2008-2009 Canonical Ltd.
+#
+#    Author: Soren Hansen <soren@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import unittest
+
+class RunUserDataApplianceConfigPackageHandling(unittest.TestCase):
+    def setUp(self):
+        self.fake_install_remove_package_counter = 0
+
+        self.ec2_run_user_data = __import__('ec2-run-user-data')
+
+        # Override install_remove_package 
+        self.ec2_run_user_data.install_remove_package = self.fake_install_remove_package
+
+    def fake_install_remove_package(self, package, action):
+        self.fake_install_remove_package_counter += 1
+        mapping = { 'foobarplus': 'install',
+                    'foobarminus': 'remove' }
+        self.assert_(package in mapping)
+        self.assertEqual(action, mapping[package])
+
+    def handle_xml(self, xml):
+        msg = self.ec2_run_user_data.parse_user_data(xml)
+        self.ec2_run_user_data.handle_part(msg)
+
+    def testApplianceConfigPackageInstall(self):
+        xml = '<appliance><package>foobarplus</package></appliance>'
+        self.handle_xml(xml)
+        self.assertEqual(self.fake_install_remove_package_counter, 1) 
+
+    def testApplianceConfigPackageRemove(self):
+        xml = '<appliance><package action="remove">foobarminus</package></appliance>'
+        self.handle_xml(xml)
+        self.assertEqual(self.fake_install_remove_package_counter, 1) 
+
+    def testApplianceConfigPackageInstallAndRemove(self):
+        xml = '<appliance><package>foobarplus</package><package action="remove">foobarminus</package></appliance>'
+        self.handle_xml(xml)
+        self.assertEqual(self.fake_install_remove_package_counter, 2) 
+
+if __name__ == "__main__":
+    unittest.main()