Merge lp:~mhall119/awstrial/fix-873023 into lp:awstrial

[Michael Hall]

Adds instance-side test data collection framework, checks password expiration time when using password-auth

Adds instance-side test data collection framework, checks password expiration time when using password-auth.

http://awesomescreenshot.com/0e2mhjoe8

[Matthew Nuzum (newz)]

Looks OK

review: Approve

=== modified file 'awstrial/templates/cloud-init/info-callback'
--- awstrial/templates/cloud-init/info-callback	2011-02-11 02:31:50 +0000
+++ awstrial/templates/cloud-init/info-callback	2011-10-18 18:30:29 +0000
@@ -22,7 +22,15 @@
 			process = Popen(['/bin/bash', '-c', dumpk, "dumpkey", iid], stdout=PIPE)
 			(pubkeys,err) = process.communicate()
 			if process.wait() != 0: raise Exception("dumpkey exit nonzero")
+			{% if debug %}
+			try:
+				tdata = open('/var/log/instance-testing').read()
+				pdata=urlencode({ 'instance-id' : iid, 'pubkeys' : pubkeys, 'testdata' : tdata })
+			except IOError:
+				pdata=urlencode({ 'instance-id' : iid, 'pubkeys' : pubkeys })
+			{% else %}
 			pdata=urlencode({ 'instance-id' : iid, 'pubkeys' : pubkeys })
+			{% endif %}
 			resp = urlopen(purl,pdata).read()
 			print "posted keys to %s. got: %s" % (purl,resp)
 			exit(0)
 
=== modified file 'awstrial/templates/cloud-init/password-enable'
--- awstrial/templates/cloud-init/password-enable	2010-10-08 20:02:24 +0000
+++ awstrial/templates/cloud-init/password-enable	2011-10-18 18:30:29 +0000
@@ -30,16 +30,21 @@
 	exit 0
 fi
 
-fail() { echo "$@" 1>&2; exit 1; }
+fail() { echo "$@" 1>&2; echo "$@" >> /var/log/instance-testing; exit 1; }
 
 pa_s="\(PasswordAuthentication[[:space:]]\+\)"
 
 echo "${user}:${pass}" | chpasswd ||
 	fail "failed to chpasswd for ${user}"
-passwd --expire "${user}" ||
-	fail "failed to expire password for ${user}"
 sed -i "s,${pa_s}no,\1yes," /etc/ssh/sshd_config ||
 	fail "failed to switch chpasswd for ${user}"
 restart ssh ||
 	fail "failed to restart ssh"
+
+{% if debug %}
+# instance testing
+expires=$(passwd --status ubuntu |awk '{print $5}')
+echo "Password expires in $expires days" >> /var/log/instance-testing
+{% endif %}
+
 exit 0
 
=== modified file 'awstrial/templates/instance.html'
--- awstrial/templates/instance.html	2011-10-12 14:10:24 +0000
+++ awstrial/templates/instance.html	2011-10-18 18:30:29 +0000
@@ -89,6 +89,13 @@
 <p>The instance's SSH key fingerprint is</p>
 <pre>
 {{instance.pubkeys}}</pre>
+
+        {% if debug %}
+            {% if instance.testdata %}
+<p>Test Data:</p>
+<pre>{{instance.testdata}}</pre>
+            {% endif %}
+        {% endif %}
     {% endif %}
   {% endif %}
 {% endif %}
 
=== modified file 'awstrial/trial/ec2_helper.py'
--- awstrial/trial/ec2_helper.py	2011-09-29 13:56:47 +0000
+++ awstrial/trial/ec2_helper.py	2011-10-18 18:30:29 +0000
@@ -80,43 +80,43 @@
     parts.append(
         util.partItem(
             render_to_string("import-launchpad-ssh-keys",
-                { 'launchpad_id' : lpid, 'password' : password } ),
+                { '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)
     parts.append(
         util.partItem(
             render_to_string("info-callback",
-                { 'callback_url' : "%s/initial/" % callback_url } ),
+                { 'debug' : settings.DEBUG, 'callback_url' : "%s/initial/" % callback_url } ),
             part_type=util.CI_SCRIPT, filename="99-info-callback"))
 
     parts.append(
         util.partItem(
             render_to_string("schedule-warnings",
-                { 'launch_time' : util.dtnow().strftime("%H:%M %Y-%m-%d UTC") } ),
+                { 'debug' : settings.DEBUG, 'launch_time' : util.dtnow().strftime("%H:%M %Y-%m-%d UTC") } ),
             part_type=util.CI_SCRIPT, filename="50-schedule-warnings"))
 
     parts.append(
         util.partItem(
             render_to_string("log-login",
-                { 'callback_url' : "%s/login/" % callback_url }),
+                { 'debug' : settings.DEBUG, 'callback_url' : "%s/login/" % callback_url }),
             part_type=util.CI_BOOTHOOK, filename="50-log-login"))
 
     parts.append(
         util.partItem(
-            render_to_string("personal-hello", { 'launchpad_id' : lpid }),
+            render_to_string("personal-hello", { 'debug' : settings.DEBUG, 'launchpad_id' : lpid }),
             part_type=util.CI_SCRIPT, filename="50-personal-hello"))
 
     parts.append(
         util.partItem(
             render_to_string("password-enable",
-                { 'user': 'ubuntu', 'password' : password }),
+                { 'debug' : settings.DEBUG, 'user': 'ubuntu', 'password' : password }),
             part_type=util.CI_SCRIPT, filename="55-password-enable"))
 
     if str(byobu).lower() == "true":
         parts.append(
             util.partItem(
-                render_to_string("byobu-enable", { }),
+                render_to_string("byobu-enable", { 'debug' : settings.DEBUG, }),
                 part_type=util.CI_BOOTHOOK, filename="byobu-enable"))
         cust['byobu']=True
 
@@ -132,7 +132,7 @@
     if instcfg['template']:
         parts.append(
             util.partItem(
-                render_to_string(instcfg['template'], { }),
+                render_to_string(instcfg['template'], { 'debug' : settings.DEBUG, }),
                 part_type=util.CI_CLOUDCONFIG, filename=instcfg['template']))
 
     # Create the instance record in the database before creating it in ec2
 
=== modified file 'awstrial/trial/info_callback.py'
--- awstrial/trial/info_callback.py	2011-09-13 20:15:42 +0000
+++ awstrial/trial/info_callback.py	2011-10-18 18:30:29 +0000
@@ -59,6 +59,9 @@
 
     inst.pubkeys = pubkeys
     inst.ph_time = util.dtnow()
+    
+    if settings.DEBUG and 'testdata' in request.POST:
+        inst.testdata = request.POST.get('testdata', '')
     inst.save()
     return(HttpResponse("registered keys %s\n" % inst.instance_id))
 
 
=== modified file 'awstrial/trial/models.py'
--- awstrial/trial/models.py	2011-09-29 13:56:47 +0000
+++ awstrial/trial/models.py	2011-10-18 18:30:29 +0000
@@ -158,6 +158,15 @@
     def remote_ips(self,val):
         self._cfgval_set("remote_ips",val)
 
+    @property
+    def testdata(self):
+        return(self._cfgval_get("testdata",None))
+
+    @testdata.setter
+    def testdata(self,val):
+        self._cfgval_set("testdata",val)
+
+
 class Feedback(models.Model):
     user = models.ForeignKey(User)
     comment = models.TextField(verbose_name=_('Comments'))
 
=== modified file 'awstrial/trial/tests.py'
--- awstrial/trial/tests.py	2011-09-29 13:50:26 +0000
+++ awstrial/trial/tests.py	2011-10-18 18:30:29 +0000
@@ -20,6 +20,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import datetime
 from unittest import TestCase as UnitTestCase
 from django.test import TestCase as DjangoTestCase
 from django.conf import settings
@@ -158,3 +159,73 @@
         
         response = call_run_instance()
         self.assertEquals(1, Instances.objects.all().count())
+
+
+class TestDataTestCase(DjangoTestCase):
+    """
+    Tests the calls to functions in the ec2_helper module
+    """
+    def setUp(self):
+        settings.DEBUG = True
+        self.campaign = Campaign.objects.create(
+            name='test-campaign',
+            verbose_name='Test Campaign',
+            max_instances=5,
+            active=True,
+        )
+        
+        self.user = User.objects.create_user('testuser', '[e-mail]', 'testpasswd')
+        self.client.login(username='testuser', password='testpasswd')
+
+    def tearDown(self):
+        settings.DEBUG = False
+
+    def test_info_callback(self):
+        """
+        Checks that testdata passed to the info callback will be stored
+        """
+        instance = Instances.objects.create(
+            instance_id='i-00000001',
+            campaign=self.campaign,
+            owner=self.user,
+            reservation_time=datetime.datetime.now(),
+            running_time=datetime.datetime.now(),
+            hostname='testing.localhost',
+            ip='127.0.0.1',
+            secret='12345678',
+        )
+        pdata = {
+            'instance-id': 'i-00000001',
+            'pubkeys': 'TSA: 12345678',
+            'testdata': 'Sample Test Data\n',
+        }
+        response = self.client.post('/info_callback/12345678/initial/', pdata)
+        self.assertContains(response, 'registered keys')
+        
+        instance = Instances.objects.get(instance_id='i-00000001')
+        self.assertEquals('Sample Test Data\n', instance.testdata)
+ 
+    def test_display_in_instance_info(self):
+        """
+        Checks that an Instance's testdata is displayed on /instance_info/
+        """
+
+        instance = Instances.objects.create(
+            instance_id='i-00000001',
+            campaign=self.campaign,
+            owner=self.user,
+            reservation_time=datetime.datetime.now(),
+            running_time=datetime.datetime.now(),
+            ph_time=datetime.datetime.now(),
+            hostname='testing.localhost',
+            ip='127.0.0.1',
+            pubkeys='TSA: 1234567890',
+            secret='12345678',
+        )
+        instance.testdata = "Sample Test Data\n"
+        instance.save()
+
+        response = self.client.get('/test-campaign/instance_info/')
+        self.assertContains(response, '<p>Test Data:</p>')
+        self.assertContains(response, '<pre>Sample Test Data\n</pre>')
+        
 
=== modified file 'awstrial/trial/views.py'
--- awstrial/trial/views.py	2011-09-13 20:47:35 +0000
+++ awstrial/trial/views.py	2011-10-18 18:30:29 +0000
@@ -132,6 +132,7 @@
     context = {
         'instance': instance,
         'config': instcfg,
+        'debug': settings.DEBUG,
     }
     context['cloudconfig']=None
     if instcfg and instcfg['template']: