occi-api 4.2.2 → 4.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +3 -3
- data/LICENSE +9 -3
- data/Rakefile +3 -0
- data/lib/occi/api/client/http/party_wrappers.rb +42 -6
- data/lib/occi/api/version.rb +1 -1
- data/occi-api.gemspec +1 -1
- data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_application/occi_json/describes_compute_resources.yml +0 -49
- data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_application/occi_json/describes_network_resources.yml +1 -203
- data/spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_application/occi_json/describes_storage_resources.yml +3 -307
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ad5404bb5609e577fe4115f82b64f32490d0b6d3
|
4
|
+
data.tar.gz: e53a008dece484b6c574abb04d87d100f94c1605
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 327955e2519f7cfa4fe2fca273e7e566c3548c38387cc9ba055fd5acf0bb6317bfc4eb6dd38b2279f185f933b7eb49017f8679999a523b572dfc6d7de9ea58f8
|
7
|
+
data.tar.gz: 8600a70fa389cdbcc230e903bf7541c39f4fc04d94ff7fbdb68415e7be6cdafe6c6f706c76a071d4f7a305ca3463a4275c5cdf6b34d68936509694ada37ab18a
|
data/.travis.yml
CHANGED
@@ -3,7 +3,7 @@ language: ruby
|
|
3
3
|
rvm:
|
4
4
|
- 1.9.3
|
5
5
|
- 2.0.0
|
6
|
-
- 2.1.
|
6
|
+
- 2.1.1
|
7
7
|
- ruby-head
|
8
8
|
- jruby-19mode
|
9
9
|
- jruby-head
|
@@ -26,9 +26,9 @@ matrix:
|
|
26
26
|
jdk: openjdk7
|
27
27
|
- rvm: 2.0.0
|
28
28
|
jdk: oraclejdk7
|
29
|
-
- rvm: 2.1.
|
29
|
+
- rvm: 2.1.1
|
30
30
|
jdk: openjdk7
|
31
|
-
- rvm: 2.1.
|
31
|
+
- rvm: 2.1.1
|
32
32
|
jdk: oraclejdk7
|
33
33
|
- rvm: ruby-head
|
34
34
|
jdk: openjdk7
|
data/LICENSE
CHANGED
@@ -1,13 +1,19 @@
|
|
1
|
-
|
1
|
+
# @markup text
|
2
|
+
|
3
|
+
The work represented by this source file is partially or entirely funded
|
4
|
+
by the EGI-InSPIRE project through the European Commission's 7th Framework
|
5
|
+
Programme (contract # INFSO-RI-261323)
|
6
|
+
|
7
|
+
Copyright (c) 2012-2014 GWDG, CESNET
|
2
8
|
|
3
9
|
Licensed under the Apache License, Version 2.0 (the "License");
|
4
10
|
you may not use this file except in compliance with the License.
|
5
11
|
You may obtain a copy of the License at
|
6
12
|
|
7
|
-
|
13
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
8
14
|
|
9
15
|
Unless required by applicable law or agreed to in writing, software
|
10
16
|
distributed under the License is distributed on an "AS IS" BASIS,
|
11
17
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
12
18
|
See the License for the specific language governing permissions and
|
13
|
-
limitations under the License.
|
19
|
+
limitations under the License.
|
data/Rakefile
CHANGED
@@ -5,6 +5,9 @@ task :default => 'test'
|
|
5
5
|
desc "Run all tests; includes rspec and coverage reports"
|
6
6
|
task :test => 'rcov:all'
|
7
7
|
|
8
|
+
desc "Run all tests; includes rspec and coverage reports"
|
9
|
+
task :spec => 'test'
|
10
|
+
|
8
11
|
Gem::Tasks.new(:build => {:tar => true, :zip => true}, :sign => {:checksum => true, :pgp => false})
|
9
12
|
|
10
13
|
namespace :rcov do
|
@@ -29,7 +29,17 @@ module Occi::Api::Client
|
|
29
29
|
|
30
30
|
response = self.class.get(path, :headers => headers)
|
31
31
|
response_msg = response_message response
|
32
|
-
|
32
|
+
|
33
|
+
unless response.code == 200
|
34
|
+
if response.headers["x-request-id"]
|
35
|
+
message = "HTTP GET with ID[#{response.headers["x-request-id"].inspect}] failed! " \
|
36
|
+
"#{response_msg} : #{response.body.inspect}"
|
37
|
+
else
|
38
|
+
message = "HTTP GET failed! #{response_msg} : #{response.body.inspect}"
|
39
|
+
end
|
40
|
+
|
41
|
+
raise message
|
42
|
+
end
|
33
43
|
|
34
44
|
get_process_response(path, response)
|
35
45
|
end
|
@@ -55,7 +65,17 @@ module Occi::Api::Client
|
|
55
65
|
|
56
66
|
response = send_coll_request(path, collection)
|
57
67
|
response_msg = response_message(response)
|
58
|
-
|
68
|
+
|
69
|
+
unless response.code.between?(200, 201)
|
70
|
+
if response.headers["x-request-id"]
|
71
|
+
message = "HTTP POST with ID[#{response.headers["x-request-id"].inspect}] failed! " \
|
72
|
+
"#{response_msg} : #{response.body.inspect}"
|
73
|
+
else
|
74
|
+
message = "HTTP POST failed! #{response_msg} : #{response.body.inspect}"
|
75
|
+
end
|
76
|
+
|
77
|
+
raise message
|
78
|
+
end
|
59
79
|
|
60
80
|
collection.send(:standalone_action_instance?) ? post_action(response) : post_create(response)
|
61
81
|
end
|
@@ -78,7 +98,14 @@ module Occi::Api::Client
|
|
78
98
|
if response.code.between? 200, 201
|
79
99
|
Occi::Parser.parse(response.content_type, response.body)
|
80
100
|
else
|
81
|
-
|
101
|
+
if response.headers["x-request-id"]
|
102
|
+
message = "HTTP PUT with ID[#{response.headers["x-request-id"].inspect}] failed! " \
|
103
|
+
"#{response_msg} : #{response.body.inspect}"
|
104
|
+
else
|
105
|
+
message = "HTTP PUT failed! #{response_msg} : #{response.body.inspect}"
|
106
|
+
end
|
107
|
+
|
108
|
+
raise message
|
82
109
|
end
|
83
110
|
end
|
84
111
|
|
@@ -94,9 +121,18 @@ module Occi::Api::Client
|
|
94
121
|
raise ArgumentError, "Path is a required argument!" if path.blank?
|
95
122
|
|
96
123
|
response = self.class.delete(path)
|
97
|
-
|
98
124
|
response_msg = response_message(response)
|
99
|
-
|
125
|
+
|
126
|
+
unless response.code == 200
|
127
|
+
if response.headers["x-request-id"]
|
128
|
+
message = "HTTP DELETE with ID[#{response.headers["x-request-id"].inspect}] failed! " \
|
129
|
+
"#{response_msg} : #{response.body.inspect}"
|
130
|
+
else
|
131
|
+
message = "HTTP DELETE failed! #{response_msg} : #{response.body.inspect}"
|
132
|
+
end
|
133
|
+
|
134
|
+
raise message
|
135
|
+
end
|
100
136
|
|
101
137
|
true
|
102
138
|
end
|
@@ -185,4 +221,4 @@ module Occi::Api::Client
|
|
185
221
|
end
|
186
222
|
|
187
223
|
end
|
188
|
-
end
|
224
|
+
end
|
data/lib/occi/api/version.rb
CHANGED
data/occi-api.gemspec
CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
|
|
18
18
|
gem.test_files = `git ls-files -- {test,spec}/*`.split("\n")
|
19
19
|
gem.require_paths = ["lib"]
|
20
20
|
|
21
|
-
gem.add_dependency 'occi-core', '~> 4.2.
|
21
|
+
gem.add_dependency 'occi-core', '~> 4.2.14'
|
22
22
|
gem.add_dependency 'httparty'
|
23
23
|
gem.add_dependency 'json'
|
24
24
|
|
@@ -787,55 +787,6 @@ http_interactions:
|
|
787
787
|
- request:
|
788
788
|
method: get
|
789
789
|
uri: https://rocci-test:edited@localhost:3300/compute/
|
790
|
-
body:
|
791
|
-
encoding: US-ASCII
|
792
|
-
string: ''
|
793
|
-
headers:
|
794
|
-
Accept:
|
795
|
-
- text/uri-list
|
796
|
-
User-Agent:
|
797
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
798
|
-
response:
|
799
|
-
status:
|
800
|
-
code: 200
|
801
|
-
message: OK
|
802
|
-
headers:
|
803
|
-
Date:
|
804
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
805
|
-
Server:
|
806
|
-
- Apache/2.2.22 (Debian)
|
807
|
-
X-Frame-Options:
|
808
|
-
- SAMEORIGIN
|
809
|
-
X-Xss-Protection:
|
810
|
-
- 1; mode=block
|
811
|
-
X-Content-Type-Options:
|
812
|
-
- nosniff
|
813
|
-
X-Ua-Compatible:
|
814
|
-
- chrome=1
|
815
|
-
Etag:
|
816
|
-
- ! '"c3a2b5a7088954c3fa6040c7160e422e"'
|
817
|
-
Cache-Control:
|
818
|
-
- max-age=0, private, must-revalidate
|
819
|
-
X-Request-Id:
|
820
|
-
- 2d7611c8-fc9f-4505-8c46-e51f64ea74fa
|
821
|
-
X-Runtime:
|
822
|
-
- '0.083468'
|
823
|
-
X-Powered-By:
|
824
|
-
- Phusion Passenger 4.0.29
|
825
|
-
Status:
|
826
|
-
- 200 OK
|
827
|
-
Transfer-Encoding:
|
828
|
-
- chunked
|
829
|
-
Content-Type:
|
830
|
-
- text/uri-list; charset=utf-8
|
831
|
-
body:
|
832
|
-
encoding: US-ASCII
|
833
|
-
string: https://localhost:3300/compute/4011
|
834
|
-
http_version:
|
835
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
836
|
-
- request:
|
837
|
-
method: get
|
838
|
-
uri: https://rocci-test:edited@localhost:3300/compute/4011
|
839
790
|
body:
|
840
791
|
encoding: US-ASCII
|
841
792
|
string: ''
|
@@ -787,61 +787,6 @@ http_interactions:
|
|
787
787
|
- request:
|
788
788
|
method: get
|
789
789
|
uri: https://rocci-test:edited@localhost:3300/network/
|
790
|
-
body:
|
791
|
-
encoding: US-ASCII
|
792
|
-
string: ''
|
793
|
-
headers:
|
794
|
-
Accept:
|
795
|
-
- text/uri-list
|
796
|
-
User-Agent:
|
797
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
798
|
-
response:
|
799
|
-
status:
|
800
|
-
code: 200
|
801
|
-
message: OK
|
802
|
-
headers:
|
803
|
-
Date:
|
804
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
805
|
-
Server:
|
806
|
-
- Apache/2.2.22 (Debian)
|
807
|
-
X-Frame-Options:
|
808
|
-
- SAMEORIGIN
|
809
|
-
X-Xss-Protection:
|
810
|
-
- 1; mode=block
|
811
|
-
X-Content-Type-Options:
|
812
|
-
- nosniff
|
813
|
-
X-Ua-Compatible:
|
814
|
-
- chrome=1
|
815
|
-
Etag:
|
816
|
-
- ! '"c9ec20109c11d095e0c6d1b9ecb76970"'
|
817
|
-
Cache-Control:
|
818
|
-
- max-age=0, private, must-revalidate
|
819
|
-
X-Request-Id:
|
820
|
-
- 76576291-c1a0-46a8-a300-bc62cfbc39bf
|
821
|
-
X-Runtime:
|
822
|
-
- '0.090627'
|
823
|
-
X-Powered-By:
|
824
|
-
- Phusion Passenger 4.0.29
|
825
|
-
Status:
|
826
|
-
- 200 OK
|
827
|
-
Transfer-Encoding:
|
828
|
-
- chunked
|
829
|
-
Content-Type:
|
830
|
-
- text/uri-list; charset=utf-8
|
831
|
-
body:
|
832
|
-
encoding: US-ASCII
|
833
|
-
string: ! 'https://localhost:3300/network/1
|
834
|
-
|
835
|
-
https://localhost:3300/network/2
|
836
|
-
|
837
|
-
https://localhost:3300/network/12
|
838
|
-
|
839
|
-
https://localhost:3300/network/61'
|
840
|
-
http_version:
|
841
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
842
|
-
- request:
|
843
|
-
method: get
|
844
|
-
uri: https://rocci-test:edited@localhost:3300/network/1
|
845
790
|
body:
|
846
791
|
encoding: US-ASCII
|
847
792
|
string: ''
|
@@ -885,154 +830,7 @@ http_interactions:
|
|
885
830
|
- application/occi+json; charset=utf-8
|
886
831
|
body:
|
887
832
|
encoding: US-ASCII
|
888
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"1","title":"public"},"network":{"vlan":0,"state":"active","allocation":"static"}},"org":{"opennebula":{"network":{"id":"1","vlan":"NO","bridge":"xenbr0"}}}},"id":"1"}]}'
|
889
|
-
http_version:
|
890
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
891
|
-
- request:
|
892
|
-
method: get
|
893
|
-
uri: https://rocci-test:edited@localhost:3300/network/2
|
894
|
-
body:
|
895
|
-
encoding: US-ASCII
|
896
|
-
string: ''
|
897
|
-
headers:
|
898
|
-
Accept:
|
899
|
-
- application/occi+json
|
900
|
-
User-Agent:
|
901
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
902
|
-
response:
|
903
|
-
status:
|
904
|
-
code: 200
|
905
|
-
message: OK
|
906
|
-
headers:
|
907
|
-
Date:
|
908
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
909
|
-
Server:
|
910
|
-
- Apache/2.2.22 (Debian)
|
911
|
-
X-Frame-Options:
|
912
|
-
- SAMEORIGIN
|
913
|
-
X-Xss-Protection:
|
914
|
-
- 1; mode=block
|
915
|
-
X-Content-Type-Options:
|
916
|
-
- nosniff
|
917
|
-
X-Ua-Compatible:
|
918
|
-
- chrome=1
|
919
|
-
Etag:
|
920
|
-
- ! '"76b6fa36ca8776f5704d95b8871176b0"'
|
921
|
-
Cache-Control:
|
922
|
-
- max-age=0, private, must-revalidate
|
923
|
-
X-Request-Id:
|
924
|
-
- 8b6f28d0-6ade-4508-be06-4c7ebc56476f
|
925
|
-
X-Runtime:
|
926
|
-
- '0.024731'
|
927
|
-
X-Powered-By:
|
928
|
-
- Phusion Passenger 4.0.29
|
929
|
-
Status:
|
930
|
-
- 200 OK
|
931
|
-
Transfer-Encoding:
|
932
|
-
- chunked
|
933
|
-
Content-Type:
|
934
|
-
- application/occi+json; charset=utf-8
|
935
|
-
body:
|
936
|
-
encoding: US-ASCII
|
937
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"2","title":"monitoring"},"network":{"vlan":0,"state":"active","allocation":"dynamic"}},"org":{"opennebula":{"network":{"id":"2","vlan":"NO","bridge":"xenbr0","ip_start":"192.168.254.1","ip_end":"192.168.254.254"}}}},"id":"2"}]}'
|
938
|
-
http_version:
|
939
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
940
|
-
- request:
|
941
|
-
method: get
|
942
|
-
uri: https://rocci-test:edited@localhost:3300/network/12
|
943
|
-
body:
|
944
|
-
encoding: US-ASCII
|
945
|
-
string: ''
|
946
|
-
headers:
|
947
|
-
Accept:
|
948
|
-
- application/occi+json
|
949
|
-
User-Agent:
|
950
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
951
|
-
response:
|
952
|
-
status:
|
953
|
-
code: 200
|
954
|
-
message: OK
|
955
|
-
headers:
|
956
|
-
Date:
|
957
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
958
|
-
Server:
|
959
|
-
- Apache/2.2.22 (Debian)
|
960
|
-
X-Frame-Options:
|
961
|
-
- SAMEORIGIN
|
962
|
-
X-Xss-Protection:
|
963
|
-
- 1; mode=block
|
964
|
-
X-Content-Type-Options:
|
965
|
-
- nosniff
|
966
|
-
X-Ua-Compatible:
|
967
|
-
- chrome=1
|
968
|
-
Etag:
|
969
|
-
- ! '"1e83ccc0d38af89fb7a10319d4c1fdba"'
|
970
|
-
Cache-Control:
|
971
|
-
- max-age=0, private, must-revalidate
|
972
|
-
X-Request-Id:
|
973
|
-
- dfc3a38d-3e5c-4d39-b408-5e395ca2630d
|
974
|
-
X-Runtime:
|
975
|
-
- '0.028780'
|
976
|
-
X-Powered-By:
|
977
|
-
- Phusion Passenger 4.0.29
|
978
|
-
Status:
|
979
|
-
- 200 OK
|
980
|
-
Transfer-Encoding:
|
981
|
-
- chunked
|
982
|
-
Content-Type:
|
983
|
-
- application/occi+json; charset=utf-8
|
984
|
-
body:
|
985
|
-
encoding: US-ASCII
|
986
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"12","title":"private"},"network":{"vlan":0,"state":"active","allocation":"static"}},"org":{"opennebula":{"network":{"id":"12","vlan":"NO","bridge":"xenbr0","ip_start":"10.4.0.1","ip_end":"10.4.0.254"}}}},"id":"12"}]}'
|
987
|
-
http_version:
|
988
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
989
|
-
- request:
|
990
|
-
method: get
|
991
|
-
uri: https://rocci-test:edited@localhost:3300/network/61
|
992
|
-
body:
|
993
|
-
encoding: US-ASCII
|
994
|
-
string: ''
|
995
|
-
headers:
|
996
|
-
Accept:
|
997
|
-
- application/occi+json
|
998
|
-
User-Agent:
|
999
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
1000
|
-
response:
|
1001
|
-
status:
|
1002
|
-
code: 200
|
1003
|
-
message: OK
|
1004
|
-
headers:
|
1005
|
-
Date:
|
1006
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
1007
|
-
Server:
|
1008
|
-
- Apache/2.2.22 (Debian)
|
1009
|
-
X-Frame-Options:
|
1010
|
-
- SAMEORIGIN
|
1011
|
-
X-Xss-Protection:
|
1012
|
-
- 1; mode=block
|
1013
|
-
X-Content-Type-Options:
|
1014
|
-
- nosniff
|
1015
|
-
X-Ua-Compatible:
|
1016
|
-
- chrome=1
|
1017
|
-
Etag:
|
1018
|
-
- ! '"61fecbc501315ab36b90a32c5c87aa96"'
|
1019
|
-
Cache-Control:
|
1020
|
-
- max-age=0, private, must-revalidate
|
1021
|
-
X-Request-Id:
|
1022
|
-
- 071a6cd9-4c2d-47fc-8791-6c800c41a8fb
|
1023
|
-
X-Runtime:
|
1024
|
-
- '0.048583'
|
1025
|
-
X-Powered-By:
|
1026
|
-
- Phusion Passenger 4.0.29
|
1027
|
-
Status:
|
1028
|
-
- 200 OK
|
1029
|
-
Transfer-Encoding:
|
1030
|
-
- chunked
|
1031
|
-
Content-Type:
|
1032
|
-
- application/occi+json; charset=utf-8
|
1033
|
-
body:
|
1034
|
-
encoding: US-ASCII
|
1035
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"61","title":"hubik-dev"},"network":{"vlan":0,"state":"active","address":"10.0.0.0/24","allocation":"dynamic"}},"org":{"opennebula":{"network":{"id":"61","vlan":"NO","bridge":"br0","ip_start":"10.0.0.1","ip_end":"10.0.0.254"}}}},"id":"61"}]}'
|
833
|
+
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"1","title":"public"},"network":{"vlan":0,"state":"active","allocation":"static"}},"org":{"opennebula":{"network":{"id":"1","vlan":"NO","bridge":"xenbr0"}}}},"id":"1"},{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"2","title":"monitoring"},"network":{"vlan":0,"state":"active","allocation":"dynamic"}},"org":{"opennebula":{"network":{"id":"2","vlan":"NO","bridge":"xenbr0","ip_start":"192.168.254.1","ip_end":"192.168.254.254"}}}},"id":"2"},{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"12","title":"private"},"network":{"vlan":0,"state":"active","allocation":"static"}},"org":{"opennebula":{"network":{"id":"12","vlan":"NO","bridge":"xenbr0","ip_start":"10.4.0.1","ip_end":"10.4.0.254"}}}},"id":"12"},{"kind":"http://schemas.ogf.org/occi/infrastructure#network","mixins":["http://opennebula.org/occi/infrastructure#network","http://schemas.ogf.org/occi/infrastructure/network#ipnetwork"],"attributes":{"occi":{"core":{"id":"61","title":"hubik-dev"},"network":{"vlan":0,"state":"active","address":"10.0.0.0/24","allocation":"dynamic"}},"org":{"opennebula":{"network":{"id":"61","vlan":"NO","bridge":"br0","ip_start":"10.0.0.1","ip_end":"10.0.0.254"}}}},"id":"61"}]}'
|
1036
834
|
http_version:
|
1037
835
|
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
1038
836
|
recorded_with: VCR 2.8.0
|
@@ -787,65 +787,6 @@ http_interactions:
|
|
787
787
|
- request:
|
788
788
|
method: get
|
789
789
|
uri: https://rocci-test:edited@localhost:3300/storage/
|
790
|
-
body:
|
791
|
-
encoding: US-ASCII
|
792
|
-
string: ''
|
793
|
-
headers:
|
794
|
-
Accept:
|
795
|
-
- text/uri-list
|
796
|
-
User-Agent:
|
797
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
798
|
-
response:
|
799
|
-
status:
|
800
|
-
code: 200
|
801
|
-
message: OK
|
802
|
-
headers:
|
803
|
-
Date:
|
804
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
805
|
-
Server:
|
806
|
-
- Apache/2.2.22 (Debian)
|
807
|
-
X-Frame-Options:
|
808
|
-
- SAMEORIGIN
|
809
|
-
X-Xss-Protection:
|
810
|
-
- 1; mode=block
|
811
|
-
X-Content-Type-Options:
|
812
|
-
- nosniff
|
813
|
-
X-Ua-Compatible:
|
814
|
-
- chrome=1
|
815
|
-
Etag:
|
816
|
-
- ! '"a4c9cda5fc7b9527c92dbcd66e711e91"'
|
817
|
-
Cache-Control:
|
818
|
-
- max-age=0, private, must-revalidate
|
819
|
-
X-Request-Id:
|
820
|
-
- e3bd7fe6-555a-4af7-ba7b-36cd7628bdaf
|
821
|
-
X-Runtime:
|
822
|
-
- '0.114574'
|
823
|
-
X-Powered-By:
|
824
|
-
- Phusion Passenger 4.0.29
|
825
|
-
Status:
|
826
|
-
- 200 OK
|
827
|
-
Transfer-Encoding:
|
828
|
-
- chunked
|
829
|
-
Content-Type:
|
830
|
-
- text/uri-list; charset=utf-8
|
831
|
-
body:
|
832
|
-
encoding: US-ASCII
|
833
|
-
string: ! 'https://localhost:3300/storage/4
|
834
|
-
|
835
|
-
https://localhost:3300/storage/8
|
836
|
-
|
837
|
-
https://localhost:3300/storage/129
|
838
|
-
|
839
|
-
https://localhost:3300/storage/375
|
840
|
-
|
841
|
-
https://localhost:3300/storage/502
|
842
|
-
|
843
|
-
https://localhost:3300/storage/547'
|
844
|
-
http_version:
|
845
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
846
|
-
- request:
|
847
|
-
method: get
|
848
|
-
uri: https://rocci-test:edited@localhost:3300/storage/4
|
849
790
|
body:
|
850
791
|
encoding: US-ASCII
|
851
792
|
string: ''
|
@@ -890,254 +831,9 @@ http_interactions:
|
|
890
831
|
body:
|
891
832
|
encoding: US-ASCII
|
892
833
|
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"actions":[{"scheme":"http://schemas.ogf.org/occi/infrastructure/storage/action#","term":"offline","attributes":{}},{"scheme":"http://schemas.ogf.org/occi/infrastructure/storage/action#","term":"backup","attributes":{}}],"attributes":{"occi":{"core":{"id":"4","title":"monitoring","summary":"Small
|
893
|
-
image for monitoring purposes"},"storage":{"size":0.103515625,"state":"online"}},"org":{"opennebula":{"storage":{"id":"4","type":"OS","persistent":"NO","dev_prefix":"xvd","bus":"IDE"}}}},"id":"4"}]
|
894
|
-
|
895
|
-
|
896
|
-
- request:
|
897
|
-
method: get
|
898
|
-
uri: https://rocci-test:edited@localhost:3300/storage/8
|
899
|
-
body:
|
900
|
-
encoding: US-ASCII
|
901
|
-
string: ''
|
902
|
-
headers:
|
903
|
-
Accept:
|
904
|
-
- application/occi+json
|
905
|
-
User-Agent:
|
906
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
907
|
-
response:
|
908
|
-
status:
|
909
|
-
code: 200
|
910
|
-
message: OK
|
911
|
-
headers:
|
912
|
-
Date:
|
913
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
914
|
-
Server:
|
915
|
-
- Apache/2.2.22 (Debian)
|
916
|
-
X-Frame-Options:
|
917
|
-
- SAMEORIGIN
|
918
|
-
X-Xss-Protection:
|
919
|
-
- 1; mode=block
|
920
|
-
X-Content-Type-Options:
|
921
|
-
- nosniff
|
922
|
-
X-Ua-Compatible:
|
923
|
-
- chrome=1
|
924
|
-
Etag:
|
925
|
-
- ! '"084bfbdb8e19e982905bf205417997ee"'
|
926
|
-
Cache-Control:
|
927
|
-
- max-age=0, private, must-revalidate
|
928
|
-
X-Request-Id:
|
929
|
-
- 332e7d74-d061-42db-958d-6c0d76a71e16
|
930
|
-
X-Runtime:
|
931
|
-
- '0.117532'
|
932
|
-
X-Powered-By:
|
933
|
-
- Phusion Passenger 4.0.29
|
934
|
-
Status:
|
935
|
-
- 200 OK
|
936
|
-
Transfer-Encoding:
|
937
|
-
- chunked
|
938
|
-
Content-Type:
|
939
|
-
- application/occi+json; charset=utf-8
|
940
|
-
body:
|
941
|
-
encoding: US-ASCII
|
942
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"8","title":"debian6","summary":"Clean
|
943
|
-
Debian6 (Squeeze) x64 image"},"storage":{"size":8.0,"state":"online"}},"org":{"opennebula":{"storage":{"id":"8","type":"OS","persistent":"NO","dev_prefix":"xvd","bus":"IDE"}}}},"id":"8"}]}'
|
944
|
-
http_version:
|
945
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
946
|
-
- request:
|
947
|
-
method: get
|
948
|
-
uri: https://rocci-test:edited@localhost:3300/storage/129
|
949
|
-
body:
|
950
|
-
encoding: US-ASCII
|
951
|
-
string: ''
|
952
|
-
headers:
|
953
|
-
Accept:
|
954
|
-
- application/occi+json
|
955
|
-
User-Agent:
|
956
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
957
|
-
response:
|
958
|
-
status:
|
959
|
-
code: 200
|
960
|
-
message: OK
|
961
|
-
headers:
|
962
|
-
Date:
|
963
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
964
|
-
Server:
|
965
|
-
- Apache/2.2.22 (Debian)
|
966
|
-
X-Frame-Options:
|
967
|
-
- SAMEORIGIN
|
968
|
-
X-Xss-Protection:
|
969
|
-
- 1; mode=block
|
970
|
-
X-Content-Type-Options:
|
971
|
-
- nosniff
|
972
|
-
X-Ua-Compatible:
|
973
|
-
- chrome=1
|
974
|
-
Etag:
|
975
|
-
- ! '"65659852a5f3a400706a86171cda42f8"'
|
976
|
-
Cache-Control:
|
977
|
-
- max-age=0, private, must-revalidate
|
978
|
-
X-Request-Id:
|
979
|
-
- fb9aa86d-3611-4dfe-bcfe-68ef70da45ed
|
980
|
-
X-Runtime:
|
981
|
-
- '0.023079'
|
982
|
-
X-Powered-By:
|
983
|
-
- Phusion Passenger 4.0.29
|
984
|
-
Status:
|
985
|
-
- 200 OK
|
986
|
-
Transfer-Encoding:
|
987
|
-
- chunked
|
988
|
-
Content-Type:
|
989
|
-
- application/occi+json; charset=utf-8
|
990
|
-
body:
|
991
|
-
encoding: US-ASCII
|
992
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"129","title":"CERIT-SC-Debian-6.0-0002.cerit-sc-cloud","summary":"CERIT-SC
|
993
|
-
Debian 6.0 for OpenNebula"},"storage":{"size":0.404296875,"state":"online"}},"org":{"opennebula":{"storage":{"id":"129","type":"OS","persistent":"NO","dev_prefix":"vd","driver":"qcow2"}}}},"id":"129"}]}'
|
994
|
-
http_version:
|
995
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
996
|
-
- request:
|
997
|
-
method: get
|
998
|
-
uri: https://rocci-test:edited@localhost:3300/storage/375
|
999
|
-
body:
|
1000
|
-
encoding: US-ASCII
|
1001
|
-
string: ''
|
1002
|
-
headers:
|
1003
|
-
Accept:
|
1004
|
-
- application/occi+json
|
1005
|
-
User-Agent:
|
1006
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
1007
|
-
response:
|
1008
|
-
status:
|
1009
|
-
code: 200
|
1010
|
-
message: OK
|
1011
|
-
headers:
|
1012
|
-
Date:
|
1013
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
1014
|
-
Server:
|
1015
|
-
- Apache/2.2.22 (Debian)
|
1016
|
-
X-Frame-Options:
|
1017
|
-
- SAMEORIGIN
|
1018
|
-
X-Xss-Protection:
|
1019
|
-
- 1; mode=block
|
1020
|
-
X-Content-Type-Options:
|
1021
|
-
- nosniff
|
1022
|
-
X-Ua-Compatible:
|
1023
|
-
- chrome=1
|
1024
|
-
Etag:
|
1025
|
-
- ! '"58a94c57dcf60605d7474b6250f161b8"'
|
1026
|
-
Cache-Control:
|
1027
|
-
- max-age=0, private, must-revalidate
|
1028
|
-
X-Request-Id:
|
1029
|
-
- c24066fb-ae63-4f51-bc5e-81e03a128745
|
1030
|
-
X-Runtime:
|
1031
|
-
- '0.022693'
|
1032
|
-
X-Powered-By:
|
1033
|
-
- Phusion Passenger 4.0.29
|
1034
|
-
Status:
|
1035
|
-
- 200 OK
|
1036
|
-
Transfer-Encoding:
|
1037
|
-
- chunked
|
1038
|
-
Content-Type:
|
1039
|
-
- application/occi+json; charset=utf-8
|
1040
|
-
body:
|
1041
|
-
encoding: US-ASCII
|
1042
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"375","title":"OL-6.3-MM-gold"},"storage":{"size":1.060546875,"state":"online"}},"org":{"opennebula":{"storage":{"id":"375","type":"OS","persistent":"NO","dev_prefix":"vd","driver":"qcow2"}}}},"id":"375"}]}'
|
1043
|
-
http_version:
|
1044
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
1045
|
-
- request:
|
1046
|
-
method: get
|
1047
|
-
uri: https://rocci-test:edited@localhost:3300/storage/502
|
1048
|
-
body:
|
1049
|
-
encoding: US-ASCII
|
1050
|
-
string: ''
|
1051
|
-
headers:
|
1052
|
-
Accept:
|
1053
|
-
- application/occi+json
|
1054
|
-
User-Agent:
|
1055
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
1056
|
-
response:
|
1057
|
-
status:
|
1058
|
-
code: 200
|
1059
|
-
message: OK
|
1060
|
-
headers:
|
1061
|
-
Date:
|
1062
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
1063
|
-
Server:
|
1064
|
-
- Apache/2.2.22 (Debian)
|
1065
|
-
X-Frame-Options:
|
1066
|
-
- SAMEORIGIN
|
1067
|
-
X-Xss-Protection:
|
1068
|
-
- 1; mode=block
|
1069
|
-
X-Content-Type-Options:
|
1070
|
-
- nosniff
|
1071
|
-
X-Ua-Compatible:
|
1072
|
-
- chrome=1
|
1073
|
-
Etag:
|
1074
|
-
- ! '"03d4320d0a7a5e77aff28b9dff004736"'
|
1075
|
-
Cache-Control:
|
1076
|
-
- max-age=0, private, must-revalidate
|
1077
|
-
X-Request-Id:
|
1078
|
-
- bd5b75b4-1557-40e7-acac-d56d02ff69f4
|
1079
|
-
X-Runtime:
|
1080
|
-
- '0.041495'
|
1081
|
-
X-Powered-By:
|
1082
|
-
- Phusion Passenger 4.0.29
|
1083
|
-
Status:
|
1084
|
-
- 200 OK
|
1085
|
-
Transfer-Encoding:
|
1086
|
-
- chunked
|
1087
|
-
Content-Type:
|
1088
|
-
- application/occi+json; charset=utf-8
|
1089
|
-
body:
|
1090
|
-
encoding: US-ASCII
|
1091
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"502","title":"debian6gal+RepEx_full_hapala_updated2","summary":"debian6gal+RepEx_full_nicki_updated2"},"storage":{"size":10.0,"state":"online"}},"org":{"opennebula":{"storage":{"id":"502","type":"OS","persistent":"YES","dev_prefix":"xvd"}}}},"id":"502"}]}'
|
1092
|
-
http_version:
|
1093
|
-
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
1094
|
-
- request:
|
1095
|
-
method: get
|
1096
|
-
uri: https://rocci-test:edited@localhost:3300/storage/547
|
1097
|
-
body:
|
1098
|
-
encoding: US-ASCII
|
1099
|
-
string: ''
|
1100
|
-
headers:
|
1101
|
-
Accept:
|
1102
|
-
- application/occi+json
|
1103
|
-
User-Agent:
|
1104
|
-
- rOCCI-core/4.2.5 rOCCI-api/4.2.0.beta.12 OCCI/1.1 ruby-x86_64-linux/1.9.3p194
|
1105
|
-
response:
|
1106
|
-
status:
|
1107
|
-
code: 200
|
1108
|
-
message: OK
|
1109
|
-
headers:
|
1110
|
-
Date:
|
1111
|
-
- Thu, 01 Jan 1970 00:00:00 GMT
|
1112
|
-
Server:
|
1113
|
-
- Apache/2.2.22 (Debian)
|
1114
|
-
X-Frame-Options:
|
1115
|
-
- SAMEORIGIN
|
1116
|
-
X-Xss-Protection:
|
1117
|
-
- 1; mode=block
|
1118
|
-
X-Content-Type-Options:
|
1119
|
-
- nosniff
|
1120
|
-
X-Ua-Compatible:
|
1121
|
-
- chrome=1
|
1122
|
-
Etag:
|
1123
|
-
- ! '"577fa408f45e804d0af3ed3b882ea71a"'
|
1124
|
-
Cache-Control:
|
1125
|
-
- max-age=0, private, must-revalidate
|
1126
|
-
X-Request-Id:
|
1127
|
-
- cc36eaa4-4efc-41ec-ad53-0ee8c66923aa
|
1128
|
-
X-Runtime:
|
1129
|
-
- '0.023406'
|
1130
|
-
X-Powered-By:
|
1131
|
-
- Phusion Passenger 4.0.29
|
1132
|
-
Status:
|
1133
|
-
- 200 OK
|
1134
|
-
Transfer-Encoding:
|
1135
|
-
- chunked
|
1136
|
-
Content-Type:
|
1137
|
-
- application/occi+json; charset=utf-8
|
1138
|
-
body:
|
1139
|
-
encoding: US-ASCII
|
1140
|
-
string: ! '{"resources":[{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"547","title":"winByAli","summary":"Z
|
834
|
+
image for monitoring purposes"},"storage":{"size":0.103515625,"state":"online"}},"org":{"opennebula":{"storage":{"id":"4","type":"OS","persistent":"NO","dev_prefix":"xvd","bus":"IDE"}}}},"id":"4"},{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"8","title":"debian6","summary":"Clean
|
835
|
+
Debian6 (Squeeze) x64 image"},"storage":{"size":8.0,"state":"online"}},"org":{"opennebula":{"storage":{"id":"8","type":"OS","persistent":"NO","dev_prefix":"xvd","bus":"IDE"}}}},"id":"8"},{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"129","title":"CERIT-SC-Debian-6.0-0002.cerit-sc-cloud","summary":"CERIT-SC
|
836
|
+
Debian 6.0 for OpenNebula"},"storage":{"size":0.404296875,"state":"online"}},"org":{"opennebula":{"storage":{"id":"129","type":"OS","persistent":"NO","dev_prefix":"vd","driver":"qcow2"}}}},"id":"129"},{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"375","title":"OL-6.3-MM-gold"},"storage":{"size":1.060546875,"state":"online"}},"org":{"opennebula":{"storage":{"id":"375","type":"OS","persistent":"NO","dev_prefix":"vd","driver":"qcow2"}}}},"id":"375"},{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"502","title":"debian6gal+RepEx_full_hapala_updated2","summary":"debian6gal+RepEx_full_nicki_updated2"},"storage":{"size":10.0,"state":"online"}},"org":{"opennebula":{"storage":{"id":"502","type":"OS","persistent":"YES","dev_prefix":"xvd"}}}},"id":"502"},{"kind":"http://schemas.ogf.org/occi/infrastructure#storage","mixins":["http://opennebula.org/occi/infrastructure#storage"],"attributes":{"occi":{"core":{"id":"547","title":"winByAli","summary":"Z
|
1141
837
|
obrazu Aliho WinSrv2012_64b_Cloud.qcow2"},"storage":{"size":11.0927734375,"state":"online"}},"org":{"opennebula":{"storage":{"id":"547","type":"OS","persistent":"NO","dev_prefix":"xvd"}}}},"id":"547"}]}'
|
1142
838
|
http_version:
|
1143
839
|
recorded_at: Thu, 01 Jan 1970 00:00:00 GMT
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: occi-api
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.2.
|
4
|
+
version: 4.2.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Florian Feldhaus
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2014-
|
13
|
+
date: 2014-05-12 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: occi-core
|
@@ -18,14 +18,14 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 4.2.
|
21
|
+
version: 4.2.14
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
26
|
- - ~>
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
version: 4.2.
|
28
|
+
version: 4.2.14
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: httparty
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
219
219
|
version: '0'
|
220
220
|
requirements: []
|
221
221
|
rubyforge_project:
|
222
|
-
rubygems_version: 2.
|
222
|
+
rubygems_version: 2.2.2
|
223
223
|
signing_key:
|
224
224
|
specification_version: 4
|
225
225
|
summary: OCCI development library providing a high-level API
|