Merge lp:~mhall119/awstrial/use-sites-framework-658572 into lp:awstrial

[Michael Hall]

Get the base urls for callbacks from the django.contrib.sites defined in the database, rather from the settings file.

Get the base urls for callbacks from the django.contrib.sites defined in the database, rather from the settings file.

[Matthew Nuzum (newz)]

Looks good.

review: Approve

=== modified file 'awstrial/trial/ec2_helper.py'
--- awstrial/trial/ec2_helper.py	2011-10-18 13:58:40 +0000
+++ awstrial/trial/ec2_helper.py	2011-10-19 19:46:27 +0000
@@ -21,6 +21,7 @@
 
 from trial.models import Campaign, Instances
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
 
 from django.conf import settings
@@ -82,8 +83,9 @@
             render_to_string("import-launchpad-ssh-keys",
                 { 'debug' : settings.DEBUG, 'launchpad_id' : lpid, 'password' : password } ),
             part_type=util.CI_SCRIPT, filename="10-launchpad-ssh-keys"))
-    
-    callback_url = "%s/info_callback/%s" % (settings.BASE_URL, sec_key)
+
+    site = Site.objects.get(pk=settings.SITE_ID)
+    callback_url = "%s/info_callback/%s" % (site.name, sec_key)
     parts.append(
         util.partItem(
             render_to_string("info-callback",

=== modified file 'awstrial/trial/tests.py'
--- awstrial/trial/tests.py	2011-10-18 20:11:39 +0000
+++ awstrial/trial/tests.py	2011-10-19 19:46:27 +0000
@@ -25,6 +25,7 @@
 from django.test import TestCase as DjangoTestCase
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from mock import patch, Mock
 from trial import ec2_helper
 from trial.models import Campaign, Instances
@@ -96,6 +97,7 @@
         self.old_access_key = getattr(settings, 'AWS_ACCESS_KEY_ID', None)
         self.old_secret_key = getattr(settings, 'AWS_SECRET_ACCESS_KEY', None)
         self.old_alternate_cloud = getattr(settings, 'ALTERNATE_CLOUD', None)
+        self.old_site_id = getattr(settings, 'SITE_ID', None)
         settings.AWS_ACCESS_KEY_ID = 'TestAccessKey'
         settings.AWS_SECRET_ACCESS_KEY = 'TestSecretKey'
         settings.ALTERNATE_CLOUD = None
@@ -104,6 +106,7 @@
         settings.AWS_ACCESS_KEY_ID = self.old_access_key
         settings.AWS_SECRET_ACCESS_KEY = self.old_secret_key
         settings.ALTERNATE_CLOUD = self.old_alternate_cloud
+        settings.SITE_ID = self.old_site_id
 
     def call_run_instance(self, campaign):
         post_data = {
@@ -114,6 +117,63 @@
         return self.client.post('/%s/run/' % campaign.name, post_data)
 
     @patch('boto.ec2.EC2Connection')
+    def test_uses_sites_framework(self, mock_connection):
+        """
+        Checks that the callback url is based off the Site.name for this
+        configuration
+        """
+
+        newsite = Site.objects.create(
+            domain='testing.awstrial.org',
+            name='http://testing.awstrial.org:8000',
+        )
+        settings.SITE_ID = newsite.id
+        self.call_count=0
+        class MockInstance(object):
+        
+            def __init__(self, instance_id):
+                self.id = instance_id
+                
+        class MockReservation(object):
+        
+            def __init__(self, instance_ids):
+                self.instances = [MockInstance(i) for i in instance_ids]
+        
+        campaign = Campaign.objects.create(
+            name='test-campaign',
+            verbose_name='Test Campaign',
+            max_instances=5,
+            active=True,
+        )
+        
+        def mock_run_instances(conn, *args, **kwargs):
+            self.call_count += 1
+            self.assertTrue('user_data' in kwargs)
+
+            import StringIO, gzip, email
+            gzipped_mime_data = StringIO.StringIO()
+            gzipped_mime_data.write(kwargs['user_data'])
+            gzipped_mime_data.seek(0)
+            gzipped_mime_file = gzip.GzipFile(fileobj=gzipped_mime_data, mode='r')
+            mime_data = gzipped_mime_file.read()
+            mime_msg = email.message_from_string(mime_data)
+            self.assertTrue(mime_msg.is_multipart())
+
+            for mime_part in mime_msg.get_payload():
+                if mime_part.get_filename() == '99-info-callback':
+                    self.assertTrue('http://testing.awstrial.org:8000/info_callback/' in mime_part.get_payload())
+
+            return MockReservation(['i-test-%s'%self.call_count])
+        mock_connection.return_value.run_instances.side_effect = mock_run_instances
+        
+        user = User.objects.create_user('testuser', '[e-mail]', 'testpasswd')
+        self.client.login(username='testuser', password='testpasswd')
+        
+        response = self.call_run_instance(campaign)
+        self.assertEquals(1, Instances.objects.all().count())
+        instance = Instances.objects.all()[0]
+
+    @patch('boto.ec2.EC2Connection')
     def test_disallow_multiple_instances(self, mock_connection):
         """
         Checks that a user can't create multiple isntances by making requests