deltacloud-core 1.1.2 → 1.1.3

data/views/load_balancers/new.html.haml

@@ -6,18 +6,11 @@
       %label
         Name:
       %input{ :name => 'name', :size => 30 }/
-    -if @instances
-      %p
-        %label
-          Running instance:
-        %select{ :name => 'instance_id'}
-          - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
-            %option{ :value => instance.id } #{instance.id}
     %p
       %label
         Realm:
       %select{ :name => 'realm_id'}
-        - @realms.each do |realm|
+        - realms.each do |realm|
           %option{ :value => realm.id } #{realm.id} - #{realm.name}
     %hr
     %p

data/views/load_balancers/show.html.haml

@@ -1,39 +1,39 @@
 =header "Load balancer"
-=subheader @load_balancer.id
+=subheader load_balancer.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Created at
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@load_balancer.created_at
+      %p{ :'data-role' => 'fieldcontain'}=load_balancer.created_at
     %li{ :'data-role' => 'list-divider'} Public addresses
-    - @load_balancer.public_addresses.each do |address|
+    - load_balancer.public_addresses.each do |address|
       %li
         %p{ :'data-role' => 'fieldcontain'}=address
     %li{ :'data-role' => 'list-divider'} Realms
-    - @load_balancer.realms.each do |realm|
+    - load_balancer.realms.each do |realm|
       %li
         %a{ :href => realm_url(realm.id), :'data-ajax' => 'false'}
           %h3=realm.name
     %li{ :'data-role' => 'list-divider'} Registered Instances
-    - @registered_instances.each do |instance|
+    - registered_instances.each do |instance|
       %li
         %a{ :href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "Unregister", url_for("load_balancers/#{@load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
+          =link_to_action "Unregister", url_for("load_balancers/#{load_balancer.id}/unregister?instance_id=#{instance[:id]}"), :post
     %li{ :'data-role' => 'list-divider'} Unregistered Instances
-    - @unregistered_instances.each do |instance|
+    - unregistered_instances.each do |instance|
       %li
         %a{:href => instance_url(instance[:id]), :'data-ajax' => 'false'}
           %h3=instance[:name]
-          =link_to_action "Register", url_for("load_balancers/#{@load_balancer.id}/register?instance_id=#{instance[:id]}"), :post
+          =link_to_action "Register", url_for("load_balancers/#{load_balancer.id}/register?instance_id=#{instance[:id]}"), :post
     %li{ :'data-role' => 'list-divider'} Actions
     %li
-      =link_to_action "Destroy", url_for("load_balancers/#{@load_balancer.id}"), :delete
+      =link_to_action "Destroy", url_for("load_balancers/#{load_balancer.id}"), :delete
 
   =header "Listeners", :back => 'false'
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
-    - @load_balancer.listeners.each do |listener|
+    - load_balancer.listeners.each do |listener|
       %li{ :'data-role' => 'list-divider'} Load balancer port
       %li
         %p{ :'data-role' => 'fieldcontain'}=listener.load_balancer_port

data/views/load_balancers/show.xml.haml

@@ -1,21 +1,21 @@
 - unless defined?(partial)
   !!! XML
-%load_balancer{ :href => load_balancer_url(@load_balancer.id), :id => @load_balancer.id}
+%load_balancer{ :href => load_balancer_url(load_balancer.id), :id => load_balancer.id}
   %actions
-    %link{ :rel => "destroy", :method => "delete", :href => destroy_load_balancer_url(@load_balancer.id)}
-    %link{ :rel => "register", :method => "post", :href => register_load_balancer_url(@load_balancer.id)}
+    %link{ :rel => "destroy", :method => "delete", :href => destroy_load_balancer_url(load_balancer.id)}
+    %link{ :rel => "register", :method => "post", :href => register_load_balancer_url(load_balancer.id)}
   %public_addresses
-    - @load_balancer.public_addresses.each do |address|
+    - load_balancer.public_addresses.each do |address|
       %address #{address}
   %created_at<
-    = @load_balancer.created_at
-  %realm{ :href => realm_url(@load_balancer.realms.first.id), :id => @load_balancer.realms.first.id}
+    = load_balancer.created_at
+  %realm{ :href => realm_url(load_balancer.realms.first.id), :id => load_balancer.realms.first.id}
   %listeners
-    - @load_balancer.listeners.each do |listener|
+    - load_balancer.listeners.each do |listener|
       %listener{ :protocol => listener.protocol}
         %load_balancer_port #{listener.load_balancer_port}
         %instance_port #{listener.instance_port}
   %instances
-    - @load_balancer.instances.each do |instance|
+    - load_balancer.instances.each do |instance|
       %instance{:href => instance_url(instance.id), :id => instance.id}
-        %link{:rel => "unregister", :href => unregister_load_balancer_url(@load_balancer.id, { :instance_id => instance.id})}
+        %link{:rel => "unregister", :href => unregister_load_balancer_url(load_balancer.id, { :instance_id => instance.id})}

data/views/metrics/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @metrics.each do |metric|
+    - elements.each do |metric|
       %li
         %a{ :href => metric_url(metric.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/metric.png'}

data/views/metrics/index.xml.haml

@@ -1,5 +1,5 @@
 - unless defined?(partial)
   !!!XML
 %metrics
-  - @elements.each do |c|
-    = haml :'metrics/show', :locals => { :@metric => c, :partial => true}
+  - elements.each do |c|
+    = haml :'metrics/show', :locals => { :metric => c, :partial => true}

data/views/metrics/show.html.haml

@@ -1,9 +1,9 @@
 =header Metric
-=subheader @metric.id
+=subheader metric.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %div{ :'data-role' => :'collapsible-set'}
-    - @metric.properties.each do |p|
+    - metric.properties.each do |p|
       %div{ :'data-role' => :'collapsible', :'data-collapse' => 'true'}
         %h3=p.name
         %table{ :summary => "#{p.name} values"}

data/views/metrics/show.xml.haml

@@ -1,10 +1,10 @@
 - unless defined?(partial)
   !!! XML
-%metric{:href => metric_url(@metric.id), :id => @metric.id}
+%metric{:href => metric_url(metric.id), :id => metric.id}
   -haml_tag(:entity, :<) do
-    -haml_concat @metric.send(:entity) || @metric.send(:id)
+    -haml_concat metric.send(:entity) || metric.send(:id)
   %properties
-    -@metric.properties.each do |prop|
+    -metric.properties.each do |prop|
       -haml_tag(prop.name, :<) do
         - if prop.values
           - prop.values.each do |p|

data/views/realms/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @realms.each do |realm|
+    - elements.each do |realm|
       %li
         %a{ :href => realm_url(realm.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/realm.png'}

data/views/realms/index.xml.haml

@@ -1,4 +1,4 @@
 !!!XML
 %realms
-  - @elements.each do |c|
-    = haml :'realms/show', :locals => { :@realm => c, :partial => true }
+  - elements.each do |c|
+    = haml :'realms/show', :locals => { :realm => c, :partial => true }

data/views/realms/show.html.haml

@@ -1,17 +1,17 @@
-=header Realm
-=subheader @realm.id
+=header 'Realm'
+=subheader realm.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Identifier
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@realm.id
+      %p{ :'data-role' => 'fieldcontain'}=realm.id
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@realm.name
+      %p{ :'data-role' => 'fieldcontain'}=realm.name
     %li{ :'data-role' => 'list-divider'} State
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@realm.state
+      %p{ :'data-role' => 'fieldcontain'}=realm.state
     %li{ :'data-role' => 'list-divider'} Limit
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@realm.limit
+      %p{ :'data-role' => 'fieldcontain'}=realm.limit

data/views/realms/show.xml.haml

@@ -1,11 +1,11 @@
 - unless defined?(partial)
   !!! XML
-%realm{:href => realm_url(@realm.id), :id => @realm.id }
+%realm{:href => realm_url(realm.id), :id => realm.id }
   %name<
-    =@realm.name
+    =realm.name
   %state<
-    =@realm.state
-  - unless @realm.limit.eql?(:unlimited)
+    =realm.state
+  - unless realm.limit.eql?(:unlimited)
     %limit<
       =cdata do
-        =@realm.limit
+        =realm.limit

data/views/storage_snapshots/index.html.haml

@@ -3,7 +3,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @storage_snapshots.each do |snapshot|
+    - elements.each do |snapshot|
       %li
         %a{ :href => storage_snapshot_url(snapshot.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/snapshot.png'}

data/views/storage_snapshots/index.xml.haml

@@ -1,4 +1,4 @@
 !!!XML
 %storage_snapshots
-  - @elements.each do |c|
-    = haml :'storage_snapshots/show', :locals => { :@storage_snapshot => c, :partial => true }
+  - elements.each do |c|
+    = haml :'storage_snapshots/show', :locals => { :storage_snapshot => c, :partial => true }

data/views/storage_snapshots/show.html.haml

@@ -1,22 +1,22 @@
 =header "Storage snapshot"
-=subheader @storage_snapshot.id
+=subheader storage_snapshot.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_snapshot.id
+      %p{ :'data-role' => 'fieldcontain'}=storage_snapshot.id
     %li{ :'data-role' => 'list-divider'} Storage volume
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_snapshot.storage_volume_id
+      %p{ :'data-role' => 'fieldcontain'}=storage_snapshot.storage_volume_id
     %li{ :'data-role' => 'list-divider'} Created
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_snapshot.created
+      %p{ :'data-role' => 'fieldcontain'}=storage_snapshot.created
     %li{ :'data-role' => 'list-divider'} State
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_snapshot.state
+      %p{ :'data-role' => 'fieldcontain'}=storage_snapshot.state
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if driver.respond_to?(:destroy_storage_snapshot)
-          =link_to_action "Delete", url_for("storage_snapshots/#{@storage_snapshot.id}"), :delete
+          =link_to_action "Delete", url_for("storage_snapshots/#{storage_snapshot.id}"), :delete

data/views/storage_snapshots/show.xml.haml

@@ -1,7 +1,7 @@
 - unless defined?(partial)
   !!! XML
-%storage_snapshot{:href => storage_snapshot_url(@storage_snapshot.id), :id => @storage_snapshot.id }
-  %name=@storage_snapshot.id
+%storage_snapshot{:href => storage_snapshot_url(storage_snapshot.id), :id => storage_snapshot.id }
+  %name=storage_snapshot.id
   %created<
-    =@storage_snapshot.created
-  %storage_volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id), :id => @storage_snapshot.storage_volume_id}
+    =storage_snapshot.created
+  %storage_volume{:href => storage_volume_url(storage_snapshot.storage_volume_id), :id => storage_snapshot.storage_volume_id}

data/views/storage_volumes/attach.html.haml

@@ -4,12 +4,12 @@
   %p
     %label
       Instance ID:
-    - if @instances.empty?
+    - if instances.empty?
       %select
         %option There are no instances
     - else
       %select{ :name => 'instance_id' }
-        - @instances.each do |i|
+        - instances.each do |i|
           %option{ :value => "#{i.id}"} #{i.name}
   %p
     %label

data/views/storage_volumes/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @storage_volumes.each do |volume|
+    - elements.each do |volume|
       %li
         %a{ :href => storage_volume_url(volume.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/volume.png'}

data/views/storage_volumes/index.xml.haml

@@ -1,4 +1,4 @@
 !!!XML
 %storage_volumes
-  - @elements.each do |volume|
-    = haml :'storage_volumes/show', :locals =>  { :@storage_volume =>  volume, :partial =>  true } 
+  - elements.each do |volume|
+    = haml :'storage_volumes/show', :locals =>  { :storage_volume =>  volume, :partial =>  true }

data/views/storage_volumes/show.html.haml

@@ -1,43 +1,43 @@
 =header "Storage volume"
-=subheader @storage_volume.id
+=subheader storage_volume.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
-    %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
+    %p{ :'data-role' => 'fieldcontain'}=storage_volume.id
     %li
-      %p{ :'data-role' => 'fieldcontain'}=(@storage_volume.name ? @storage_volume.name : @storage_volume.id)
+      %p{ :'data-role' => 'fieldcontain'}=(storage_volume.name ? storage_volume.name : storage_volume.id)
     %li{ :'data-role' => 'list-divider'} Created
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_volume.created
+      %p{ :'data-role' => 'fieldcontain'}=storage_volume.created
     %li{ :'data-role' => 'list-divider'} Capacity
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_volume.capacity
+      %p{ :'data-role' => 'fieldcontain'}=storage_volume.capacity
     %li{ :'data-role' => 'list-divider'} Realm
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_volume.realm_id
+      %p{ :'data-role' => 'fieldcontain'}=storage_volume.realm_id
     %li{ :'data-role' => 'list-divider'} State
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@storage_volume.state
+      %p{ :'data-role' => 'fieldcontain'}=storage_volume.state
     %li{ :'data-role' => 'list-divider'} Attached to
     %li
-      - if @storage_volume.instance_id
-        %a{ :href => instance_url( @storage_volume.instance_id)}
-          = @storage_volume.instance_id
-      - elsif @storage_volume.state and @storage_volume.state != "IN-USE"
+      - if storage_volume.instance_id
+        %a{ :href => instance_url( storage_volume.instance_id)}
+          = storage_volume.instance_id
+      - elsif storage_volume.state and storage_volume.state != "IN-USE"
         %p{ :'data-role' => 'fieldcontain'}= 'none (detached)'
       -else
         %p{ :'data-role' => 'fieldcontain'}= 'unknown'
     %li{ :'data-role' => 'list-divider'} Device
     %li
-      %p{ :'data-role' => 'fieldcontain'}= @storage_volume.device
+      %p{ :'data-role' => 'fieldcontain'}= storage_volume.device
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        - if ["AVAILABLE", "IN-USE"].include?(@storage_volume.state)
-          =link_to_action "Snapshot...", url_for("storage_snapshots/new?volume_id=#{@storage_volume.id}"), :get
-          - unless @storage_volume.instance_id
-            =link_to_action "Delete", url_for("storage_volumes/#{@storage_volume.id}"), :delete
-            =link_to_action "Attach...", url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), :get
-          - if @storage_volume.instance_id
-            =link_to_action "Detach", url_for("storage_volumes/#{@storage_volume.id}/detach"), :post
+        - if ["AVAILABLE", "IN-USE"].include?(storage_volume.state)
+          =link_to_action "Snapshot...", url_for("storage_snapshots/new?volume_id=#{storage_volume.id}"), :get
+          - unless storage_volume.instance_id
+            =link_to_action "Delete", url_for("storage_volumes/#{storage_volume.id}"), :delete
+            =link_to_action "Attach...", url_for("storage_volumes/#{storage_volume.id}/attach_instance"), :get
+          - if storage_volume.instance_id
+            =link_to_action "Detach", url_for("storage_volumes/#{storage_volume.id}/detach"), :post

data/views/storage_volumes/show.xml.haml

@@ -1,33 +1,33 @@
 - unless defined?(partial)
   !!!XML
-%storage_volume{ :href => storage_volume_url(@storage_volume.id), :id => @storage_volume.id}
-  - if @storage_volume.created
+%storage_volume{ :href => storage_volume_url(storage_volume.id), :id => storage_volume.id}
+  - if storage_volume.created
     %created<
-      =@storage_volume.created
+      =storage_volume.created
   %capacity{ :unit => "GB" }<
-    = @storage_volume.capacity
-  - if @storage_volume.kind
+    = storage_volume.capacity
+  - if storage_volume.kind
     %kind<
-      = @storage_volume.kind
+      = storage_volume.kind
   %name<
-    = @storage_volume.name || @storage_volume.id
-  - if @storage_volume.device
+    = storage_volume.name || storage_volume.id
+  - if storage_volume.device
     %device<
-      = @storage_volume.device
-  - if @storage_volume.realm_id
-    %realm{:id => @storage_volume.realm_id, :href => realm_url(@storage_volume.realm_id)}
+      = storage_volume.device
+  - if storage_volume.realm_id
+    %realm{:id => storage_volume.realm_id, :href => realm_url(storage_volume.realm_id)}
     %realm_id<
-      = @storage_volume.realm_id
-  - if @storage_volume.state
+      = storage_volume.realm_id
+  - if storage_volume.state
     %state<
-      = @storage_volume.state
+      = storage_volume.state
 
-  - unless @storage_volume.instance_id.nil?
+  - unless storage_volume.instance_id.nil?
     %mount
-      %instance{:href => instance_url(@storage_volume.instance_id), :id => @storage_volume.instance_id}
-      - unless @storage_volume.device.nil?
-        %device{ :name => @storage_volume.device }
-  - if @storage_volume.actions
+      %instance{:href => instance_url(storage_volume.instance_id), :id => storage_volume.instance_id}
+      - unless storage_volume.device.nil?
+        %device{ :name => storage_volume.device }
+  - if storage_volume.actions
     %actions
-      - @storage_volume.actions.each do |action|
-        %link{:rel => action, :method => :post, :href => self.send("#{action}_storage_volume_url", @storage_volume.id)}
+      - storage_volume.actions.each do |action|
+        %link{:rel => action, :method => :post, :href => self.send("#{action}_storage_volume_url", storage_volume.id)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deltacloud-core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,33 +160,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.19
 - !ruby/object:Gem::Dependency
   name: aws
   requirement: !ruby/object:Gem::Requirement
@@ -315,28 +315,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.14.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -468,6 +446,8 @@ files:
 - support/condor/config/50condor_cloud_node.config
 - lib/db.rb
 - lib/deltacloud_rack.rb
+- lib/initialize.rb
+- lib/sinatra.rb
 - lib/ec2/helpers.rb
 - lib/ec2/server.rb
 - lib/ec2/query_parser.rb
@@ -478,12 +458,14 @@ files:
 - lib/cimi/dependencies.rb
 - lib/cimi/models.rb
 - lib/cimi/helpers/select_helper.rb
+- lib/cimi/helpers/cimi_rabbit_helper.rb
 - lib/cimi/helpers/cimi_helper.rb
 - lib/cimi/helpers/database_helper.rb
 - lib/cimi/helpers/filter_helper.rb
 - lib/cimi/models/volume_image.rb
 - lib/cimi/models/system_template.rb
 - lib/cimi/models/network_port_configuration.rb
+- lib/cimi/models/system_forwarding_group.rb
 - lib/cimi/models/credential_create.rb
 - lib/cimi/models/machine_template_create.rb
 - lib/cimi/models/volume_create.rb
@@ -493,8 +475,10 @@ files:
 - lib/cimi/models/volume_template_create.rb
 - lib/cimi/models/system.rb
 - lib/cimi/models/address_template_create.rb
+- lib/cimi/models/volume_configuration_create.rb
 - lib/cimi/models/volume.rb
 - lib/cimi/models/volume_image_create.rb
+- lib/cimi/models/system_volume.rb
 - lib/cimi/models/base.rb
 - lib/cimi/models/machine_configuration.rb
 - lib/cimi/models/collection.rb
@@ -502,12 +486,16 @@ files:
 - lib/cimi/models/machine_template.rb
 - lib/cimi/models/network_port.rb
 - lib/cimi/models/forwarding_group_template.rb
+- lib/cimi/models/system_network_port.rb
+- lib/cimi/models/system_network.rb
 - lib/cimi/models/resource.rb
 - lib/cimi/models/credential_template.rb
 - lib/cimi/models/machine.rb
 - lib/cimi/models/volume_configuration.rb
 - lib/cimi/models/cloud_entry_point.rb
+- lib/cimi/models/system_machine.rb
 - lib/cimi/models/network_configuration.rb
+- lib/cimi/models/system_create.rb
 - lib/cimi/models/address_template.rb
 - lib/cimi/models/action.rb
 - lib/cimi/models/machine_image.rb
@@ -520,9 +508,60 @@ files:
 - lib/cimi/models/address_create.rb
 - lib/cimi/models/network_template.rb
 - lib/cimi/models/disk.rb
+- lib/cimi/models/system_address.rb
+- lib/cimi/models/system_credential.rb
 - lib/cimi/models/errors.rb
 - lib/cimi/models/machine_volume.rb
 - lib/cimi/models/resource_metadata.rb
+- lib/cimi/models/system_system.rb
+- lib/cimi/service/volume_image.rb
+- lib/cimi/service/system_template.rb
+- lib/cimi/service/network_port_configuration.rb
+- lib/cimi/service/system_forwarding_group.rb
+- lib/cimi/service/credential_create.rb
+- lib/cimi/service/machine_template_create.rb
+- lib/cimi/service/volume_create.rb
+- lib/cimi/service/network.rb
+- lib/cimi/service/network_create.rb
+- lib/cimi/service/forwarding_group.rb
+- lib/cimi/service/volume_template_create.rb
+- lib/cimi/service/system.rb
+- lib/cimi/service/address_template_create.rb
+- lib/cimi/service/volume_configuration_create.rb
+- lib/cimi/service/volume.rb
+- lib/cimi/service/volume_image_create.rb
+- lib/cimi/service/system_volume.rb
+- lib/cimi/service/base.rb
+- lib/cimi/service/machine_configuration.rb
+- lib/cimi/service/volume_template.rb
+- lib/cimi/service/machine_template.rb
+- lib/cimi/service/network_port.rb
+- lib/cimi/service/forwarding_group_template.rb
+- lib/cimi/service/system_network_port.rb
+- lib/cimi/service/system_network.rb
+- lib/cimi/service/credential_template.rb
+- lib/cimi/service/machine.rb
+- lib/cimi/service/volume_configuration.rb
+- lib/cimi/service/cloud_entry_point.rb
+- lib/cimi/service/system_machine.rb
+- lib/cimi/service/network_configuration.rb
+- lib/cimi/service/system_create.rb
+- lib/cimi/service/address_template.rb
+- lib/cimi/service/action.rb
+- lib/cimi/service/machine_image.rb
+- lib/cimi/service/machine_create.rb
+- lib/cimi/service/address.rb
+- lib/cimi/service/credential.rb
+- lib/cimi/service/network_port_template.rb
+- lib/cimi/service/machine_image_create.rb
+- lib/cimi/service/address_create.rb
+- lib/cimi/service/network_template.rb
+- lib/cimi/service/disk.rb
+- lib/cimi/service/system_address.rb
+- lib/cimi/service/system_credential.rb
+- lib/cimi/service/machine_volume.rb
+- lib/cimi/service/resource_metadata.rb
+- lib/cimi/service/system_system.rb
 - lib/cimi/collections.rb
 - lib/cimi/collections/machine_templates.rb
 - lib/cimi/collections/credentials.rb
@@ -548,6 +587,7 @@ files:
 - lib/cimi/collections/volumes.rb
 - lib/cimi/collections/machine_configurations.rb
 - lib/cimi/collections/network_port_templates.rb
+- lib/cimi/service.rb
 - lib/sinatra/rack_accept.rb
 - lib/sinatra/rack_driver_select.rb
 - lib/sinatra/rack_date.rb
@@ -649,8 +689,6 @@ files:
 - lib/deltacloud/drivers/cimi_features.rb
 - lib/deltacloud/drivers/exceptions.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
-- lib/initialize.rb
-- lib/sinatra.rb
 - lib/db/volume_template.rb
 - lib/db/machine_template.rb
 - lib/db/volume_configuration.rb
@@ -718,6 +756,7 @@ files:
 - tests/cimi/spec_helper.rb
 - tests/cimi/collections/system_templates_test.rb
 - tests/cimi/collections/machine_templates_test.rb
+- tests/cimi/collections/volumes_test.rb
 - tests/cimi/collections/systems_test.rb
 - tests/cimi/collections/common.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
@@ -823,12 +862,6 @@ files:
 - views/api/show.html.haml
 - views/instance_states/show.xml.haml
 - views/instance_states/show.html.haml
-- views/docs/operation.html.haml
-- views/docs/collection.xml.haml
-- views/docs/collection.html.haml
-- views/docs/index.html.haml
-- views/docs/operation.xml.haml
-- views/docs/index.xml.haml
 - views/storage_snapshots/show.xml.haml
 - views/storage_snapshots/new.html.haml
 - views/storage_snapshots/index.html.haml
@@ -848,27 +881,6 @@ files:
 - views/load_balancers/index.html.haml
 - views/load_balancers/index.xml.haml
 - views/load_balancers/show.html.haml
-- views/cimi/cloudEntryPoint/index.html.haml
-- views/cimi/cloudEntryPoint/index.xml.haml
-- views/cimi/collection/response.xml.haml
-- views/cimi/collection/index.html.haml
-- views/cimi/error.html.haml
-- views/cimi/errors/401.xml.haml
-- views/cimi/errors/404.xml.haml
-- views/cimi/errors/400.xml.haml
-- views/cimi/errors/502.xml.haml
-- views/cimi/errors/405.xml.haml
-- views/cimi/errors/500.xml.haml
-- views/cimi/errors/403.xml.haml
-- views/cimi/machines/show.xml.haml
-- views/cimi/machines/show.html.haml
-- views/cimi/volumes/show.xml.haml
-- views/cimi/volumes/show.html.haml
-- views/cimi/machine_configurations/show.xml.haml
-- views/cimi/machine_configurations/show.html.haml
-- views/cimi/layout.html.haml
-- views/cimi/machine_images/show.xml.haml
-- views/cimi/machine_images/show.html.haml
 - views/firewalls/show.xml.haml
 - views/firewalls/new.html.haml
 - views/firewalls/new_rule.html.haml
@@ -884,7 +896,6 @@ files:
 - views/blobs/show.xml.haml
 - views/blobs/new.html.haml
 - views/blobs/show.html.haml
-- views/root/index.html.haml
 - views/metrics/show.xml.haml
 - views/metrics/index.html.haml
 - views/metrics/index.xml.haml
@@ -989,7 +1000,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1292396733782227782
+      hash: -764223235794271402
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -1001,6 +1012,7 @@ test_files:
 - tests/ec2/query_parser_test.rb
 - tests/cimi/collections/system_templates_test.rb
 - tests/cimi/collections/machine_templates_test.rb
+- tests/cimi/collections/volumes_test.rb
 - tests/cimi/collections/systems_test.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb