Skip to content

Commit

Permalink
cloud4e szenario stuff
Browse files Browse the repository at this point in the history
 - fog.io implementation for compute deploy
 - link and amqp handling
 - link and mixin persistence
 - occi id match for openstack ids
  • Loading branch information
Florian Feldhaus authored and Maik Srba committed Jan 19, 2013
1 parent dcdec8d commit 1a8c99d
Show file tree
Hide file tree
Showing 20 changed files with 562 additions and 246 deletions.
52 changes: 35 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,44 +1,60 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.9)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
amq-client (0.9.10)
amq-protocol (>= 0.9.4)
eventmachine
amq-protocol (1.0.0)
amq-protocol (1.0.1)
amqp (0.9.8)
amq-client (~> 0.9.5)
amq-protocol (>= 0.9.4)
eventmachine
antlr3 (1.8.12)
aws-sdk (1.7.1)
aws-sdk (1.8.0)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
backports (2.6.5)
backports (2.7.0)
builder (3.1.4)
daemon_controller (1.1.0)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (1.0.0)
excon (0.16.10)
fastthread (1.0.7)
fog (1.8.0)
builder
excon (~> 0.14)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
hashie (1.2.0)
highline (1.6.15)
httparty (0.9.0)
httparty (0.10.0)
multi_json (~> 1.0)
multi_xml
i18n (0.6.1)
json (1.7.5)
multi_json (1.4.0)
multi_xml (0.5.1)
nokogiri (1.5.5)
json (1.7.6)
mime-types (1.19)
multi_json (1.5.0)
multi_xml (0.5.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.6.3)
nokogiri (1.5.6)
oca (3.4.1)
nokogiri
xmlparser
occi (2.5.13)
occi (2.5.16)
activesupport
antlr3
hashie
Expand All @@ -48,27 +64,28 @@ GEM
json
nokogiri
uuidtools
passenger (3.0.18)
passenger (3.0.19)
daemon_controller (>= 1.0.0)
fastthread (>= 1.0.1)
rack
rake (>= 0.8.1)
rack (1.4.1)
rack-protection (1.2.0)
rack (1.4.4)
rack-protection (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rake (10.0.2)
rake (10.0.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.1)
rspec-expectations (2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-http (0.10.0)
rspec (~> 2.0)
rspec-mocks (2.12.0)
rspec-mocks (2.12.1)
ruby-hmac (0.4.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
Expand Down Expand Up @@ -103,6 +120,7 @@ DEPENDENCIES
aws-sdk
builder
erubis
fog
hashie
json
nokogiri
Expand Down
2 changes: 1 addition & 1 deletion config.ru
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ require 'sinatra'
require 'occi/server'

run OCCI::Server.new().start('http')

#run OCCI::Server.new().start('amqp')
3 changes: 2 additions & 1 deletion etc/backend/fogio/fogio.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"backend":{
"fogio":{
"provider":"openstack",
"endpoint":"endpoint to openstack/token"
"endpoint":"http://10.108.16.13:5000/v2.0/tokens",
"token": "e9e480b452644202bc1ec8614959775b"
}
}
}
Expand Down
23 changes: 23 additions & 0 deletions etc/backend/fogio/model/infrastructure/amqp/amqplink.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"kinds":[
{
"term":"amqplink",
"scheme":"http://schemas.ogf.org/occi/infrastructure#",
"title":"Link an amqp queue",
"attributes":{
"occi":{
"amqplink":{
"queue" :{
"Description":"queue for publish messages",
"Type":"string",
"Required": true
}
}
}
},
"related":[
"http://schemas.ogf.org/occi/core#link"
]
}
]
}
27 changes: 27 additions & 0 deletions etc/backend/fogio/model/service/cloud4e/simulation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"mixins":[
{
"term":"simulation",
"scheme":"http://cloud4e.org/occi/service#",
"title":"Cloud4e specific Simulation attributes",
"attributes":{
"org":{
"cloud4e":{
"service":{
"simulation":{
"id" :{
"Description":"UUID for the Simulation Image",
"Type":"string",
"Required": true
}
}
}
}
}
},
"related":[
"http://schemas.ogf.org/occi/infrastructure#compute"
]
}
]
}
38 changes: 0 additions & 38 deletions etc/backend/fogio/templates/openstack/extra_large.json

This file was deleted.

38 changes: 0 additions & 38 deletions etc/backend/fogio/templates/openstack/large.json

This file was deleted.

40 changes: 0 additions & 40 deletions etc/backend/fogio/templates/openstack/medium.json

This file was deleted.

12 changes: 0 additions & 12 deletions etc/backend/fogio/templates/openstack/my_os.json

This file was deleted.

40 changes: 0 additions & 40 deletions etc/backend/fogio/templates/openstack/small.json

This file was deleted.

Loading

0 comments on commit 1a8c99d

Please sign in to comment.