newrelic-amazon-ec2 0.6.2

data/test/test_EC2_volumes.rb

@@ -0,0 +1,142 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library, EBS volumes support
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Yann Klis  (mailto:yann.klis@novelys.com)
+# Copyright:: Copyright (c) 2008 Yann Klis
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "EC2 volumes " do
+
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_volumes_response_body = <<-RESPONSE
+    <DescribeVolumesResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeSet>
+        <item>
+          <volumeId>vol-4282672b</volumeId>
+          <size>800</size>
+          <status>in-use</status>
+          <createTime>2008-05-07T11:51:50.000Z</createTime>
+          <attachmentSet>
+            <item>
+              <volumeId>vol-4282672b</volumeId>
+              <instanceId>i-6058a509</instanceId>
+              <size>800</size>
+              <status>attached</status>
+              <attachTime>2008-05-07T12:51:50.000Z</attachTime>
+            </item>
+          </attachmentSet>
+        </item>
+      </volumeSet>
+    </DescribeVolumesResponse>
+    RESPONSE
+
+    @create_volume_response_body = <<-RESPONSE
+    <CreateVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <size>800</size>
+      <status>creating</status>
+      <createTime>2008-05-07T11:51:50.000Z</createTime>
+      <zone>us-east-1a</zone>
+      <snapshotId></snapshotId>
+    </CreateVolumeResponse>
+    RESPONSE
+
+    @delete_volume_response_body = <<-RESPONSE
+    <ReleaseAddressResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <return>true</return>
+    </ReleaseAddressResponse>
+    RESPONSE
+
+    @attach_volume_response_body = <<-RESPONSE
+    <AttachVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <instanceId>i-6058a509</instanceId>
+      <device>/dev/sdh</device>
+      <status>attaching</status>
+      <attachTime>2008-05-07T11:51:50.000Z</attachTime>
+    </AttachVolumeResponse>
+    RESPONSE
+
+    @detach_volume_response_body = <<-RESPONSE
+    <DetachVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <instanceId>i-6058a509</instanceId>
+      <device>/dev/sdh</device>
+      <status>detaching</status>
+      <attachTime>2008-05-08T11:51:50.000Z</attachTime>
+    </DetachVolumeResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should be able to be described with describe_volumes" do
+    @ec2.stubs(:make_request).with('DescribeVolumes', {"VolumeId.1"=>"vol-4282672b"}).
+      returns stub(:body => @describe_volumes_response_body, :is_a? => true)
+
+    @ec2.describe_volumes( :volume_id => ["vol-4282672b"] ).should.be.an.instance_of Hash
+
+    response = @ec2.describe_volumes( :volume_id => ["vol-4282672b"] )
+    response.volumeSet.item[0].volumeId.should.equal "vol-4282672b"
+    response.volumeSet.item[0].attachmentSet.item[0]['size'].should.equal "800"
+    response.volumeSet.item[0].attachmentSet.item[0].volumeId.should.equal "vol-4282672b"
+    response.volumeSet.item[0].attachmentSet.item[0].instanceId.should.equal "i-6058a509"
+  end
+
+  specify "should be able to be created with an availability_zone with size" do
+    @ec2.stubs(:make_request).with('CreateVolume', {"AvailabilityZone" => "us-east-1a", "Size"=>"800", "SnapshotId"=>""}).
+      returns stub(:body => @create_volume_response_body, :is_a? => true)
+
+    @ec2.create_volume( :availability_zone => "us-east-1a", :size => "800" ).should.be.an.instance_of Hash
+
+    response = @ec2.create_volume( :availability_zone => "us-east-1a", :size => "800" )
+    response.volumeId.should.equal "vol-4d826724"
+    response['size'].should.equal "800"
+    response.status.should.equal "creating"
+    response.zone.should.equal "us-east-1a"
+  end
+
+  specify "should be able to be deleted with a volume_id" do
+    @ec2.stubs(:make_request).with('DeleteVolume', {"VolumeId" => "vol-4282672b"}).
+      returns stub(:body => @delete_volume_response_body, :is_a? => true)
+
+    @ec2.delete_volume( :volume_id => "vol-4282672b" ).should.be.an.instance_of Hash
+
+    response = @ec2.delete_volume( :volume_id => "vol-4282672b" )
+    response.return.should.equal "true"
+  end
+
+  specify "should be able to be attached with a volume_id with an instance_id with a device" do
+    @ec2.stubs(:make_request).with('AttachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"/dev/sdh"}).
+      returns stub(:body => @attach_volume_response_body, :is_a? => true)
+
+    @ec2.attach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :device => "/dev/sdh" ).should.be.an.instance_of Hash
+
+    response = @ec2.attach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :device => "/dev/sdh" )
+    response.volumeId.should.equal "vol-4d826724"
+    response.instanceId.should.equal "i-6058a509"
+    response.device.should.equal "/dev/sdh"
+    response.status.should.equal "attaching"
+  end
+
+  specify "should be able to be detached with a volume_id with an instance_id" do
+    @ec2.stubs(:make_request).with('DetachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"", "Force"=>""}).
+      returns stub(:body => @detach_volume_response_body, :is_a? => true)
+
+    @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509" ).should.be.an.instance_of Hash
+
+    response = @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509" )
+    response.volumeId.should.equal "vol-4d826724"
+    response.instanceId.should.equal "i-6058a509"
+    response.device.should.equal "/dev/sdh"
+    response.status.should.equal "detaching"
+  end
+
+end

data/test/test_ELB_load_balancers.rb

@@ -0,0 +1,239 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "elb load balancers " do
+  before do
+    @elb = AWS::ELB::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @valid_create_load_balancer_params = {
+      :load_balancer_name => 'Test Name',
+      :availability_zones => ['east-1a'],
+      :listeners => [{:protocol => 'HTTP', :load_balancer_port => '80', :instance_port => '80'}]
+    }
+
+    @create_load_balancer_response_body = <<-RESPONSE
+    <CreateLoadBalancerResult>
+      <DNSName>TestLoadBalancer-380544827.us-east-1.ec2.amazonaws.com</DNSName>
+    </CreateLoadBalancerResult>
+    RESPONSE
+
+    @valid_delete_load_balancer_params = {
+      :load_balancer_name => 'Test Name'
+    }
+
+    @delete_load_balancer_response_body = <<-RESPONSE
+    <DeleteLoadBalancerResult>
+      <return>true</return>
+    </DeleteLoadBalancerResult>
+    RESPONSE
+
+    @valid_describe_load_balancer_params = {
+    }
+
+    @describe_load_balancer_response_body = <<-RESPONSE
+    <DescribeLoadBalancersResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2009-05-15/">
+      <DescribeLoadBalancersResult>
+        <LoadBalancerDescriptions>
+          <member>
+            <Listeners>
+              <member>
+                <Protocol>HTTP</Protocol>
+                <LoadBalancerPort>80</LoadBalancerPort>
+                <InstancePort>80</InstancePort>
+              </member>
+            </Listeners>
+            <CreatedTime>2009-07-02T01:07:55.080Z</CreatedTime>
+            <LoadBalancerName>TestLB</LoadBalancerName>
+            <DNSName>TestLB-1459724896.us-east-1.elb.amazonaws.com</DNSName>
+            <HealthCheck>
+              <Interval>30</Interval>
+              <Target>TCP:80</Target>
+              <HealthyThreshold>10</HealthyThreshold>
+              <Timeout>5</Timeout>
+              <UnhealthyThreshold>2</UnhealthyThreshold>
+            </HealthCheck>
+            <Instances/>
+            <AvailabilityZones>
+              <member>us-east-1a</member>
+            </AvailabilityZones>
+          </member>
+        </LoadBalancerDescriptions>
+      </DescribeLoadBalancersResult>
+      <ResponseMetadata>
+        <RequestId>67dd800e-66a5-11de-b844-07deabfcc881</RequestId>
+      </ResponseMetadata>
+    </DescribeLoadBalancersResponse>
+    RESPONSE
+
+    @valid_register_instances_with_load_balancer_params = {
+      :load_balancer_name => 'Test Name',
+      :instances => ['i-6055fa09']
+    }
+
+    @register_instances_with_load_balancer_response_body = <<-RESPONSE
+    <RegisterInstancesWithLoadBalancerResult>
+    	    <Instances>
+    		      <member>
+    			        <InstanceId>i-6055fa09</InstanceId>
+    		      </member>
+    	    </Instances>
+    </RegisterInstancesWithLoadBalancerResult>
+    RESPONSE
+
+    @valid_deregister_instances_from_load_balancer_params = @valid_register_instances_with_load_balancer_params
+    @deregister_instances_from_load_balancer_response_body = <<-RESPONSE
+    <DeregisterInstancesFromLoadBalancerResult>
+    	<Instances/>
+    </DeregisterInstancesFromLoadBalancerResult>
+    RESPONSE
+
+    @valid_configure_health_check_params = {
+      :load_balancer_name => 'Test Name',
+      :health_check => {
+        :target   => 'HTTP:80/servlets-examples/servlet/',
+        :timeout  => '2',
+        :interval => '5',
+        :unhealthy_threshold => '2',
+        :healthy_threshold   =>  '2'
+      }
+    }
+    @configure_health_check_response_body = <<-RESPONSE
+    <ConfigureHealthCheckResult>
+    	<HealthCheck>
+    		<Interval>5</Interval>
+    		<Target>HTTP:80/servlets-examples/servlet/</Target>
+    		<HealthyThreshold>2</HealthyThreshold>
+    		<Timeout>2</Timeout>
+    		<UnhealthyThreshold>2</UnhealthyThreshold>
+    	</HealthCheck>
+    </ConfigureHealthCheckResult>
+    RESPONSE
+  end
+
+  specify "should be able to be created" do
+    @elb.stubs(:make_request).with('CreateLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'AvailabilityZones.member.1' => 'east-1a',
+      'Listeners.member.1.Protocol' => 'HTTP',
+      'Listeners.member.1.LoadBalancerPort' => '80',
+      'Listeners.member.1.InstancePort' => '80'
+    }).returns stub(:body => @create_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.create_load_balancer(@valid_create_load_balancer_params)
+    response.should.be.an.instance_of Hash
+    response.DNSName.should.equal "TestLoadBalancer-380544827.us-east-1.ec2.amazonaws.com"
+  end
+
+  specify "method create_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('CreateLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'AvailabilityZones.member.1' => 'east-1a',
+      'Listeners.member.1.Protocol' => 'HTTP',
+      'Listeners.member.1.LoadBalancerPort' => '80',
+      'Listeners.member.1.InstancePort' => '80'
+    }).returns stub(:body => @create_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:load_balancer_name=>'')) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:availability_zones=>'')) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:availability_zones=>[])) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:listeners=>[])) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.create_load_balancer(@valid_create_load_balancer_params.merge(:listeners=>nil)) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to be deleted with delete_load_balancer" do
+    @elb.stubs(:make_request).with('DeleteLoadBalancer', {'LoadBalancerName' => 'Test Name'}).
+      returns stub(:body => @delete_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.delete_load_balancer( :load_balancer_name => "Test Name" )
+    response.should.be.an.instance_of Hash
+    response.return.should.equal "true"
+  end
+
+  specify "should be able to be described with describe_load_balancer" do
+    @elb.stubs(:make_request).with('DescribeLoadBalancers', {}).
+      returns stub(:body => @describe_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.describe_load_balancers()
+    response.should.be.an.instance_of Hash
+
+    response.DescribeLoadBalancersResult.LoadBalancerDescriptions.member.length.should == 1
+  end
+
+  specify "should be able to be register instances to load balancers with register_instances_with_load_balancer" do
+    @elb.stubs(:make_request).with('RegisterInstancesWithLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1.InstanceId' => 'i-6055fa09'
+    }).returns stub(:body => @register_instances_with_load_balancer_response_body, :is_a? => true)
+
+    response = @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params)
+    response.should.be.an.instance_of Hash
+
+    response.Instances.member.length.should == 1
+  end
+
+  specify "method register_instances_with_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('RegisterInstancesWithLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1.InstanceId' => 'i-6055fa09'
+    }).returns stub(:body => @register_instances_with_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:instances=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.register_instances_with_load_balancer(@valid_register_instances_with_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+    @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+     }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
+
+     response = @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params)
+     response.should.be.an.instance_of Hash
+  end
+
+  specify "method deregister_instances_from_load_balancer should reject bad arguments" do
+    @elb.stubs(:make_request).with('DeregisterInstancesFromLoadBalancer', {
+      'LoadBalancerName' => 'Test Name',
+      'Instances.member.1' => 'i-6055fa09'
+    }).returns stub(:body => @deregister_instances_from_load_balancer_response_body, :is_a? => true)
+
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:instances=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.deregister_instances_from_load_balancer(@valid_deregister_instances_from_load_balancer_params.merge(:instances=>[])) }.should.raise(AWS::ArgumentError)
+  end
+
+  specify "should be able to degresiter instances from load balancers with degregister_instances_from_load_balancer" do
+    @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    response = @elb.configure_health_check(@valid_configure_health_check_params)
+    response.should.be.an.instance_of Hash
+  end
+
+  specify "method degregister_instances_from_load_balancer should reject bad arguments" do
+   @elb.stubs(:make_request).with('ConfigureHealthCheck', {
+      'LoadBalancerName' => 'Test Name',
+      'HealthCheck.Interval' => '5',
+      'HealthCheck.Target' => 'HTTP:80/servlets-examples/servlet/',
+      'HealthCheck.HealthyThreshold' => '2',
+      'HealthCheck.Timeout' => '2',
+      'HealthCheck.UnhealthyThreshold' => '2'
+    }).returns stub(:body => @configure_health_check_response_body, :is_a? => true)
+
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params) }.should.not.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:load_balancer_name=>nil)) }.should.raise(AWS::ArgumentError)
+    lambda { @elb.configure_health_check(@valid_configure_health_check_params.merge(:health_check=>nil)) }.should.raise(AWS::ArgumentError)
+  end
+
+end
+

data/test/test_helper.rb

@@ -0,0 +1,23 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
+# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+require 'rubygems'
+gem 'test-unit'
+
+%w[ test/unit test/spec mocha ].each { |f|
+  begin
+    require f
+  rescue LoadError
+    abort "Unable to load required gem for test: #{f}"
+  end
+}
+
+require File.dirname(__FILE__) + '/../lib/AWS'
+

data/wsdl/2007-08-29.ec2.wsdl

@@ -0,0 +1,1269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://ec2.amazonaws.com/doc/2007-08-29/"
+	targetNamespace="http://ec2.amazonaws.com/doc/2007-08-29/">
+
+	<types>
+		<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+			   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			   xmlns:tns="http://ec2.amazonaws.com/doc/2007-08-29/"
+			   targetNamespace="http://ec2.amazonaws.com/doc/2007-08-29/"    
+			   elementFormDefault="qualified">
+		  
+		  <xs:annotation>
+		    <xs:documentation xml:lang="en">
+		      
+		    </xs:documentation>
+		  </xs:annotation>
+		  
+		  <!-- RegisterImage request definitions -->
+		  
+		  <xs:element name="RegisterImage" type="tns:RegisterImageType"/>
+		
+		  <xs:complexType name="RegisterImageType">
+		    <xs:sequence>
+		      <xs:element name="imageLocation" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RegisterImage response definitions -->
+		
+		  <xs:element name="RegisterImageResponse" type="tns:RegisterImageResponseType"/>
+		  <xs:complexType name="RegisterImageResponseType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeregisterImage request definitions -->
+		
+		  <xs:element name="DeregisterImage" type="tns:DeregisterImageType"/>
+		
+		  <xs:complexType name="DeregisterImageType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeregisterImage response definitions -->
+		
+		  <xs:element name="DeregisterImageResponse" type="tns:DeregisterImageResponseType"/>
+		
+		  <xs:complexType name="DeregisterImageResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- CreateKeyPair request definitions -->
+		  
+		  <xs:element name="CreateKeyPair" type="tns:CreateKeyPairType"/>
+		
+		  <xs:complexType name="CreateKeyPairType">
+		    <xs:sequence>
+		      <xs:element name="keyName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- CreateKeyPair response definitions -->
+		
+		  <xs:element name="CreateKeyPairResponse" type="tns:CreateKeyPairResponseType"/>
+		  
+		  <xs:complexType name="CreateKeyPairResponseType">
+		    <xs:sequence>
+		      <xs:element name="keyName" type="xs:string"/>
+		      <xs:element name="keyFingerprint" type="xs:string"/>
+		      <xs:element name="keyMaterial" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeleteKeyPair request definitions -->
+		  
+		  <xs:element name="DeleteKeyPair" type="tns:DeleteKeyPairType" />
+		
+		  <xs:complexType name="DeleteKeyPairType">
+		    <xs:sequence>
+		      <xs:element name="keyName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeleteKeyPair response definitions -->
+		
+		  <xs:element name="DeleteKeyPairResponse" type="tns:DeleteKeyPairResponseType"/>
+		  
+		  <xs:complexType name="DeleteKeyPairResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeKeyPairs Request definitions -->
+		
+		  <xs:element name="DescribeKeyPairs" type="tns:DescribeKeyPairsType"/>
+		
+		  <xs:complexType name="DescribeKeyPairsType">
+		    <xs:sequence>
+		      <xs:element name="keySet" type="tns:DescribeKeyPairsInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeKeyPairsInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeKeyPairsItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeKeyPairsItemType">
+		    <xs:sequence>
+		      <xs:element name="keyName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeKeyPairs Response definitions -->
+		
+		  <xs:element name="DescribeKeyPairsResponse" type="tns:DescribeKeyPairsResponseType"/>
+		  
+		  <xs:complexType name="DescribeKeyPairsResponseType">
+		    <xs:sequence>
+		      <xs:element name="keySet" type="tns:DescribeKeyPairsResponseInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeKeyPairsResponseInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeKeyPairsResponseItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeKeyPairsResponseItemType">
+		    <xs:sequence>
+		      <xs:element name="keyName" type="xs:string" />
+		      <xs:element name="keyFingerprint" type="xs:string" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RunInstances request definitions -->
+		
+		  <xs:element name="RunInstances" type="tns:RunInstancesType"/>
+		
+		  <xs:complexType name="RunInstancesType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string"/>
+		      <xs:element name="minCount" type="xs:int"/>
+		      <xs:element name="maxCount" type="xs:int"/>
+		      <xs:element name="keyName" type="xs:string" minOccurs="0" />
+		      <xs:element name="groupSet" type="tns:GroupSetType"/>
+		      <xs:element name="additionalInfo" type="xs:string" minOccurs="0"/>
+		      <xs:element name="userData" type="tns:UserDataType" minOccurs="0" maxOccurs="1"/>
+		      <xs:element name="addressingType" type="xs:string" minOccurs="0" maxOccurs="1"/>
+		      <xs:element name="instanceType" type="xs:string" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="GroupSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:GroupItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="GroupItemType">
+		    <xs:sequence>
+		      <xs:element name="groupId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="UserDataType" mixed="true">
+		    <xs:sequence>
+		      <xs:element name="data" type="xs:string"/>
+		    </xs:sequence>
+		    <xs:attribute name="version" type="xs:string" use="required" fixed="1.0"/>
+		    <xs:attribute name="encoding" type="xs:string" use="required" fixed="base64"/>
+		  </xs:complexType>
+		
+		  <!-- RunInstances response definitions -->
+		
+		  <xs:element name="RunInstancesResponse" type="tns:ReservationInfoType"/>
+		
+		  <xs:complexType name="ReservationInfoType">
+		    <xs:sequence>
+		      <xs:element name="reservationId" type="xs:string"/>
+		      <xs:element name="ownerId" type="xs:string"/>
+		      <xs:element name="groupSet" type="tns:GroupSetType"/>
+		      <xs:element name="instancesSet" type="tns:RunningInstancesSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="RunningInstancesSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:RunningInstancesItemType" minOccurs="1" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="RunningInstancesItemType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string"/>
+		      <xs:element name="imageId" type="xs:string"/>
+		      <xs:element name="instanceState" type="tns:InstanceStateType"/>
+		      <xs:element name="privateDnsName" type="xs:string"/>
+		      <xs:element name="dnsName" type="xs:string"/>
+		      <xs:element name="reason" type="xs:string" minOccurs="0"/>
+		      <xs:element name="keyName" type="xs:string" minOccurs="0"/>
+		      <xs:element name="amiLaunchIndex" type="xs:string" minOccurs="0" maxOccurs="1"/>
+		      <xs:element name="productCodes" type="tns:ProductCodesSetType" minOccurs="0" maxOccurs="1" />
+		      <xs:element name="instanceType" type="xs:string"/>
+		      <xs:element name="launchTime" type="xs:dateTime" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- GetConsoleOutput request definitions -->
+		
+		  <xs:element name="GetConsoleOutput" type="tns:GetConsoleOutputType"/>
+		
+		  <xs:complexType name="GetConsoleOutputType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- GetConsoleOutput response definitions -->
+		
+		  <xs:element name="GetConsoleOutputResponse" type="tns:GetConsoleOutputResponseType"/>
+		
+		  <xs:complexType name="GetConsoleOutputResponseType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string" />
+		  	  <xs:element name="timestamp" type="xs:dateTime" />
+		  	  <xs:element name="output" type="xs:string" />
+		  	</xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- TerminateInstances request definitions -->
+		
+		  <xs:element name="TerminateInstances" type="tns:TerminateInstancesType"/>
+		
+		  <xs:complexType name="TerminateInstancesType">
+		    <xs:sequence>
+		      <xs:element name="instancesSet" type="tns:TerminateInstancesInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="TerminateInstancesInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:TerminateInstancesItemType" minOccurs="1" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="TerminateInstancesItemType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- TerminateInstances response definitions -->
+		
+		  <xs:element name="TerminateInstancesResponse" type="tns:TerminateInstancesResponseType"/>
+		
+		  <xs:complexType name="TerminateInstancesResponseType">
+		    <xs:sequence>
+		      <xs:element name="instancesSet" type="tns:TerminateInstancesResponseInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="TerminateInstancesResponseInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:TerminateInstancesResponseItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="TerminateInstancesResponseItemType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string" />
+		      <xs:element name="shutdownState" type="tns:InstanceStateType" />
+		      <xs:element name="previousState" type="tns:InstanceStateType" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RebootInstances request definitions -->
+		  <xs:element name="RebootInstances" type="tns:RebootInstancesType"/>
+		
+		  <xs:complexType name="RebootInstancesType">
+		    <xs:sequence>
+		      <xs:element name="instancesSet" type="tns:RebootInstancesInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="RebootInstancesInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:RebootInstancesItemType" minOccurs="1" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="RebootInstancesItemType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RebootInstances response definitions -->
+		
+		  <xs:element name="RebootInstancesResponse" type="tns:RebootInstancesResponseType"/>
+		
+		  <xs:complexType name="RebootInstancesResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeInstances Request definitions -->
+		
+		  <xs:element name="DescribeInstances" type="tns:DescribeInstancesType"/>
+		
+		  <xs:complexType name="DescribeInstancesType">
+		    <xs:sequence>
+		      <xs:element name="instancesSet" type="tns:DescribeInstancesInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeInstancesInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeInstancesItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeInstancesItemType">
+		    <xs:sequence>
+		      <xs:element name="instanceId" type="xs:string" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeInstances Response definitions -->
+		
+		  <xs:element name="DescribeInstancesResponse" type="tns:DescribeInstancesResponseType"/>
+		  
+		  <xs:complexType name="DescribeInstancesResponseType">
+		    <xs:sequence>
+		      <xs:element name="reservationSet" type="tns:ReservationSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="ReservationSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:ReservationInfoType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeImages Request definitions -->
+		
+		  <xs:element name="DescribeImages" type="tns:DescribeImagesType"/>
+		
+		  <xs:complexType name="DescribeImagesType">
+		    <xs:sequence>
+		      <xs:element name="executableBySet" type="tns:DescribeImagesExecutableBySetType" minOccurs="0"/>
+		      <xs:element name="imagesSet" type="tns:DescribeImagesInfoType"/>
+		      <xs:element name="ownersSet" type="tns:DescribeImagesOwnersType" minOccurs="0"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeImagesInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeImagesItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeImagesItemType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="DescribeImagesOwnersType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeImagesOwnerType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeImagesOwnerType">
+		  	<xs:sequence>
+		  	  <xs:element name="owner" type="xs:string"/>
+		  	</xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="DescribeImagesExecutableBySetType" >
+		  	<xs:sequence>
+		  	  <xs:element name="item" type="tns:DescribeImagesExecutableByType" minOccurs="0" maxOccurs="unbounded"/>
+		  	</xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="DescribeImagesExecutableByType" >
+		    <xs:sequence>
+		      <xs:element name="user" type="xs:string" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeImages Response definitions -->
+		
+		  <xs:element name="DescribeImagesResponse" type="tns:DescribeImagesResponseType"/>
+		  
+		  <xs:complexType name="DescribeImagesResponseType">
+		    <xs:sequence>
+		      <xs:element name="imagesSet" type="tns:DescribeImagesResponseInfoType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeImagesResponseInfoType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeImagesResponseItemType" minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeImagesResponseItemType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string" />
+		      <xs:element name="imageLocation" type="xs:string" />
+		      <xs:element name="imageState" type="xs:string" />
+		      <xs:element name="imageOwnerId" type="xs:string" />
+		      <xs:element name="isPublic" type="xs:boolean" />
+		      <xs:element name="productCodes" type="tns:ProductCodesSetType" minOccurs="0" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- CreateSecurityGroup Request definitions -->
+		
+		  <xs:element name="CreateSecurityGroup" 
+			      type="tns:CreateSecurityGroupType"/>
+		
+		  <xs:complexType name="CreateSecurityGroupType">
+		    <xs:sequence>
+		      <xs:element name="groupName" type="xs:string"/>
+		      <xs:element name="groupDescription" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- CreateSecurityGroup Response definitions -->
+		
+		  <xs:element name="CreateSecurityGroupResponse" 
+			      type="tns:CreateSecurityGroupResponseType"/>
+		
+		  <xs:complexType name="CreateSecurityGroupResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeleteSecurityGroup Request definitions -->
+		
+		  <xs:element name="DeleteSecurityGroup" 
+			      type="tns:DeleteSecurityGroupType"/>
+		
+		  <xs:complexType name="DeleteSecurityGroupType">
+		    <xs:sequence>
+		      <xs:element name="groupName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DeleteSecurityGroup Response definitions -->
+		
+		  <xs:element name="DeleteSecurityGroupResponse" 
+			      type="tns:DeleteSecurityGroupResponseType"/>
+		
+		  <xs:complexType name="DeleteSecurityGroupResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeSecurityGroups Request definitions -->
+		
+		  <xs:element name="DescribeSecurityGroups" 
+			      type="tns:DescribeSecurityGroupsType"/>
+		
+		  <xs:complexType name="DescribeSecurityGroupsType">
+		    <xs:sequence>
+		      <xs:element name="securityGroupSet" type="tns:DescribeSecurityGroupsSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeSecurityGroupsSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:DescribeSecurityGroupsSetItemType"
+				  minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="DescribeSecurityGroupsSetItemType">
+		    <xs:sequence>
+		      <xs:element name="groupName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- DescribeSecurityGroups Response definitions -->
+		
+		  <xs:element name="DescribeSecurityGroupsResponse" 
+			      type="tns:DescribeSecurityGroupsResponseType"/>
+		
+		  <xs:complexType name="DescribeSecurityGroupsResponseType">
+		    <xs:sequence>
+		      <xs:element name="securityGroupInfo" type="tns:SecurityGroupSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="IpPermissionSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:IpPermissionType"
+				  minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="IpPermissionType">
+		    <xs:sequence>
+		      <xs:element name="ipProtocol" type="xs:string"/>
+		      <xs:element name="fromPort" type="xs:int"/>
+		      <xs:element name="toPort" type="xs:int"/>
+		      <xs:element name="groups" type="tns:UserIdGroupPairSetType"/>
+		      <xs:element name="ipRanges" type="tns:IpRangeSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="IpRangeSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:IpRangeItemType"
+				  minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="IpRangeItemType">
+		    <xs:sequence>
+		      <xs:element name="cidrIp" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="UserIdGroupPairSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:UserIdGroupPairType" 
+				  minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="UserIdGroupPairType">
+		    <xs:sequence>
+		      <xs:element name="userId" type="xs:string"/>
+		      <xs:element name="groupName" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="SecurityGroupSetType">
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:SecurityGroupItemType" 
+				  minOccurs="0" maxOccurs="unbounded"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="SecurityGroupItemType">
+		    <xs:sequence>
+		      <xs:element name="ownerId" type="xs:string"/>
+		      <xs:element name="groupName" type="xs:string"/>
+		      <xs:element name="groupDescription" type="xs:string"/>      
+		      <xs:element name="ipPermissions" type="tns:IpPermissionSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- AuthorizeSecurityGroupIngress Request definitions -->
+		
+		  <xs:annotation>
+		  	<xs:documentation xml:lang="en">
+		  		This API call should be treated as under development. The current API specification supports a richer
+		  		set of semantics than we intend to retain in future releases, and the details for this call are still under
+		  		review. Semantically, clients can depend on fine grained CIDR based access control (as currently exposed) but
+		  		for group based access control clients should only depend on the ability to control access for an entire
+		  		(user,group) tuple. Fine grained group based access control at the protocol and port or icmp code:type level
+		  		are not guaranteed to be supported in future releases of this API.
+		  	</xs:documentation>
+		  </xs:annotation>
+			  
+		  <xs:element name="AuthorizeSecurityGroupIngress" 
+			      type="tns:AuthorizeSecurityGroupIngressType"/>
+		
+		  <xs:complexType name="AuthorizeSecurityGroupIngressType">
+		    <xs:sequence>
+		      <xs:element name="userId" type="xs:string"/>
+		      <xs:element name="groupName" type="xs:string"/>
+		      <xs:element name="ipPermissions" type="tns:IpPermissionSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- AuthorizeSecurityGroupIngress Response definitions -->
+		
+		  <xs:element name="AuthorizeSecurityGroupIngressResponse" 
+			      type="tns:AuthorizeSecurityGroupIngressResponseType"/>
+		
+		  <xs:complexType name="AuthorizeSecurityGroupIngressResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RevokeSecurityGroupIngress Request definitions -->
+		
+		  <xs:annotation>
+		  	<xs:documentation xml:lang="en">
+		  		This API call should be treated as under development. The current API specification supports a richer
+		  		set of semantics than we intend to retain in future releases, and the details for this call are still under
+		  		review. Semantically, clients can depend on fine grained CIDR based access control (as currently exposed) but
+		  		for group based access control clients should only depend on the ability to control access for an entire
+		  		(user,group) tuple. Fine grained group based access control at the protocol and port or icmp code:type level
+		  		are not guaranteed to be supported in future releases of this API.
+		  	</xs:documentation>
+		  </xs:annotation>
+		
+		  <xs:element name="RevokeSecurityGroupIngress" 
+			      type="tns:RevokeSecurityGroupIngressType"/>
+		
+		  <xs:complexType name="RevokeSecurityGroupIngressType">
+		    <xs:sequence>
+		      <xs:element name="userId" type="xs:string"/>
+		      <xs:element name="groupName" type="xs:string"/>
+		      <xs:element name="ipPermissions" type="tns:IpPermissionSetType"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- RevokeSecurityGroupIngress Response definitions -->
+		
+		  <xs:element name="RevokeSecurityGroupIngressResponse" 
+			      type="tns:RevokeSecurityGroupIngressResponseType"/>
+		
+		  <xs:complexType name="RevokeSecurityGroupIngressResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- Instance state type definition -->
+		
+		  <xs:complexType name="InstanceStateType">
+		    <xs:sequence>
+		      <xs:element name="code" type="xs:int"/>
+		      <xs:element name="name" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <!-- ModifyImageAttribute Definitions -->
+		  
+		  <xs:element name="ModifyImageAttribute"
+		              type="tns:ModifyImageAttributeType"/>
+		  
+		  <xs:complexType name="ModifyImageAttributeType">
+		  	<xs:sequence>
+		  	  <xs:element name="imageId" type="xs:string"/>
+		  	  <xs:choice>
+		  	  	<xs:element name="launchPermission" type="tns:LaunchPermissionOperationType"/>
+		  	  	<xs:element name="productCodes" type="tns:ProductCodeListType" />
+		  	  </xs:choice>
+		  	</xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="LaunchPermissionOperationType">
+		    <xs:choice>
+		      <xs:element name="add" type="tns:LaunchPermissionListType"/>
+		      <xs:element name="remove" type="tns:LaunchPermissionListType"/>
+		    </xs:choice>
+		  </xs:complexType>
+		
+		  <xs:complexType name="LaunchPermissionListType">
+		  	<xs:sequence>
+		  	  <xs:element name="item" type="tns:LaunchPermissionItemType" minOccurs="0" maxOccurs="unbounded"/>
+		  	</xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="LaunchPermissionItemType">
+		    <xs:choice>
+		      <xs:element name="userId" type="xs:string"/>
+		      <xs:element name="group" type="xs:string" />
+		    </xs:choice>
+		  </xs:complexType>
+		
+		  <xs:complexType name="ProductCodeListType">
+		  	<xs:sequence>
+		  	  <xs:element name="item" type="tns:ProductCodeItemType" minOccurs="0" maxOccurs="unbounded"/>
+		  	</xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:complexType name="ProductCodeItemType">
+		    <xs:choice>
+		      <xs:element name="productCode" type="xs:string"/>
+		    </xs:choice>
+		  </xs:complexType>
+		
+		  <!-- ModifyImageAttributeResponse Definitions -->
+		
+		  <xs:element name="ModifyImageAttributeResponse"
+		              type="tns:ModifyImageAttributeResponseType" />
+		              
+		  <xs:complexType name="ModifyImageAttributeResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <!-- ResetImageAttribute Definitions -->
+		  
+		  <xs:element name="ResetImageAttribute"
+		              type="tns:ResetImageAttributeType" />
+		             
+		  <xs:complexType name="ResetImageAttributeType" >
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string"/>
+		      <xs:group ref="tns:ResetImageAttributesGroup"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:group name="ResetImageAttributesGroup" >
+		    <xs:choice>
+		      <xs:element name="launchPermission" type="tns:EmptyElementType"/>
+		    </xs:choice>
+		  </xs:group>
+		  
+		  <xs:complexType name="EmptyElementType">
+		  </xs:complexType>
+		
+		  <!-- ResetImageAttributeResponse Definitions -->
+		
+		  <xs:element name="ResetImageAttributeResponse"
+		              type="tns:ResetImageAttributeResponseType" />
+		
+		  <xs:complexType name="ResetImageAttributeResponseType">
+		    <xs:sequence>
+		      <xs:element name="return" type="xs:boolean" />
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <!-- DescribeImageAttribute Definitions -->
+		  
+		  <xs:element name="DescribeImageAttribute"
+		              type="tns:DescribeImageAttributeType" />
+		
+		  <xs:complexType name="DescribeImageAttributeType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string" />
+		      <xs:group ref="tns:DescribeImageAttributesGroup" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <xs:group name="DescribeImageAttributesGroup" >
+		    <xs:choice>
+		      <xs:element name="launchPermission" type="tns:EmptyElementType"/>
+		      <xs:element name="productCodes" type="tns:EmptyElementType" />
+		    </xs:choice>
+		  </xs:group>
+		
+		  <!-- DescribeImageAttributeResponse Definitions -->
+		  
+		  <xs:element name="DescribeImageAttributeResponse"
+		              type="tns:DescribeImageAttributeResponseType" />
+		              
+		  <xs:complexType name="DescribeImageAttributeResponseType">
+		    <xs:sequence>
+		      <xs:element name="imageId" type="xs:string" />
+		      <xs:choice>
+		        <xs:element name="launchPermission" type="tns:LaunchPermissionListType"/>
+		        <xs:element name="productCodes" type="tns:ProductCodeListType" />
+		      </xs:choice>
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- ConfirmProductInstance Definitions -->
+		  
+		  <xs:element name="ConfirmProductInstance" 
+		              type="tns:ConfirmProductInstanceType" />
+		  			  
+		  <xs:complexType name="ConfirmProductInstanceType" >
+		    <xs:sequence>
+		      <xs:element name="productCode" type="xs:string" />
+		      <xs:element name="instanceId" type="xs:string"/>
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="ProductCodesSetType" >
+		    <xs:sequence>
+		      <xs:element name="item" type="tns:ProductCodesSetItemType" minOccurs="0" maxOccurs="unbounded" />
+		    </xs:sequence>
+		  </xs:complexType>
+		  
+		  <xs:complexType name="ProductCodesSetItemType" >
+		    <xs:sequence>
+		      <xs:element name="productCode" type="xs:string" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		  <!-- ConfirmProductInstanceResponse Definitions -->
+		  
+		  <xs:element name="ConfirmProductInstanceResponse" 
+		              type="tns:ConfirmProductInstanceResponseType" />
+		  
+		  <xs:complexType name="ConfirmProductInstanceResponseType">
+		  	<xs:sequence>
+		  	  <xs:element name="return" type="xs:boolean" />
+		  	  <xs:element name="ownerId" type="xs:string" minOccurs="0" />
+		    </xs:sequence>
+		  </xs:complexType>
+		
+		</xs:schema>
+	</types>
+
+	<!-- message definitions -->
+
+	<message name="RegisterImageRequestMsg">
+		<part name="RegisterImageRequestMsgReq" element="tns:RegisterImage" />
+	</message>
+
+	<message name="RegisterImageResponseMsg">
+		<part name="RegisterImageResponseMsgResp" element="tns:RegisterImageResponse" />
+	</message>
+
+	<message name="DeregisterImageRequestMsg">
+		<part name="DeregisterImageRequestMsgReq" element="tns:DeregisterImage" />
+	</message>
+
+	<message name="DeregisterImageResponseMsg">
+		<part name="DeregisterImageResponseMsgResp" element="tns:DeregisterImageResponse" />
+	</message>
+
+	<message name="RunInstancesRequestMsg">
+		<part name="RunInstancesRequestMsgReq" element="tns:RunInstances" />
+	</message>
+
+	<message name="RunInstancesResponseMsg">
+		<part name="RunInstancesResponseMsgResp" element="tns:RunInstancesResponse" />
+	</message>
+
+	<message name="CreateKeyPairRequestMsg">
+		<part name="CreateKeyPairRequestMsgReq" element="tns:CreateKeyPair" />
+	</message>
+
+	<message name="CreateKeyPairResponseMsg">
+		<part name="CreateKeyPairResponseMsgResp" element="tns:CreateKeyPairResponse" />
+	</message>
+
+	<message name="DescribeKeyPairsRequestMsg">
+		<part name="DescribeKeyPairsRequestMsgReq" element="tns:DescribeKeyPairs" />
+	</message>
+
+	<message name="DescribeKeyPairsResponseMsg">
+		<part name="DescribeKeyPairsResponseMsgResp" element="tns:DescribeKeyPairsResponse" />
+	</message>
+
+	<message name="DeleteKeyPairRequestMsg">
+		<part name="DeleteKeyPairRequestMsgReq" element="tns:DeleteKeyPair" />
+	</message>
+
+	<message name="DeleteKeyPairResponseMsg">
+		<part name="DeleteKeyPairResponseMsgResp" element="tns:DeleteKeyPairResponse" />
+	</message>
+
+	<message name="GetConsoleOutputRequestMsg">
+		<part name="GetConsoleOutputRequestMsgReq" element="tns:GetConsoleOutput" />
+	</message>
+	
+	<message name="GetConsoleOutputResponseMsg">
+		<part name="GetConsoleOutputResponseMsgResp" element="tns:GetConsoleOutputResponse" />
+	</message>
+
+	<message name="TerminateInstancesRequestMsg">
+		<part name="TerminateInstancesRequestMsgReq" element="tns:TerminateInstances" />
+	</message>
+	
+	<message name="TerminateInstancesResponseMsg">
+		<part name="TerminateInstancesResponseMsgResp" element="tns:TerminateInstancesResponse" />
+	</message>
+
+	<message name="RebootInstancesRequestMsg">
+		<part name="RebootInstancesRequestMsgReq" element="tns:RebootInstances" />
+	</message>
+
+	<message name="RebootInstancesResponseMsg">
+		<part name="RebootInstancesRequestMsgResp" element="tns:RebootInstancesResponse" />
+	</message>
+
+	<message name="DescribeInstancesRequestMsg">
+		<part name="DescribeInstancesRequestMsgReq" element="tns:DescribeInstances" />
+	</message>
+
+	<message name="DescribeInstancesResponseMsg">
+		<part name="DescribeInstancesRequestMsgResp" element="tns:DescribeInstancesResponse" />
+	</message>
+
+	<message name="DescribeImagesRequestMsg">
+		<part name="DescribeImagesRequestMsgReq" element="tns:DescribeImages" />
+	</message>
+
+	<message name="DescribeImagesResponseMsg">
+		<part name="DescribeImagesRequestMsgResp" element="tns:DescribeImagesResponse" />
+	</message>
+
+	<message name="CreateSecurityGroupRequestMsg">
+		<part name="CreateSecurityGroupRequestMsgReq" element="tns:CreateSecurityGroup" />
+	</message>
+
+	<message name="CreateSecurityGroupResponseMsg">
+		<part name="CreateSecurityGroupRequestMsgResp" element="tns:CreateSecurityGroupResponse" />
+	</message>
+
+	<message name="DeleteSecurityGroupRequestMsg">
+		<part name="DeleteSecurityGroupRequestMsgReq" element="tns:DeleteSecurityGroup" />
+	</message>
+
+	<message name="DeleteSecurityGroupResponseMsg">
+		<part name="DeleteSecurityGroupRequestMsgResp" element="tns:DeleteSecurityGroupResponse" />
+	</message>
+
+	<message name="DescribeSecurityGroupsRequestMsg">
+		<part name="DescribeSecurityGroupsRequestMsgReq" element="tns:DescribeSecurityGroups" />
+	</message>
+
+	<message name="DescribeSecurityGroupsResponseMsg">
+		<part name="DescribeSecurityGroupsRequestMsgResp" element="tns:DescribeSecurityGroupsResponse" />
+	</message>
+
+	<message name="AuthorizeSecurityGroupIngressRequestMsg">
+		<part name="AuthorizeSecurityGroupIngressRequestMsgReq" element="tns:AuthorizeSecurityGroupIngress" />
+	</message>
+
+	<message name="AuthorizeSecurityGroupIngressResponseMsg">
+		<part name="AuthorizeSecurityGroupIngressRequestMsgResp" element="tns:AuthorizeSecurityGroupIngressResponse" />
+	</message>
+
+	<message name="RevokeSecurityGroupIngressRequestMsg">
+		<part name="RevokeSecurityGroupIngressRequestMsgReq" element="tns:RevokeSecurityGroupIngress" />
+	</message>
+
+	<message name="RevokeSecurityGroupIngressResponseMsg">
+		<part name="RevokeSecurityGroupIngressRequestMsgResp" element="tns:RevokeSecurityGroupIngressResponse" />
+	</message>
+
+	<message name="ModifyImageAttributeRequestMsg">
+		<part name="ModifyImageAttributeRequestMsgReq" element="tns:ModifyImageAttribute" />
+	</message>
+	
+	<message name="ModifyImageAttributeResponseMsg">
+		<part name="ModifyImageAttributeRequestMsgResp" element="tns:ModifyImageAttributeResponse" />
+	</message>
+	
+	<message name="ResetImageAttributeRequestMsg">
+		<part name="ResetImageAttributeRequestMsgReq" element="tns:ResetImageAttribute" />
+	</message>
+	
+	<message name="ResetImageAttributeResponseMsg">
+		<part name="ResetImageAttributeRequestMsgResp" element="tns:ResetImageAttributeResponse" />
+	</message>
+	
+	<message name="DescribeImageAttributeRequestMsg">
+		<part name="DescribeImageAttributeRequestMsgReq" element="tns:DescribeImageAttribute" />
+	</message>
+	
+	<message name="DescribeImageAttributeResponseMsg">
+		<part name="DescribeImageAttributeRequestMsgResp" element="tns:DescribeImageAttributeResponse"/>
+	</message>
+
+	<message name="ConfirmProductInstanceRequestMsg">
+		<part name="ConfirmProductInstanceRequestMsgReq" element="tns:ConfirmProductInstance"/>
+	</message>
+
+	<message name="ConfirmProductInstanceResponseMsg">
+		<part name="ConfirmProductInstanceRequestMsgResp" element="tns:ConfirmProductInstanceResponse"/>
+	</message>
+
+	<portType name="AmazonEC2PortType">
+		<operation name="RegisterImage">
+			<input message="tns:RegisterImageRequestMsg" />
+			<output message="tns:RegisterImageResponseMsg" />
+		</operation>
+		<operation name="DeregisterImage">
+			<input message="tns:DeregisterImageRequestMsg" />
+			<output message="tns:DeregisterImageResponseMsg" />
+		</operation>
+		<operation name="RunInstances">
+			<input message="tns:RunInstancesRequestMsg" />
+			<output message="tns:RunInstancesResponseMsg" />
+		</operation>
+		<operation name="CreateKeyPair">
+			<input message="tns:CreateKeyPairRequestMsg" />
+			<output message="tns:CreateKeyPairResponseMsg" />
+		</operation>
+		<operation name="DescribeKeyPairs">
+			<input message="tns:DescribeKeyPairsRequestMsg" />
+			<output message="tns:DescribeKeyPairsResponseMsg" />
+		</operation>
+		<operation name="DeleteKeyPair">
+			<input message="tns:DeleteKeyPairRequestMsg" />
+			<output message="tns:DeleteKeyPairResponseMsg" />
+		</operation>
+		<operation name="GetConsoleOutput">
+			<input message="tns:GetConsoleOutputRequestMsg" />
+			<output message="tns:GetConsoleOutputResponseMsg" />
+		</operation>
+		<operation name="TerminateInstances">
+			<input message="tns:TerminateInstancesRequestMsg" />
+			<output message="tns:TerminateInstancesResponseMsg" />
+		</operation>
+		<operation name="RebootInstances">
+			<input message="tns:RebootInstancesRequestMsg" />
+			<output message="tns:RebootInstancesResponseMsg" />
+		</operation>
+		<operation name="DescribeInstances">
+			<input message="tns:DescribeInstancesRequestMsg" />
+			<output message="tns:DescribeInstancesResponseMsg" />
+		</operation>
+		<operation name="DescribeImages">
+			<input message="tns:DescribeImagesRequestMsg" />
+			<output message="tns:DescribeImagesResponseMsg" />
+		</operation>
+		<operation name="CreateSecurityGroup">
+			<input message="tns:CreateSecurityGroupRequestMsg" />
+			<output message="tns:CreateSecurityGroupResponseMsg" />
+		</operation>
+		<operation name="DeleteSecurityGroup">
+			<input message="tns:DeleteSecurityGroupRequestMsg" />
+			<output message="tns:DeleteSecurityGroupResponseMsg" />
+		</operation>
+		<operation name="DescribeSecurityGroups">
+			<input message="tns:DescribeSecurityGroupsRequestMsg" />
+			<output message="tns:DescribeSecurityGroupsResponseMsg" />
+		</operation>
+		<operation name="AuthorizeSecurityGroupIngress">
+			<input message="tns:AuthorizeSecurityGroupIngressRequestMsg" />
+			<output message="tns:AuthorizeSecurityGroupIngressResponseMsg" />
+		</operation>
+		<operation name="RevokeSecurityGroupIngress">
+			<input message="tns:RevokeSecurityGroupIngressRequestMsg" />
+			<output message="tns:RevokeSecurityGroupIngressResponseMsg" />
+		</operation>
+		<operation name="ModifyImageAttribute">
+			<input message="tns:ModifyImageAttributeRequestMsg"/>
+			<output message="tns:ModifyImageAttributeResponseMsg"/>
+		</operation>
+		<operation name="ResetImageAttribute">
+			<input message="tns:ResetImageAttributeRequestMsg"/>
+			<output message="tns:ResetImageAttributeResponseMsg"/>
+		</operation>
+		<operation name="DescribeImageAttribute">
+			<input message="tns:DescribeImageAttributeRequestMsg"/>
+			<output message="tns:DescribeImageAttributeResponseMsg"/>
+		</operation>
+		<operation name="ConfirmProductInstance">
+			<input message="tns:ConfirmProductInstanceRequestMsg"/>
+			<output message="tns:ConfirmProductInstanceResponseMsg"/>
+		</operation>
+	</portType>
+
+	<binding name="AmazonEC2Binding" type="tns:AmazonEC2PortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+
+		<operation name="RegisterImage">
+			<soap:operation soapAction="RegisterImage" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DeregisterImage">
+			<soap:operation soapAction="DeregisterImage" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="CreateKeyPair">
+			<soap:operation soapAction="CreateKeyPair" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DescribeKeyPairs">
+			<soap:operation soapAction="DescribeKeyPairs" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DeleteKeyPair">
+			<soap:operation soapAction="DeleteKeyPair" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="RunInstances">
+			<soap:operation soapAction="RunInstances" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="GetConsoleOutput">
+			<soap:operation soapAction="GetConsoleOutput" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="TerminateInstances">
+			<soap:operation soapAction="TerminateInstances" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="RebootInstances">
+			<soap:operation soapAction="RebootInstances" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DescribeInstances">
+			<soap:operation soapAction="DescribeInstances" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DescribeImages">
+			<soap:operation soapAction="DescribeImages" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="CreateSecurityGroup">
+			<soap:operation soapAction="CreateSecurityGroup" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+
+		<operation name="DeleteSecurityGroup">
+			<soap:operation soapAction="DeleteSecurityGroup" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="DescribeSecurityGroups">
+			<soap:operation soapAction="DescribeSecurityGroups" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="AuthorizeSecurityGroupIngress">
+			<soap:operation soapAction="AuthorizeSecurityGroupIngress" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="RevokeSecurityGroupIngress">
+			<soap:operation soapAction="RevokeSecurityGroupIngress" />
+			<input>
+				<soap:body use="literal" />
+			</input>
+			<output>
+				<soap:body use="literal" />
+			</output>
+		</operation>
+
+		<operation name="ModifyImageAttribute">
+			<soap:operation soapAction="ModifyImageAttribute" />
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		
+		<operation name="ResetImageAttribute">
+			<soap:operation soapAction="ResetImageAttribute" />
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		
+		<operation name="DescribeImageAttribute">
+			<soap:operation soapAction="DescribeImageAttribute" />
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		
+		<operation name="ConfirmProductInstance">
+			<soap:operation soapAction="ConfirmProductInstance" />
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		
+	</binding>
+
+	<service name="AmazonEC2">
+		<port name="AmazonEC2Port" binding="tns:AmazonEC2Binding">
+			<soap:address location="https://ec2.amazonaws.com/" />
+		</port>
+	</service>
+
+</definitions>