Changeset 1666:f575ab714505

Timestamp:

06/20/08 17:16:32 (2 months ago)

Author:

hadoopsandholm@…

Branch:

default

Message:

fixed compliance issued with EC2 protosol to support firefox plugin

Location:

src/grid/hadoop/ec2

Files:

• aws-server (modified) (10 diffs)
• ec2ui.jar (added)

src/grid/hadoop/ec2/aws-server

@@ -80 +80 @@
         """
         self.send_response(200)
-        self.send_header("Content-type", "text/plain")
+        self.send_header("Content-type", "text/xml")
         self.end_headers()
 
@@ -91 +91 @@
         self.end_headers()
 
+    def method_DescribeAvailabilityZones(self, options):
+        self.text_headers()
+        self.wfile.write('<DescribeAvailabilityZonesResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\"\>\n')
+
+    def method_DescribeKeyPairs(self, options):
+        self.text_headers()
+        self.wfile.write('<DescribeKeyPairsResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\"\>\n')
+
+    def method_DescribeSecurityGroups(self, options):
+        self.text_headers()
+        self.wfile.write('<DescribeSecurityGroupsResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\"\>\n')
+
     def method_DescribeImages(self, options):
         cmd = "tycoon_hadoop get-images"
@@ -103 +115 @@
         images = stdout.read().split('\n')
         hadoop_image = 'centos.5-0.gridmix.0-15-0.ext3.bz2'
-        self.wfile.write('<DescribeImagesResponse hadoopimage=\"%s\" xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01\">\n' % hadoop_image)
+        self.wfile.write('<DescribeImagesResponse hadoopimage=\"%s\" xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\">\n' % hadoop_image)
+        self.wfile.write('<imagesSet>\n')
         for image in images:
             if image == "":
                 continue
             self.wfile.write('<item>\n')
-            self.wfile.write('<imageId>%s</imageId>"/>\n' % image)
+            self.wfile.write('<imageId>ami-%s</imageId>"/>\n' % image)
+            self.wfile.write('<imageLocation>http://tycoon.hpl.hp.com/~tycoon/dl/images</imageLocation>"/>\n')
             self.wfile.write('<imageState>available</imageState>"/>\n')
-            self.wfile.write('<imageLocation>http://tycoon.hpl.hp.com/~tycoon/dl/images</imageLocation>"/>\n')
             self.wfile.write('<imageOwnerId>tycoon</imageOwnerId>"/>\n')
             self.wfile.write('<isPublic>true</isPublic>"/>\n')
@@ -118 +131 @@
             self.wfile.write('<kernelId>0</kernelId>\n')
             self.wfile.write('</item>\n')
+        self.wfile.write('</imagesSet>\n')
         self.wfile.write('</DescribeImagesResponse>\n')
 
@@ -128 +142 @@
                 config = "nodes " + options['MaxCount'] + '\n'
             elif line.split(' ')[0] == "image_file":
+                if options['ImageId'].startswith('ami-'):
+                    options['ImageId'] = options['ImageId'].split('ami-')[1]
                 config = "image_file " + options['ImageId'] + '\n'
             else:
@@ -145 +161 @@
                     return
         self.text_headers()
-        self.wfile.write('<RunInstancesResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01\">\n')
-        self.wfile.write('<reservationId>0</reservationId>\n')
+        self.wfile.write('<RunInstancesResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\">\n')
+        self.wfile.write('<reservationId>r-0</reservationId>\n')
         self.wfile.write('<ownerId>%s</ownerId>\n' % options['AWSAccessKeyId'])
         self.wfile.write('<groupSet><item><groupId>default</groupId></item></groupSet>\n')
@@ -153 +169 @@
         for i in range(0,n):
             self.wfile.write('<item>')    
-            self.wfile.write('<instanceId>%d</instanceId>' % i)    
+            self.wfile.write('<instanceId>i-%d</instanceId>' % i)    
             self.wfile.write('<imageId>%s</imageId>' % options['ImageId'])    
             self.wfile.write('<instanceState><code>0</code><name>pending</name></instanceState>')    
-            self.wfile.write('<privateDnsName/><dnsName/><keyName/><amiLaunchIndex/><instanceType>m1.small</instanceType><launchTime>%s</launchTime><placement/>' % time.strftime('%Y-%m-%dT%H:%M:%S-0008'))
+            self.wfile.write('<privateDnsName/><dnsName/><keyName/><amiLaunchIndex/><instanceType>m1.small</instanceType><launchTime>%s</launchTime><placement><availabilityZone>HPL-PA</availabilityZone></placement>' % time.strftime('%Y-%m-%dT%H:%M:%S-0008'))
             self.wfile.write('</item>\n')    
         self.wfile.write('</instancesSet>\n')
@@ -183 +199 @@
         i = 0
         self.text_headers()
-        self.wfile.write('<TerminateInstancesResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01\">\n')
+        self.wfile.write('<TerminateInstancesResponse xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\">\n')
+        self.wfile.write('<instancesSet>\n')
         for slave in slaves:
             if slave.strip() == "":
                 continue
-            self.wfile.write('<item><instanceId>%d</instanceId></item>\n' % i)
+            self.wfile.write('<item><instanceId>i-%d</instanceId></item>\n' % i)
             i += 1
+        self.wfile.write('</instancesSet>\n')
         self.wfile.write('</TerminateInstancesResponse>\n')
 
@@ -244 +262 @@
         self.text_headers()
         streamjar = "/home/guest/hadoop/build/contrib/streaming/hadoop-streaming.jar"
-        self.wfile.write('<DescribeInstancesResponse master=\"%s\" streamjar=\"%s\" status=\"%s\" xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01\">\n' % (master,streamjar,status))
+        self.wfile.write('<DescribeInstancesResponse master=\"%s\" streamjar=\"%s\" status=\"%s\" xmlns=\"http://ec2.amazonaws.com/doc/2008-02-01/\">\n' % (master,streamjar,status))
         self.wfile.write('<reservationSet>\n')
         self.wfile.write('<item>\n')
-        self.wfile.write('<reservationId>0</reservationId>\n')
+        self.wfile.write('<reservationId>r-0</reservationId>\n')
         self.wfile.write('<ownerId>%s</ownerId>\n' % options['AWSAccessKeyId'])
         self.wfile.write('<groupSet><item><groupId>default</groupId></item></groupSet>\n')
@@ -259 +277 @@
                 continue
             self.wfile.write('<item>')    
-            self.wfile.write('<instanceId>%d</instanceId>' % i)    
+            self.wfile.write('<instanceId>i-%d</instanceId>' % i)    
             self.wfile.write('<imageId>%s</imageId>' % image)    
             self.wfile.write('<instanceState><code>0</code><name>%s</name></instanceState>' % aws_status)    
-            self.wfile.write('<privateDnsName>%s</privateDnsName><dnsName>%s</dnsName>' % (slaves[i],master))
-            self.wfile.write('<keyName/><amiLaunchIndex/><instanceType>m1.small</instanceType><launchTime>%s</launchTime><placement/>' % launch)
+            self.wfile.write('<privateDnsName>%s</privateDnsName><dnsName>%s</dnsName>' % (master,slaves[i]))
+            self.wfile.write('<keyName/><amiLaunchIndex/><instanceType>m1.small</instanceType><launchTime>%s</launchTime><placement><availabilityZone>HPL-PA</availabilityZone></placement>' % launch)
             self.wfile.write('</item>\n')    
         self.wfile.write('</instancesSet>\n')