Merge branch 'maint'

Conflicts:
	doc/development/lint.txt
	misc/bcfg2.spec
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	testsuite/install.sh

3 files changed, 151 insertions, 4 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestAWSTags.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestAWSTags.py
new file mode 100644
index 000000000..05e0bb9a1
--- /dev/null
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestAWSTags.py
@@ -0,0 +1,140 @@
+import os
+import sys
+import lxml.etree
+import Bcfg2.Server.Plugin
+from mock import Mock, MagicMock, patch
+try:
+    from Bcfg2.Server.Plugins.AWSTags import *
+    HAS_BOTO = True
+except ImportError:
+    HAS_BOTO = False
+
+# add all parent testsuite directories to sys.path to allow (most)
+# relative imports in python 2.4
+path = os.path.dirname(__file__)
+while path != "/":
+    if os.path.basename(path).lower().startswith("test"):
+        sys.path.append(path)
+    if os.path.basename(path) == "testsuite":
+        break
+    path = os.path.dirname(path)
+from common import *
+from TestPlugin import TestPlugin, TestConnector, TestClientRunHooks
+
+config = '''
+<AWSTags>
+  <Tag name="name-only">
+    <Group>group1</Group>
+    <Group>group2</Group>
+  </Tag>
+  <Tag name="name-and-value" value="value">
+    <Group>group3</Group>
+  </Tag>
+  <Tag name="regex-(.*)">
+    <Group>group-$1</Group>
+  </Tag>
+  <Tag name="regex-value" value="(.*)">
+    <Group>group-$1</Group>
+  </Tag>
+</AWSTags>
+'''
+
+tags = {
+    "empty.example.com": {},
+    "no-matches.example.com": {"nameonly": "foo",
+                               "Name": "no-matches",
+                               "foo": "bar"},
+    "foo.example.com": {"name-only": "name-only",
+                        "name-and-value": "wrong",
+                        "regex-name": "foo"},
+    "bar.example.com": {"name-and-value": "value",
+                        "regex-value": "bar"}}
+
+groups = {
+    "empty.example.com": [],
+    "no-matches.example.com": [],
+    "foo.example.com": ["group1", "group2", "group-name"],
+    "bar.example.com": ["group3", "group-value", "group-bar"]}
+
+
+def make_instance(name):
+    rv = Mock()
+    rv.private_dns_name = name
+    rv.tags = tags[name]
+    return rv
+
+
+instances = [make_instance(n) for n in tags.keys()]
+
+
+def get_all_instances(filters=None):
+    insts = [i for i in instances
+             if i.private_dns_name == filters['private-dns-name']]
+    res = Mock()
+    res.instances = insts
+    return [res]
+
+
+if HAS_BOTO:
+    class TestAWSTags(TestPlugin, TestClientRunHooks, TestConnector):
+        test_obj = AWSTags
+
+        def get_obj(self, core=None):
+            @patchIf(not isinstance(Bcfg2.Server.Plugins.AWSTags.connect_ec2,
+                                    Mock),
+                     "Bcfg2.Server.Plugins.AWSTags.connect_ec2", Mock())
+            @patch("lxml.etree.Element", Mock())
+            def inner():
+                obj = TestPlugin.get_obj(self, core=core)
+                obj.config.data = config
+                obj.config.Index()
+                return obj
+            return inner()
+
+        @patch("Bcfg2.Server.Plugins.AWSTags.connect_ec2")
+        def test_connect(self, mock_connect_ec2):
+            """ Test connection to EC2 """
+            key_id = "a09sdbipasdf"
+            access_key = "oiilb234ipwe9"
+
+            def cfp_get(section, option):
+                if option == "access_key_id":
+                    return key_id
+                elif option == "secret_access_key":
+                    return access_key
+                else:
+                    return Mock()
+
+            core = Mock()
+            core.setup.cfp.get = Mock(side_effect=cfp_get)
+            awstags = self.get_obj(core=core)
+            mock_connect_ec2.assert_called_with(
+                aws_access_key_id=key_id,
+                aws_secret_access_key=access_key)
+
+        def test_get_additional_data(self):
+            """ Test AWSTags.get_additional_data() """
+            awstags = self.get_obj()
+            awstags._ec2.get_all_instances = \
+                Mock(side_effect=get_all_instances)
+
+            for hostname, expected in tags.items():
+                metadata = Mock()
+                metadata.hostname = hostname
+                self.assertItemsEqual(awstags.get_additional_data(metadata),
+                                      expected)
+
+        def test_get_additional_groups_caching(self):
+            """ Test AWSTags.get_additional_groups() with caching enabled """
+            awstags = self.get_obj()
+            awstags._ec2.get_all_instances = \
+                Mock(side_effect=get_all_instances)
+
+            for hostname, expected in groups.items():
+                metadata = Mock()
+                metadata.hostname = hostname
+                actual = awstags.get_additional_groups(metadata)
+                msg = """%s has incorrect groups:
+actual:   %s
+expected: %s""" % (hostname, actual, expected)
+                self.assertItemsEqual(actual, expected, msg)
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
index 290edb83a..8814ae171 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
@@ -336,6 +336,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
 
     @patch('Bcfg2.Utils.locked', Mock(return_value=False))
     @patch('fcntl.lockf', Mock())
+    @patch("Bcfg2.Server.Plugins.Metadata.XMLMetadataConfig.load_xml")
     @patch('os.open')
     @patch('os.fdopen')
     @patch('os.unlink')
@@ -343,7 +344,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
     @patch('os.path.islink')
     @patch('os.readlink')
     def test_write_xml(self, mock_readlink, mock_islink, mock_rename,
-                       mock_unlink, mock_fdopen, mock_open):
+                       mock_unlink, mock_fdopen, mock_open, mock_load_xml):
         fname = "clients.xml"
         config = self.get_obj(fname)
         fpath = os.path.join(self.metadata.data, fname)
@@ -357,6 +358,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
             mock_unlink.reset_mock()
             mock_fdopen.reset_mock()
             mock_open.reset_mock()
+            mock_load_xml.reset_mock()
 
         mock_islink.return_value = False
 
@@ -368,6 +370,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
         self.assertTrue(mock_fdopen.return_value.write.called)
         mock_islink.assert_called_with(fpath)
         mock_rename.assert_called_with(tmpfile, fpath)
+        mock_load_xml.assert_called_with()
 
         # test: clients.xml.new is locked the first time we write it
         def rv(fname, mode):
@@ -386,6 +389,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
         self.assertTrue(mock_fdopen.return_value.write.called)
         mock_islink.assert_called_with(fpath)
         mock_rename.assert_called_with(tmpfile, fpath)
+        mock_load_xml.assert_called_with()
 
         # test writing a symlinked clients.xml
         reset()
@@ -394,6 +398,7 @@ class TestXMLMetadataConfig(TestXMLFileBacked):
         mock_readlink.return_value = linkdest
         config.write_xml(fpath, get_clients_test_tree())
         mock_rename.assert_called_with(tmpfile, linkdest)
+        mock_load_xml.assert_called_with()
 
         # test failure of os.rename()
         reset()
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 6895034d5..8721c8015 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -11,15 +11,17 @@ if [[ ${PYVER:0:1} == "2" && $PYVER != "2.7" ]]; then
 fi
 
 if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
-    pip install --use-mirrors PyYAML pyinotify
+    pip install --use-mirrors PyYAML pyinotify boto
     if [[ $PYVER == "2.5" ]]; then
         # markdown 2.2+ doesn't work on py2.5
-        pip install --use-mirrors simplejson 'markdown<2.2'
+        pip install --use-mirrors simplejson 'markdown<2.2' 'django<1.4.9'
+    else
+        pip install 'django<1.5'
     fi
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits
         # in bcfg2 require South
-        pip install cheetah 'django<1.5' 'South<0.8' M2Crypto
+        pip install cheetah 'South<0.8' M2Crypto
     fi
 else
     # python < 2.6 requires M2Crypto for SSL communication, not just