You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/10/07 02:25:04 UTC

[08/12] libcloud git commit: Add tests and fixtures FCU DescribeInstanceTypes API

Add tests and fixtures FCU DescribeInstanceTypes API

Signed-off-by: Javier M. Mellid <jm...@igalia.com>


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

Branch: refs/heads/trunk
Commit: dccaabd6211b13096dd8fe30d7629132af8cfd70
Parents: 4269490
Author: Javier M. Mellid <jm...@igalia.com>
Authored: Tue Oct 4 11:21:27 2016 +0200
Committer: Anthony Shaw <an...@apache.org>
Committed: Fri Oct 7 13:23:41 2016 +1100

----------------------------------------------------------------------
 .../fixtures/fcu/ex_describe_instance_types.xml | 33 ++++++++++++++++++++
 libcloud/test/compute/test_ec2.py               | 14 +++++++++
 2 files changed, 47 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/dccaabd6/libcloud/test/compute/fixtures/fcu/ex_describe_instance_types.xml
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/fixtures/fcu/ex_describe_instance_types.xml b/libcloud/test/compute/fixtures/fcu/ex_describe_instance_types.xml
new file mode 100644
index 0000000..c66f030
--- /dev/null
+++ b/libcloud/test/compute/fixtures/fcu/ex_describe_instance_types.xml
@@ -0,0 +1,33 @@
+<DescribeInstanceTypesResponse
+    xmlns="http://api.outscale.com/wsdl/fcuext/2014-04-15/">
+    <requestId>0556395e-4fe3-4cc1-80cb-c98b9f44ca4b</requestId>
+    <instanceTypeSet>
+        <item>
+            <name>og4.4xlarge</name>
+            <vcpu>24</vcpu>
+            <memory>193273528320</memory>
+            <storageSize>412316860416</storageSize>
+            <storageCount>1</storageCount>
+            <maxIpAddresses>30</maxIpAddresses>
+            <ebsOptimizedAvailable>true</ebsOptimizedAvailable>
+        </item>
+        <item>
+            <name>m3.large</name>
+            <vcpu>2</vcpu>
+            <memory>8050966528</memory>
+            <storageSize>34359738368</storageSize>
+            <storageCount>1</storageCount>
+            <maxIpAddresses>10</maxIpAddresses>
+            <ebsOptimizedAvailable>false</ebsOptimizedAvailable>
+        </item>
+        <item>
+            <name>oc2.8xlarge</name>
+            <vcpu>15</vcpu>
+            <memory>68718428160</memory>
+            <storageSize>901943132160</storageSize>
+            <storageCount>4</storageCount>
+            <maxIpAddresses>30</maxIpAddresses>
+            <ebsOptimizedAvailable>false</ebsOptimizedAvailable>
+        </item>
+    </instanceTypeSet>
+</DescribeInstanceTypesResponse>

http://git-wip-us.apache.org/repos/asf/libcloud/blob/dccaabd6/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 50aef44..f772518 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -1806,6 +1806,10 @@ class FCUMockHttp(EC2MockHttp):
         body = self.fixtures.load('ex_describe_product_types.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _DescribeInstanceTypes(self, method, url, body, headers):
+        body = self.fixtures.load('ex_describe_instance_types.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
 
 class OutscaleFCUTests(LibcloudTestCase):
 
@@ -1832,6 +1836,16 @@ class OutscaleFCUTests(LibcloudTestCase):
         self.assertTrue('MapR' in pt.values())
         self.assertTrue(pt['0002'] == 'Windows')
 
+    def test_ex_describe_instance_instance_types(self):
+        instance_types = self.driver.ex_describe_instance_types()
+        it = {}
+        for e in instance_types:
+            it[e['name']] = e['memory']
+        self.assertTrue('og4.4xlarge' in it.keys())
+        self.assertTrue('oc2.8xlarge' in it.keys())
+        self.assertTrue('68718428160' in it.values())
+        self.assertTrue(it['m3.large'] == '8050966528')
+
 
 if __name__ == '__main__':
     sys.exit(unittest.main())