You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2017/09/24 14:33:10 UTC

[04/10] libcloud git commit: merge from upstream 'trunk'

merge from upstream 'trunk'


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/32178ac1
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/32178ac1
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/32178ac1

Branch: refs/heads/trunk
Commit: 32178ac10086e23615f15e64881475861e085d78
Parents: 01ce1d5
Author: nurfet-becirevic <nu...@stackpointcloud.com>
Authored: Mon Sep 4 09:18:39 2017 -0400
Committer: nurfet-becirevic <nu...@stackpointcloud.com>
Committed: Mon Sep 4 09:18:39 2017 -0400

----------------------------------------------------------------------
 .gitignore                                      |  6 ++
 CHANGES.rst                                     | 14 ++++
 doap_libcloud.rdf                               |  7 ++
 libcloud/__init__.py                            |  2 +-
 libcloud/compute/drivers/ec2.py                 | 81 +++++++++++++++++---
 libcloud/compute/drivers/libvirt_driver.py      |  2 +-
 .../ec2/describe_reserved_instances.xml         |  1 +
 libcloud/test/compute/test_ec2.py               | 17 ++--
 libcloud/test/conftest.py                       | 25 ++++++
 9 files changed, 132 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index e5db6ec..36902da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,9 @@ apache_libcloud.egg-info/
 .eggs/
 .cache/
 .vscode/
+.Python
+bin/
+include/
+lib/
+pip-selfcheck.json
+report.html

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/CHANGES.rst
----------------------------------------------------------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index fc6aa72..75dbf52 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,20 @@
 Changes in current version of Apache Libcloud
 ---------------------------------------------
 
+Compute
+~~~~~~~
+
+- [EC2] add g3 instance types
+  [GITHUB-1101]
+  (@zulupro)
+
+- [EC2] add 'end' to ec2 reserved_node
+  [GITHUB-1099]
+  (@xofer)
+
+Changes in Apache Libcloud 2.2.0
+--------------------------------
+
 Common
 ~~~~~~
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/doap_libcloud.rdf
----------------------------------------------------------------------
diff --git a/doap_libcloud.rdf b/doap_libcloud.rdf
index 2c8341c..815feed 100644
--- a/doap_libcloud.rdf
+++ b/doap_libcloud.rdf
@@ -364,6 +364,13 @@
         <revision>v2.1.0</revision>
       </Version>
   </release>
+  <release>
+      <Version>
+        <name>2.2.0</name>
+        <created>2017-09-04</created>
+        <revision>v2.2.0</revision>
+      </Version>
+  </release>
     <repository>
       <SVNRepository>
         <location rdf:resource="https://svn.apache.org/repos/asf/libcloud/trunk/"/>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/__init__.py
----------------------------------------------------------------------
diff --git a/libcloud/__init__.py b/libcloud/__init__.py
index bf2ef2d..24d4a68 100644
--- a/libcloud/__init__.py
+++ b/libcloud/__init__.py
@@ -36,7 +36,7 @@ __all__ = [
     '__version__',
     'enable_debug'
 ]
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 
 def enable_debug(fo):

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index efb6275..126d362 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -322,6 +322,42 @@ INSTANCE_TYPES = {
             'cpu': 32
         }
     },
+    'g3.4xlarge': {
+        'id': 'g3.4xlarge',
+        'name': 'Cluster GPU G3 Four Extra Large Instance',
+        'ram': GiB(122),
+        'disk': 0,  # EBS only
+        'bandwidth': None,
+        'extra': {
+            'cpu': 16,
+            'gpu': 1,
+            'gpu_ram': GiB(8)
+        }
+    },
+    'g3.8xlarge': {
+        'id': 'g3.8xlarge',
+        'name': 'Cluster GPU G3 Eight Extra Large Instance',
+        'ram': GiB(244),
+        'disk': 0,  # EBS only
+        'bandwidth': None,
+        'extra': {
+            'cpu': 32,
+            'gpu': 2,
+            'gpu_ram': GiB(16)
+        }
+    },
+    'g3.16xlarge': {
+        'id': 'g3.16xlarge',
+        'name': 'Cluster GPU G3 16 Extra Large Instance',
+        'ram': GiB(488),
+        'disk': 0,  # EBS only
+        'bandwidth': None,
+        'extra': {
+            'cpu': 64,
+            'gpu': 4,
+            'gpu_ram': GiB(32)
+        }
+    },
     'p2.xlarge': {
         'id': 'p2.xlarge',
         'name': 'Cluster GPU P2 Large Instance',
@@ -869,6 +905,9 @@ REGION_DETAILS = {
             'cg1.4xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'cr1.8xlarge',
             'hs1.8xlarge',
             'i2.xlarge',
@@ -933,6 +972,9 @@ REGION_DETAILS = {
             'c1.xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'c3.large',
             'c3.xlarge',
             'c3.2xlarge',
@@ -1012,6 +1054,9 @@ REGION_DETAILS = {
             'cg1.4xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'cr1.8xlarge',
             'hs1.8xlarge',
             'i2.xlarge',
@@ -1076,6 +1121,9 @@ REGION_DETAILS = {
             'c1.xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'p2.xlarge',
             'p2.8xlarge',
             'p2.16xlarge',
@@ -1153,6 +1201,9 @@ REGION_DETAILS = {
             'c1.xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'c3.large',
             'c3.xlarge',
             'c3.2xlarge',
@@ -1747,6 +1798,7 @@ REGION_DETAILS = {
             'x1.32xlarge'
         ]
     },
+    # GovCloud Region
     'us-gov-west-1': {
         'endpoint': 'ec2.us-gov-west-1.amazonaws.com',
         'api_name': 'ec2_us_govwest',
@@ -1775,6 +1827,9 @@ REGION_DETAILS = {
             'c1.xlarge',
             'g2.2xlarge',
             'g2.8xlarge',
+            'g3.4xlarge',
+            'g3.8xlarge',
+            'g3.16xlarge',
             'c3.large',
             'c3.xlarge',
             'c3.2xlarge',
@@ -2765,6 +2820,10 @@ RESOURCE_EXTRA_ATTRIBUTES_MAP = {
             'xpath': 'start',
             'transform_func': str
         },
+        'end': {
+            'xpath': 'end',
+            'transform_func': str
+        },
         'duration': {
             'xpath': 'duration',
             'transform_func': int
@@ -3765,19 +3824,23 @@ class BaseEC2NodeDriver(NodeDriver):
             if subnet_id:
                 params['SubnetId'] = subnet_id
 
+        # Specify tags at instance creation time
+        tags = {'Name': kwargs['name']}
+        if 'ex_metadata' in kwargs:
+            tags.update(kwargs['ex_metadata'])
+        tagspec_root = 'TagSpecification.1.'
+        params[tagspec_root + 'ResourceType'] = 'instance'
+        tag_nr = 1
+        for k, v in tags.items():
+            tag_root = tagspec_root + 'Tag.%d.' % tag_nr
+            params[tag_root + 'Key'] = k
+            params[tag_root + 'Value'] = v
+            tag_nr += 1
+
         object = self.connection.request(self.path, params=params).object
         nodes = self._to_nodes(object, 'instancesSet/item')
 
         for node in nodes:
-            tags = {'Name': kwargs['name']}
-            if 'ex_metadata' in kwargs:
-                tags.update(kwargs['ex_metadata'])
-
-            try:
-                self.ex_create_tags(resource=node, tags=tags)
-            except Exception:
-                continue
-
             node.name = kwargs['name']
             node.extra.update({'tags': tags})
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/compute/drivers/libvirt_driver.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/libvirt_driver.py b/libcloud/compute/drivers/libvirt_driver.py
index a914c5e..f2ccfc5 100644
--- a/libcloud/compute/drivers/libvirt_driver.py
+++ b/libcloud/compute/drivers/libvirt_driver.py
@@ -411,7 +411,7 @@ class LibvirtNodeDriver(NodeDriver):
         Sets up the regexp for parsing out IP addresses from the 'ip neighbor'
         command and pass it along to the parser function.
 
-        :return: Dictionary from the parsing funtion
+        :return: Dictionary from the parsing function
         :rtype: ``dict``
         """
         ip_regex = re.compile('(.*?)\s+.*lladdr\s+(.*?)\s+')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml b/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml
index 29d7f3f..6c5ac71 100644
--- a/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml
+++ b/libcloud/test/compute/fixtures/ec2/describe_reserved_instances.xml
@@ -6,6 +6,7 @@
             <instanceType>t1.micro</instanceType>
             <availabilityZone>us-east-1b</availabilityZone>
             <start>2013-06-18T12:07:53.161Z</start>
+            <end>2014-06-18T12:07:53.161Z</end>
             <duration>31536000</duration>
             <fixedPrice>23.0</fixedPrice>
             <usagePrice>0.012</usagePrice>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 2766fc7..3209ac4 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -282,6 +282,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
         self.assertEqual(node.extra['instance_type'], 't1.micro')
         self.assertEqual(node.extra['availability'], 'us-east-1b')
         self.assertEqual(node.extra['start'], '2013-06-18T12:07:53.161Z')
+        self.assertEqual(node.extra['end'], '2014-06-18T12:07:53.161Z')
         self.assertEqual(node.extra['duration'], 31536000)
         self.assertEqual(node.extra['usage_price'], 0.012)
         self.assertEqual(node.extra['fixed_price'], 23.0)
@@ -444,21 +445,21 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
                 self.assertTrue('m2.4xlarge' in ids)
 
             if region_name == 'us-east-1':
-                self.assertEqual(len(sizes), 67)
+                self.assertEqual(len(sizes), 70)
                 self.assertTrue('cg1.4xlarge' in ids)
                 self.assertTrue('cc2.8xlarge' in ids)
                 self.assertTrue('cr1.8xlarge' in ids)
                 self.assertTrue('x1.32xlarge' in ids)
             elif region_name == 'us-west-1':
-                self.assertEqual(len(sizes), 58)
+                self.assertEqual(len(sizes), 61)
             if region_name == 'us-west-2':
-                self.assertEqual(len(sizes), 68)
+                self.assertEqual(len(sizes), 71)
             elif region_name == 'ap-southeast-1':
                 self.assertEqual(len(sizes), 57)
             elif region_name == 'ap-southeast-2':
                 self.assertEqual(len(sizes), 61)
             elif region_name == 'eu-west-1':
-                self.assertEqual(len(sizes), 65)
+                self.assertEqual(len(sizes), 68)
             elif region_name == 'ap-south-1':
                 self.assertEqual(len(sizes), 41)
 
@@ -1526,10 +1527,6 @@ class EC2MockHttp(MockHttp):
         body = self.fixtures.load('modify_snapshot_attribute.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
-    def _idempotent_CreateTags(self, method, url, body, headers):
-        body = self.fixtures.load('create_tags.xml')
-        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
-
     def _CreateVolume(self, method, url, body, headers):
         body = self.fixtures.load('create_volume.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
@@ -1741,10 +1738,6 @@ class EucMockHttp(EC2MockHttp):
                                           headers):
         return self._RunInstances(method, url, body, headers)
 
-    def _services_Eucalyptus_CreateTags(self, method, url, body,
-                                        headers):
-        return self._CreateTags(method, url, body, headers)
-
     def _services_Eucalyptus_DescribeInstanceTypes(self, method, url, body,
                                                    headers):
         body = self.fixtures.load('describe_instance_types.xml')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/32178ac1/libcloud/test/conftest.py
----------------------------------------------------------------------
diff --git a/libcloud/test/conftest.py b/libcloud/test/conftest.py
new file mode 100644
index 0000000..505c570
--- /dev/null
+++ b/libcloud/test/conftest.py
@@ -0,0 +1,25 @@
+import os.path
+import pytest
+
+
+def pytest_configure(config):
+    """Check that secrets.py is valid"""
+
+    this_dir = os.path.abspath(os.path.split(__file__)[0])
+    secrets_current = os.path.join(this_dir, 'secrets.py')
+    secrets_dist = os.path.join(this_dir, 'secrets.py-dist')
+
+    if not os.path.isfile(secrets_current):
+        print("Missing " + secrets_current)
+        print("Maybe you forgot to copy it from -dist:")
+        print("cp libcloud/test/secrets.py-dist libcloud/test/secrets.py")
+        pytest.exit('')
+
+    mtime_current = os.path.getmtime(secrets_current)
+    mtime_dist = os.path.getmtime(secrets_dist)
+
+    if mtime_dist > mtime_current:
+        print("It looks like test/secrets.py file is out of date.")
+        print("Please copy the new secrets.py-dist file over otherwise" +
+              " tests might fail")
+        pytest.exit('')