openstudio-aws 0.1.20 → 0.1.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/openstudio/aws/version.rb +1 -1
- data/lib/openstudio/lib/openstudio_aws_methods.rb +8 -15
- data/spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.6.xml +11 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.7.xml +30 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.35.xml +13 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.3.xml +9 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.3.xml +9 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws.40.xml +7 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Aws.41.xml +7 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.60.xml +9 -0
- data/spec/reports/SPEC-OpenStudio-Aws-Config.60.xml +7 -0
- data/spec/reports/SPEC-OpenStudioAmis-version-1.62.xml +13 -0
- data/spec/reports/SPEC-OpenStudioAmis-version-2.60.xml +9 -0
- data/spec/reports/SPEC-OpenStudioAmis.62.xml +7 -0
- data/spec/reports/SPEC-OpenStudioAwsMethods-processors.62.xml +11 -0
- data/spec/reports/SPEC-OpenStudioAwsMethods.62.xml +7 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-ami-list.0.xml +9 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.61.xml +11 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.52.xml +11 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.61.xml +9 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.10.xml +87 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.10.xml +801 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.61.xml +7 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.62.xml +9 -0
- data/spec/reports/SPEC-OpenStudioAwsWrapper.62.xml +7 -0
- metadata +52 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 17bdf9d334a1ed265f679eaf80b518f969c9b3d2
|
|
4
|
+
data.tar.gz: 1097d8ee762b5c33a6da6645ae403111309fcd9e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d3d38221d5b6628c094ff529cd61c4e83e9cc7f25c20f6942e592adaa8ff554bbdeaa95e2dbdf9b0349d519de4c1da4e084659ed22854b69272a24c369fd4449
|
|
7
|
+
data.tar.gz: b1061ae114a4f303c7f3071661d1ef9b67c97215016dce7d82ad340e50776234c8197ae508a410281bc09afdec1f22ef5e25d663716cea9043703a1bbd136691
|
|
@@ -37,29 +37,22 @@ module OpenStudioAwsMethods
|
|
|
37
37
|
# This list of processors can be pulled out of the ../../doc/amazon_prices.xlsx file
|
|
38
38
|
def find_processors(instance)
|
|
39
39
|
lookup = {
|
|
40
|
+
"m3.medium" => 1,
|
|
41
|
+
"m3.large" => 2,
|
|
40
42
|
"m3.xlarge" => 4,
|
|
41
43
|
"m3.2xlarge" => 8,
|
|
42
|
-
"m1.small" => 1,
|
|
43
|
-
"m1.medium" => 1,
|
|
44
|
-
"m1.large" => 2,
|
|
45
|
-
"m1.xlarge" => 4,
|
|
46
44
|
"c3.large" => 2,
|
|
47
45
|
"c3.xlarge" => 4,
|
|
48
46
|
"c3.2xlarge" => 8,
|
|
49
47
|
"c3.4xlarge" => 16,
|
|
50
48
|
"c3.8xlarge" => 16,
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"
|
|
55
|
-
"
|
|
56
|
-
"m2.xlarge" => 2,
|
|
57
|
-
"m2.2xlarge" => 4,
|
|
58
|
-
"m2.4xlarge" => 8,
|
|
59
|
-
"cr1.8xlarge" => 16,
|
|
60
|
-
"hi1.4xlarge" => 16,
|
|
61
|
-
"hs1.8xlarge" => 16,
|
|
49
|
+
"r3.large" => 2,
|
|
50
|
+
"r3.xlarge" => 4,
|
|
51
|
+
"r3.2xlarge" => 8,
|
|
52
|
+
"r3.4xlarge" => 16,
|
|
53
|
+
"r3.8xlarge" => 32,
|
|
62
54
|
"t1.micro" => 1,
|
|
55
|
+
"m1.small" => 1,
|
|
63
56
|
}
|
|
64
57
|
|
|
65
58
|
processors = 1
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Aws ami lists" tests="2" time="0.262332" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.164366">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.097742">
|
|
6
|
+
</testcase>
|
|
7
|
+
<system-out>
|
|
8
|
+
</system-out>
|
|
9
|
+
<system-err>
|
|
10
|
+
</system-err>
|
|
11
|
+
</testsuite>
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Aws create a new instance" tests="3" time="240.061232" failures="0" errors="1" skipped="0" timestamp="2014-04-28T20:54:16-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Aws create a new instance should create a new instance" time="0.001154">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudio::Aws::Aws create a new instance should create a server" time="25.14252">
|
|
6
|
+
</testcase>
|
|
7
|
+
<testcase name="OpenStudio::Aws::Aws create a new instance should create a 1 worker" time="214.791053">
|
|
8
|
+
<failure type="IOError" message="closed stream">
|
|
9
|
+
closed stream (IOError)
|
|
10
|
+
IOError:
|
|
11
|
+
closed stream
|
|
12
|
+
./lib/openstudio/lib/openstudio_aws_methods.rb:140:in `shell_command'
|
|
13
|
+
./lib/openstudio/lib/openstudio_aws_wrapper.rb:310:in `configure_server_and_workers'
|
|
14
|
+
./lib/openstudio/aws/aws.rb:142:in `create_workers'
|
|
15
|
+
./spec/aws_instances/aws_spec_api.rb:25:in `block (3 levels) in <top (required)>' </failure>
|
|
16
|
+
</testcase>
|
|
17
|
+
<system-out>
|
|
18
|
+
{"timestamp":"1398740056","server":{"id":"i-f5ed22a5","ip":"http://184.73.139.69","dns":"ec2-184-73-139-69.compute-1.amazonaws.com","procs":1}}
|
|
19
|
+
|
|
20
|
+
Server SSH Command:
|
|
21
|
+
ssh -i ec2_server_key.pem ubuntu@ec2-184-73-139-69.compute-1.amazonaws.com
|
|
22
|
+
|
|
23
|
+
Worker SSH Command:
|
|
24
|
+
ssh -i ec2_server_key.pem ubuntu@ec2-50-19-175-85.compute-1.amazonaws.com
|
|
25
|
+
|
|
26
|
+
Waiting for server/worker configurations
|
|
27
|
+
</system-out>
|
|
28
|
+
<system-err>
|
|
29
|
+
</system-err>
|
|
30
|
+
</testsuite>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Aws proxy configuration" tests="3" time="0.225563" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Aws proxy configuration should create an instance" time="0.073954">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy" time="0.071383">
|
|
6
|
+
</testcase>
|
|
7
|
+
<testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy with username / password" time="0.079825">
|
|
8
|
+
</testcase>
|
|
9
|
+
<system-out>
|
|
10
|
+
</system-out>
|
|
11
|
+
<system-err>
|
|
12
|
+
</system-err>
|
|
13
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Aws should error" tests="1" time="0.074258" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Aws should error should not find a json" time="0.074044">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Aws version testing" tests="1" time="0.077369" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Aws version testing version 2: should find the right AMIs Server 1.3.1" time="0.077165">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudio::Aws::Config create a new config" tests="1" time="0.000685" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:12-06:00">
|
|
3
|
+
<testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000385">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAmis version 1" tests="3" time="0.249335" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:04-06:00">
|
|
3
|
+
<testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="0.081676">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="0.087107">
|
|
6
|
+
</testcase>
|
|
7
|
+
<testcase name="OpenStudioAmis version 1 should list all amis" time="0.080175">
|
|
8
|
+
</testcase>
|
|
9
|
+
<system-out>
|
|
10
|
+
</system-out>
|
|
11
|
+
<system-err>
|
|
12
|
+
</system-err>
|
|
13
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAmis version 2" tests="1" time="0.000323" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudioAmis version 2 should default the server version" time="0.000155">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsMethods processors" tests="2" time="0.000523" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:05-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsMethods processors should default to 1 with a warning" time="0.000187">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudioAwsMethods processors should return known values for various instances" time="0.000144">
|
|
6
|
+
</testcase>
|
|
7
|
+
<system-out>
|
|
8
|
+
</system-out>
|
|
9
|
+
<system-err>
|
|
10
|
+
</system-err>
|
|
11
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsWrapper ami list" tests="1" time="0.087363" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:12-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsWrapper ami list should get the next version" time="0.00301">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsWrapper authenticated session availability" tests="2" time="0.748484" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:06-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsWrapper authenticated session availability should describe the zones" time="0.48376">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudioAwsWrapper authenticated session availability should list number of instances" time="0.2645">
|
|
6
|
+
</testcase>
|
|
7
|
+
<system-out>
|
|
8
|
+
</system-out>
|
|
9
|
+
<system-err>
|
|
10
|
+
</system-err>
|
|
11
|
+
</testsuite>
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsWrapper authenticated session create new ami json" tests="2" time="1.723091" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:07-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsWrapper authenticated session create new ami json should describe existing AMIs" time="1.46874">
|
|
4
|
+
</testcase>
|
|
5
|
+
<testcase name="OpenStudioAwsWrapper authenticated session create new ami json should describe a specific image" time="0.254113">
|
|
6
|
+
</testcase>
|
|
7
|
+
<system-out>
|
|
8
|
+
</system-out>
|
|
9
|
+
<system-err>
|
|
10
|
+
</system-err>
|
|
11
|
+
</testsuite>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsWrapper authenticated session new instance" tests="1" time="0.000369" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:06-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsWrapper authenticated session new instance should be created" time="0.000203">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
</system-out>
|
|
7
|
+
<system-err>
|
|
8
|
+
</system-err>
|
|
9
|
+
</testsuite>
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<testsuite name="OpenStudioAwsWrapper authenticated session version 1" tests="1" time="2.253133" failures="0" errors="0" skipped="0" timestamp="2014-04-28T20:54:08-06:00">
|
|
3
|
+
<testcase name="OpenStudioAwsWrapper authenticated session version 1 should create a new json" time="2.252931">
|
|
4
|
+
</testcase>
|
|
5
|
+
<system-out>
|
|
6
|
+
found nil version, incrementing from 0.0.1
|
|
7
|
+
found nil version, incrementing from 0.0.1
|
|
8
|
+
found nil version, incrementing from 0.0.1
|
|
9
|
+
found nil version, incrementing from 0.0.1
|
|
10
|
+
found nil version, incrementing from 0.0.1
|
|
11
|
+
Creating version 1 of the AMI file
|
|
12
|
+
Pretty version 1: {
|
|
13
|
+
"1.3.2": {
|
|
14
|
+
"worker": "ami-a3fee5ca",
|
|
15
|
+
"cc2worker": "ami-cbffe4a2",
|
|
16
|
+
"server": "ami-dbfee5b2"
|
|
17
|
+
},
|
|
18
|
+
"1.3.1": {
|
|
19
|
+
"worker": "ami-17213f7e",
|
|
20
|
+
"server": "ami-f9213f90",
|
|
21
|
+
"cc2worker": "ami-fd203e94"
|
|
22
|
+
},
|
|
23
|
+
"1.3.0": {
|
|
24
|
+
"cc2worker": "ami-73d4c51a",
|
|
25
|
+
"worker": "ami-e5d4c58c",
|
|
26
|
+
"server": "ami-f9d4c590"
|
|
27
|
+
},
|
|
28
|
+
"1.2.5": {
|
|
29
|
+
"worker": "ami-0dc0cb64",
|
|
30
|
+
"cc2worker": "ami-45c0cb2c",
|
|
31
|
+
"server": "ami-f5c0cb9c"
|
|
32
|
+
},
|
|
33
|
+
"1.2.4": {
|
|
34
|
+
"worker": "ami-4b8d8e22",
|
|
35
|
+
"server": "ami-8d8d8ee4",
|
|
36
|
+
"cc2worker": "ami-958e8dfc"
|
|
37
|
+
},
|
|
38
|
+
"1.2.3": {
|
|
39
|
+
"worker": "ami-0baa9062",
|
|
40
|
+
"cc2worker": "ami-d3b48eba",
|
|
41
|
+
"server": "ami-f9aa9090"
|
|
42
|
+
},
|
|
43
|
+
"1.2.2": {
|
|
44
|
+
"cc2worker": "ami-1fb18876",
|
|
45
|
+
"server": "ami-adb188c4",
|
|
46
|
+
"worker": "ami-f1b18898"
|
|
47
|
+
},
|
|
48
|
+
"1.2.1": {
|
|
49
|
+
"worker": "ami-37744b5e",
|
|
50
|
+
"cc2worker": "ami-51744b38",
|
|
51
|
+
"server": "ami-89744be0"
|
|
52
|
+
},
|
|
53
|
+
"1.2.0": {
|
|
54
|
+
"server": "ami-a3edddca",
|
|
55
|
+
"worker": "ami-bfedddd6",
|
|
56
|
+
"cc2worker": "ami-b5eddddc"
|
|
57
|
+
},
|
|
58
|
+
"1.1.3": {
|
|
59
|
+
"server": "ami-fb301292",
|
|
60
|
+
"worker": "ami-21301248",
|
|
61
|
+
"cc2worker": "ami-d73311be"
|
|
62
|
+
},
|
|
63
|
+
"1.1.2": {
|
|
64
|
+
"server": "ami-89f5d3e0",
|
|
65
|
+
"worker": "ami-35f2d45c",
|
|
66
|
+
"cc2worker": "ami-27f2d44e"
|
|
67
|
+
},
|
|
68
|
+
"1.1.1": {
|
|
69
|
+
"server": "ami-955308fc",
|
|
70
|
+
"worker": "ami-c95308a0",
|
|
71
|
+
"cc2worker": "ami-a55308cc"
|
|
72
|
+
},
|
|
73
|
+
"1.1.0": {
|
|
74
|
+
"server": "ami-1b376a72",
|
|
75
|
+
"worker": "ami-970b56fe",
|
|
76
|
+
"cc2worker": "ami-a30b56ca"
|
|
77
|
+
},
|
|
78
|
+
"default": {
|
|
79
|
+
"worker": "ami-a3fee5ca",
|
|
80
|
+
"cc2worker": "ami-cbffe4a2",
|
|
81
|
+
"server": "ami-dbfee5b2"
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
</system-out>
|
|
85
|
+
<system-err>
|
|
86
|
+
</system-err>
|
|
87
|
+
</testsuite>
|