|
29 | 29 | * |
30 | 30 | * Visit <a href="http://aws.amazon.com/ec2/">http://aws.amazon.com/ec2/</a> for more information. |
31 | 31 | * |
32 | | - * @version 2013.01.18 |
| 32 | + * @version 2013.03.08 |
33 | 33 | * @license See the included NOTICE.md file for complete information. |
34 | 34 | * @copyright See the included NOTICE.md file for complete information. |
35 | 35 | * @link http://aws.amazon.com/ec2/ Amazon EC2 |
@@ -148,7 +148,7 @@ class AmazonEC2 extends CFRuntime |
148 | 148 | */ |
149 | 149 | public function __construct(array $options = array()) |
150 | 150 | { |
151 | | - $this->api_version = '2012-12-01'; |
| 151 | + $this->api_version = '2013-02-01'; |
152 | 152 | $this->hostname = self::DEFAULT_URL; |
153 | 153 | $this->auth_class = 'AuthV2Query'; |
154 | 154 |
|
@@ -713,6 +713,29 @@ public function confirm_product_instance($product_code, $instance_id, $opt = nul |
713 | 713 | return $this->authenticate('ConfirmProductInstance', $opt); |
714 | 714 | } |
715 | 715 |
|
| 716 | + /** |
| 717 | + * |
| 718 | + * |
| 719 | + * @param string $source_region (Required) |
| 720 | + * @param string $source_image_id (Required) |
| 721 | + * @param string $name (Required) |
| 722 | + * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| 723 | + * <li><code>Description</code> - <code>string</code> - Optional - </li> |
| 724 | + * <li><code>ClientToken</code> - <code>string</code> - Optional - </li> |
| 725 | + * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li> |
| 726 | + * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul> |
| 727 | + * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| 728 | + */ |
| 729 | + public function copy_image($source_region, $source_image_id, $name, $opt = null) |
| 730 | + { |
| 731 | + if (!$opt) $opt = array(); |
| 732 | + $opt['SourceRegion'] = $source_region; |
| 733 | + $opt['SourceImageId'] = $source_image_id; |
| 734 | + $opt['Name'] = $name; |
| 735 | + |
| 736 | + return $this->authenticate('CopyImage', $opt); |
| 737 | + } |
| 738 | + |
716 | 739 | /** |
717 | 740 | * |
718 | 741 | * |
@@ -1893,6 +1916,31 @@ public function deregister_image($image_id, $opt = null) |
1893 | 1916 | return $this->authenticate('DeregisterImage', $opt); |
1894 | 1917 | } |
1895 | 1918 |
|
| 1919 | + /** |
| 1920 | + * |
| 1921 | + * |
| 1922 | + * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| 1923 | + * <li><code>AttributeName</code> - <code>string|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values.</li> |
| 1924 | + * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li> |
| 1925 | + * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul> |
| 1926 | + * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| 1927 | + */ |
| 1928 | + public function describe_account_attributes($opt = null) |
| 1929 | + { |
| 1930 | + if (!$opt) $opt = array(); |
| 1931 | + |
| 1932 | + // Optional list (non-map) |
| 1933 | + if (isset($opt['AttributeName'])) |
| 1934 | + { |
| 1935 | + $opt = array_merge($opt, CFComplexType::map(array( |
| 1936 | + 'AttributeName' => (is_array($opt['AttributeName']) ? $opt['AttributeName'] : array($opt['AttributeName'])) |
| 1937 | + ))); |
| 1938 | + unset($opt['AttributeName']); |
| 1939 | + } |
| 1940 | + |
| 1941 | + return $this->authenticate('DescribeAccountAttributes', $opt); |
| 1942 | + } |
| 1943 | + |
1896 | 1944 | /** |
1897 | 1945 | * The DescribeAddresses operation lists elastic IP addresses assigned to your account. |
1898 | 1946 | * |
@@ -2877,7 +2925,7 @@ public function describe_reserved_instances_listings($opt = null) |
2877 | 2925 | * |
2878 | 2926 | * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
2879 | 2927 | * <li><code>ReservedInstancesOfferingId</code> - <code>string|array</code> - Optional - An optional list of the unique IDs of the Reserved Instance offerings to describe. Pass a string for a single value, or an indexed array for multiple values.</li> |
2880 | | - * <li><code>InstanceType</code> - <code>string</code> - Optional - The instance type on which the Reserved Instance can be used. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
| 2928 | + * <li><code>InstanceType</code> - <code>string</code> - Optional - The instance type on which the Reserved Instance can be used. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>hs1.8xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
2881 | 2929 | * <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The Availability Zone in which the Reserved Instance can be used.</li> |
2882 | 2930 | * <li><code>ProductDescription</code> - <code>string</code> - Optional - The Reserved Instance product description.</li> |
2883 | 2931 | * <li><code>Filter</code> - <code>array</code> - Optional - A list of filters used to match properties for ReservedInstancesOfferings. For a complete reference to the available filter keys for this operation, see the <a href="http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/">Amazon EC2 API reference</a>. <ul> |
@@ -3452,6 +3500,25 @@ public function describe_volumes($opt = null) |
3452 | 3500 | return $this->authenticate('DescribeVolumes', $opt); |
3453 | 3501 | } |
3454 | 3502 |
|
| 3503 | + /** |
| 3504 | + * |
| 3505 | + * |
| 3506 | + * @param string $vpc_id (Required) |
| 3507 | + * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| 3508 | + * <li><code>EnableDnsSupport</code> - <code>string</code> - Optional - </li> |
| 3509 | + * <li><code>EnableDnsHostnames</code> - <code>string</code> - Optional - </li> |
| 3510 | + * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li> |
| 3511 | + * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul> |
| 3512 | + * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| 3513 | + */ |
| 3514 | + public function describe_vpc_attribute($vpc_id, $opt = null) |
| 3515 | + { |
| 3516 | + if (!$opt) $opt = array(); |
| 3517 | + $opt['VpcId'] = $vpc_id; |
| 3518 | + |
| 3519 | + return $this->authenticate('DescribeVpcAttribute', $opt); |
| 3520 | + } |
| 3521 | + |
3455 | 3522 | /** |
3456 | 3523 | * Gives you information about your VPCs. You can filter the results to return information only |
3457 | 3524 | * about VPCs that match criteria you specify. |
@@ -3877,7 +3944,7 @@ public function get_password_data($instance_id, $opt = null) |
3877 | 3944 | * <li><code>SecurityGroup</code> - <code>string|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values.</li> |
3878 | 3945 | * <li><code>AdditionalInfo</code> - <code>string</code> - Optional - </li> |
3879 | 3946 | * <li><code>UserData</code> - <code>string</code> - Optional - </li> |
3880 | | - * <li><code>InstanceType</code> - <code>string</code> - Optional - [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
| 3947 | + * <li><code>InstanceType</code> - <code>string</code> - Optional - [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>hs1.8xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
3881 | 3948 | * <li><code>Placement</code> - <code>array</code> - Optional - Describes where an Amazon EC2 instance is running within an Amazon EC2 region. <ul> |
3882 | 3949 | * <li><code>x</code> - <code>array</code> - Optional - This represents a simple array index. <ul> |
3883 | 3950 | * <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The availability zone in which an Amazon EC2 instance runs.</li> |
@@ -4295,6 +4362,24 @@ public function modify_volume_attribute($volume_id, $opt = null) |
4295 | 4362 | return $this->authenticate('ModifyVolumeAttribute', $opt); |
4296 | 4363 | } |
4297 | 4364 |
|
| 4365 | + /** |
| 4366 | + * |
| 4367 | + * |
| 4368 | + * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul> |
| 4369 | + * <li><code>VpcId</code> - <code>string</code> - Optional - </li> |
| 4370 | + * <li><code>EnableDnsSupport.Value</code> - <code>boolean</code> - Optional - Boolean value</li> |
| 4371 | + * <li><code>EnableDnsHostnames.Value</code> - <code>boolean</code> - Optional - Boolean value</li> |
| 4372 | + * <li><code>curlopts</code> - <code>array</code> - Optional - A set of values to pass directly into <code>curl_setopt()</code>, where the key is a pre-defined <code>CURLOPT_*</code> constant.</li> |
| 4373 | + * <li><code>returnCurlHandle</code> - <code>boolean</code> - Optional - A private toggle specifying that the cURL handle be returned rather than actually completing the request. This toggle is useful for manually managed batch requests.</li></ul> |
| 4374 | + * @return CFResponse A <CFResponse> object containing a parsed HTTP response. |
| 4375 | + */ |
| 4376 | + public function modify_vpc_attribute($opt = null) |
| 4377 | + { |
| 4378 | + if (!$opt) $opt = array(); |
| 4379 | + |
| 4380 | + return $this->authenticate('ModifyVpcAttribute', $opt); |
| 4381 | + } |
| 4382 | + |
4298 | 4383 | /** |
4299 | 4384 | * Enables monitoring for a running instance. |
4300 | 4385 | * |
@@ -4678,7 +4763,7 @@ public function report_instance_status($opt = null) |
4678 | 4763 | * <li><code>SecurityGroup</code> - <code>string|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values.</li> |
4679 | 4764 | * <li><code>UserData</code> - <code>string</code> - Optional - Optional data, specific to a user's application, to provide in the launch request. All instances that collectively comprise the launch request have access to this data. User data is never returned through API responses.</li> |
4680 | 4765 | * <li><code>AddressingType</code> - <code>string</code> - Optional - Deprecated.</li> |
4681 | | - * <li><code>InstanceType</code> - <code>string</code> - Optional - Specifies the instance type. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
| 4766 | + * <li><code>InstanceType</code> - <code>string</code> - Optional - Specifies the instance type. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>hs1.8xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
4682 | 4767 | * <li><code>Placement</code> - <code>array</code> - Optional - Defines a placement item. <ul> |
4683 | 4768 | * <li><code>x</code> - <code>array</code> - Optional - This represents a simple array index. <ul> |
4684 | 4769 | * <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The availability zone in which an Amazon EC2 instance runs.</li> |
@@ -4999,8 +5084,7 @@ public function revoke_security_group_ingress($opt = null) |
4999 | 5084 | * <li><code>SecurityGroup</code> - <code>string|array</code> - Optional - The names of the security groups into which the instances will be launched. Pass a string for a single value, or an indexed array for multiple values.</li> |
5000 | 5085 | * <li><code>SecurityGroupId</code> - <code>string|array</code> - Optional - Pass a string for a single value, or an indexed array for multiple values.</li> |
5001 | 5086 | * <li><code>UserData</code> - <code>string</code> - Optional - Specifies additional information to make available to the instance(s).</li> |
5002 | | - * <li><code>AddressingType</code> - <code>string</code> - Optional - </li> |
5003 | | - * <li><code>InstanceType</code> - <code>string</code> - Optional - Specifies the instance type for the launched instances. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
| 5087 | + * <li><code>InstanceType</code> - <code>string</code> - Optional - Specifies the instance type for the launched instances. [Allowed values: <code>t1.micro</code>, <code>m1.small</code>, <code>m1.medium</code>, <code>m1.large</code>, <code>m1.xlarge</code>, <code>m2.xlarge</code>, <code>m2.2xlarge</code>, <code>m2.4xlarge</code>, <code>m3.xlarge</code>, <code>m3.2xlarge</code>, <code>c1.medium</code>, <code>c1.xlarge</code>, <code>hi1.4xlarge</code>, <code>hs1.8xlarge</code>, <code>cc1.4xlarge</code>, <code>cc2.8xlarge</code>, <code>cg1.4xlarge</code>]</li> |
5004 | 5088 | * <li><code>Placement</code> - <code>array</code> - Optional - Specifies the placement constraints (Availability Zones) for launching the instances. <ul> |
5005 | 5089 | * <li><code>x</code> - <code>array</code> - Optional - This represents a simple array index. <ul> |
5006 | 5090 | * <li><code>AvailabilityZone</code> - <code>string</code> - Optional - The availability zone in which an Amazon EC2 instance runs.</li> |
|
0 commit comments