deltacloud-core 1.1.2 → 1.1.3

data/tests/drivers/fgcp/common.rb

@@ -23,8 +23,7 @@ VCR.configure do |c|
   c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
   c.hook_into :webmock
   c.default_cassette_options = {
-    :record => :new_episodes,
-#    :record => :none,
+    :record => vcr_record_mode,
     :match_requests_on => [:method,
     VCR.request_matchers.uri_without_param(:Signature, :AccessKeyId)]
   }

data/tests/drivers/gogrid/common.rb

@@ -18,7 +18,6 @@ VCR.configure do |c|
   c.hook_into :webmock
   matcher = VCR.request_matchers.uri_without_param("api_key", "sig")
   c.register_request_matcher(:gogrid_matcher, &matcher)
-  # Set this to :new_episodes to rerecord
-  c.default_cassette_options[:record] =:none
+  c.default_cassette_options[:record] = vcr_record_mode
   c.default_cassette_options[:match_requests_on] = [:method, :gogrid_matcher]
 end

data/tests/drivers/google/common.rb

@@ -16,5 +16,5 @@ end
 VCR.configure do |c|
   c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures/"
   c.hook_into :excon
-  c.default_cassette_options = { :record => :new_episodes }
+  c.default_cassette_options = { :record => vcr_record_mode }
 end

data/tests/drivers/models/address_test.rb

@@ -3,10 +3,10 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common.rb'
 
-describe Address do
+describe Deltacloud::Address do
 
   before do
-    @address = Address.new(:id => 'adr1', :instance_id => 'inst1')
+    @address = Deltacloud::Address.new(:id => 'adr1', :instance_id => 'inst1')
   end
 
   it 'should tell if it is associated to instance' do

data/tests/drivers/models/base_test.rb

@@ -3,10 +3,10 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe BaseModel do
+describe Deltacloud::BaseModel do
 
   before do
-    class CustomModel < BaseModel
+    class CustomModel < Deltacloud::BaseModel
       attr_accessor :name
       attr_accessor :custom
     end

data/tests/drivers/models/blob_test.rb

@@ -3,10 +3,10 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe Address do
+describe Deltacloud::Address do
 
   before do
-    @address = Address.new(:id => 'adr1', :instance_id => 'inst1')
+    @address = Deltacloud::Address.new(:id => 'adr1', :instance_id => 'inst1')
   end
 
   it 'should tell if it is associated to instance' do

data/tests/drivers/models/instance_address_test.rb

@@ -3,22 +3,22 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe InstanceAddress do
+describe Deltacloud::InstanceAddress do
 
   before do
-    @address = InstanceAddress.new('192.168.0.1')
+    @address = Deltacloud::InstanceAddress.new('192.168.0.1')
   end
 
   it 'should properly report address type' do
     @address.address_type.must_equal :ipv4
     @address.address.must_equal '192.168.0.1'
     @address.is_ipv4?.must_equal true
-    InstanceAddress.new('01:23:45:67:89:ab', :type => :mac).address_type.must_equal :mac
-    InstanceAddress.new('01:23:45:67:89:ab', :type => :mac).is_mac?.must_equal true
-    InstanceAddress.new('test.local', :type => :hostname).is_hostname?.must_equal true
-    InstanceAddress.new('test.local', :port => '5000', :type => :vnc).is_vnc?.must_equal true
-    InstanceAddress.new('test.local', :port => '5000', :type => :vnc).port.must_equal '5000'
-    InstanceAddress.new('test.local', :port => '5000', :type => :vnc).to_s.must_equal 'VNC:test.local:5000'
+    Deltacloud::InstanceAddress.new('01:23:45:67:89:ab', :type => :mac).address_type.must_equal :mac
+    Deltacloud::InstanceAddress.new('01:23:45:67:89:ab', :type => :mac).is_mac?.must_equal true
+    Deltacloud::InstanceAddress.new('test.local', :type => :hostname).is_hostname?.must_equal true
+    Deltacloud::InstanceAddress.new('test.local', :port => '5000', :type => :vnc).is_vnc?.must_equal true
+    Deltacloud::InstanceAddress.new('test.local', :port => '5000', :type => :vnc).port.must_equal '5000'
+    Deltacloud::InstanceAddress.new('test.local', :port => '5000', :type => :vnc).to_s.must_equal 'VNC:test.local:5000'
   end
 
 end

data/tests/drivers/models/instance_profile_test.rb

@@ -3,10 +3,10 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe InstanceProfile do
+describe Deltacloud::InstanceProfile do
 
   before do
-    @instance = InstanceProfile.new(
+    @instance = Deltacloud::InstanceProfile.new(
       'm1-small',
       :hwp_memory => '512',
       :hwp_cpu => '1'

data/tests/drivers/models/keys_test.rb

@@ -3,10 +3,10 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe Key do
+describe Deltacloud::Key do
 
   before do
-    @key = Key.new(:credential_type => :key)
+    @key = Deltacloud::Key.new(:credential_type => :key)
   end
 
   it 'advertise if it is password or key' do
@@ -15,11 +15,11 @@ describe Key do
   end
 
   it 'cat generate the mock fingerprint' do
-    Key.generate_mock_fingerprint.must_match /(\w{2}:?)/
+    Deltacloud::Key.generate_mock_fingerprint.must_match(/(\w{2}:?)/)
   end
 
   it 'can generate the mock PEM key' do
-    Key.generate_mock_pem.must_include 'PRIVATE KEY'
+    Deltacloud::Key.generate_mock_pem.must_include 'PRIVATE KEY'
   end
 
 end

data/tests/drivers/models/metrics_test.rb

@@ -3,17 +3,17 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common'
 
-describe Metric do
+describe Deltacloud::Metric do
 
   before do
-    @metric = Metric.new(:id => 'metric1', :entity => 'inst1')
+    @metric = Deltacloud::Metric.new(:id => 'metric1', :entity => 'inst1')
   end
 
   it 'cat be extended by add_property' do
     @metric.add_property :network, { :max => 100, :min => 10, :avg => 50 }
     @metric.properties.wont_be_empty
     @metric.properties.each do |p|
-      p.must_be_kind_of Metric::Property
+      p.must_be_kind_of Deltacloud::Metric::Property
     end
   end
 

data/tests/drivers/openstack/common.rb

@@ -21,6 +21,5 @@ VCR.configure do |c|
   # NOTE: Empty this directory before re-recording
   c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
   c.hook_into :webmock
-  # Set this to :new_episodes when you want to 're-record'
-  c.default_cassette_options = { :record => :none }
+  c.default_cassette_options = { :record => vcr_record_mode }
 end

data/views/addresses/_address.html.haml

@@ -1,6 +1,6 @@
 %li
-  %a{ :href => address_url(@address.id), :'data-ajax' => 'false'}
+  %a{ :href => address_url(address.id), :'data-ajax' => 'false'}
     %img{ :class => 'ui-link-thumb', :src => '/images/address.png'}
-    %h3= @address.id
+    %h3= address.id
     %span{ :class => 'ui-li-count'}
-      = @address.instance_id ? @address.instance_id : 'Free'
+      = address.instance_id ? address.instance_id : 'Free'

data/views/addresses/associate.html.haml

@@ -1,12 +1,12 @@
 =header "Associate to instance"
-=subheader @address.id
+=subheader address.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => "#{address_url(@address.id)}/associate", :method => :post}
+  %form{ :action => "#{address_url(address.id)}/associate", :method => :post}
     %div{ 'data-role' => :fieldcontain }
       %label{ :for => :name} Instance:
       %select{:name => 'instance_id'}
         %option
-          - @instances.each do |inst|
+          - instances.each do |inst|
             %option{ :value => inst.id } #{inst.id} - #{inst.name}
     %button{ :type => :submit} Associate

data/views/addresses/index.html.haml

@@ -5,5 +5,5 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul#address_list{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @elements.each do |address|
-      = haml :"addresses/_address", :locals => { :@address => address, :partial => true }
+    - elements.each do |address|
+      = haml :"addresses/_address", :locals => { :address => address, :partial => true }

data/views/addresses/index.xml.haml

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

data/views/addresses/show.html.haml

@@ -1,20 +1,20 @@
 =header "Address"
-=subheader @address.id
+=subheader address.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Address
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@address.id
+      %p{ :'data-role' => 'fieldcontain'}=address.id
     %li{ :'data-role' => 'list-divider'} Associated to instance
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@address.instance_id || "Not associated yet"
+      %p{ :'data-role' => 'fieldcontain'}=address.instance_id || "Not associated yet"
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        - if @address.associated?
-          =link_to_action 'Disassociate', "#{address_url(@address.id)}/disassociate", :post
+        - if address.associated?
+          =link_to_action 'Disassociate', "#{address_url(address.id)}/disassociate", :post
         - else
           - if driver.respond_to?(:associate_address)
-            =link_to_action 'Associate...',"#{address_url(@address.id)}/associate", :get
-        =link_to_action "Destroy", destroy_address_url(@address.id), :delete
+            =link_to_action 'Associate...',"#{address_url(address.id)}/associate", :get
+        =link_to_action "Destroy", destroy_address_url(address.id), :delete

data/views/addresses/show.xml.haml

@@ -1,14 +1,14 @@
 - unless defined?(partial)
   !!! XML
-%address{ :href => address_url(@address.id), :id => @address.id }
+%address{ :href => address_url(address.id), :id => address.id }
   %ip<
-    =@address.id
+    =address.id
   %actions
     - if driver.respond_to?(:destroy_address)
-      %link{ :rel => "destroy", :method => "delete", :href => destroy_address_url(@address.id)}
-    - if driver.respond_to?(:associate_address) and not @address.instance_id
-      %link{ :rel => "associate", :method => "post", :href => associate_address_url(@address.id)}
-    - if driver.respond_to?(:disassociate_address) and @address.instance_id
-      %link{ :rel => "disassociate", :method => "post", :href => disassociate_address_url(@address.id)}
-  - if @address.instance_id
-    %instance{ :href => instance_url(@address.instance_id), :id => @address.instance_id}
+      %link{ :rel => "destroy", :method => "delete", :href => destroy_address_url(address.id)}
+    - if driver.respond_to?(:associate_address) and not address.instance_id
+      %link{ :rel => "associate", :method => "post", :href => associate_address_url(address.id)}
+    - if driver.respond_to?(:disassociate_address) and address.instance_id
+      %link{ :rel => "disassociate", :method => "post", :href => disassociate_address_url(address.id)}
+  - if address.instance_id
+    %instance{ :href => instance_url(address.instance_id), :id => address.instance_id}

data/views/api/show.html.haml

@@ -3,7 +3,7 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
-    - @collections.each do |c|
+    - collections.each do |c|
       %li
         %a{ :href => url_for(c.collection_name),  :'data-icon' => "arrow-r"}=c.collection_name.to_s.gsub('_', ' ').titlecase
 
@@ -22,7 +22,7 @@
 - unless driver.configured_providers.empty?
   %div{ :'data-role' => :footer, :'data-theme' => 'a'}
     %form{ :action => settings.root_url, :method => :post, :'data-ajax' => 'false'}
-      - if @driver_name
+      - if driver_name
         %input{ :name => :driver, :type => :hidden, :value => driver.name }/
       %fieldset{ :'data-type' => "horizontal", :'data-role' => "controlgroup", :id => "providers" }
         %select{:name => 'provider', :'data-inline' => 'true', :'data-native-menu' => 'false'}

data/views/api/show.xml.haml

@@ -1,5 +1,5 @@
 %api{ :version => settings.version, :driver => driver_symbol, :provider => Thread.current[:provider] || ENV['API_PROVIDER'] }
-  - @collections.each do |c|
+  - collections.each do |c|
     %link{ :rel => c.collection_name, :href => self.send(:"#{c.collection_name}_url")}
       - c.features.select { |f| driver.class.has_feature?(c.collection_name, f.name) }.each do |f|
         - f.operations.each do |operation|

data/views/blobs/new.html.haml

@@ -1,7 +1,7 @@
 =header "Create new blob"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => bucket_url(@bucket_id), :method => :post, :enctype => 'multipart/form-data', "data-ajax" => "false"}
+  %form{ :action => bucket_url(bucket_id), :method => :post, :enctype => 'multipart/form-data', "data-ajax" => "false"}
     %div{ 'data-role' => :fieldcontain }
       %label
         Blob Name:

data/views/blobs/show.html.haml

@@ -1,31 +1,31 @@
 =header "Blob"
-=subheader @blob.id
+=subheader blob.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Bucket
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@blob.bucket
+      %p{ :'data-role' => 'fieldcontain'}=blob.bucket
     %li{ :'data-role' => 'list-divider'} Content length
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@blob.content_length
+      %p{ :'data-role' => 'fieldcontain'}=blob.content_length
     %li{ :'data-role' => 'list-divider'} Content type
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@blob.content_type
+      %p{ :'data-role' => 'fieldcontain'}=blob.content_type
     %li{ :'data-role' => 'list-divider'} Last modified
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@blob.last_modified
+      %p{ :'data-role' => 'fieldcontain'}=blob.last_modified
     %li{ :'data-role' => 'list-divider'} Content
     %li
-      %a{ :href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content' }="Download"
+      %a{ :href => bucket_url(blob.bucket) + '/' + blob.id + '/content' }="Download"
     %li{ :'data-role' => 'list-divider'} User meta-data
     %li
       %p{ :'data-role' => 'fieldcontain'}
-        - @blob.user_metadata.each do |k,v|
+        - blob.user_metadata.each do |k,v|
           %b #{k} :
           #{v}
           %br
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        =link_to_action 'Delete',bucket_url(@blob.bucket) + '/' + @blob.id, :delete
+        =link_to_action 'Delete',bucket_url(blob.bucket) + '/' + blob.id, :delete

data/views/blobs/show.xml.haml

@@ -1,13 +1,13 @@
 !!! XML
-%blob{:href => bucket_url(@blob.bucket) + '/' + @blob.id, :id => @blob.id}
-  %bucket=@blob.bucket
-  - @blob.attributes.select{ |attr| (attr!=:id && attr!=:user_metadata) }.each do |attribute|
+%blob{:href => bucket_url(blob.bucket) + '/' + blob.id, :id => blob.id}
+  %bucket=blob.bucket
+  - blob.attributes.select{ |attr| (attr!=:id && attr!=:user_metadata) }.each do |attribute|
     - next if attribute == :bucket
     - unless attribute == :content
       - haml_tag(attribute, :<) do
-        - haml_concat @blob.send(attribute)
+        - haml_concat blob.send(attribute)
   %user_metadata
-    - if @blob.user_metadata.respond_to? :each
-      - @blob.user_metadata.each do |k, v|
+    - if blob.user_metadata.respond_to? :each
+      - blob.user_metadata.each do |k, v|
         %entry{:key => k}=render_cdata(v)
-  %content{:href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content', :rel => 'blob_content'}
+  %content{:href => bucket_url(blob.bucket) + '/' + blob.id + '/content', :rel => 'blob_content'}

data/views/buckets/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'}
-    - @buckets.each do |bucket|
+    - elements.each do |bucket|
       %li
         %a{ :href => bucket_url(bucket.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/bucket.png'}

data/views/buckets/index.xml.haml

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

data/views/buckets/show.html.haml

@@ -1,23 +1,23 @@
 =header "Bucket"
-=subheader @bucket.id
+=subheader bucket.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'}=@bucket.name
+      %p{ :'data-role' => 'fieldcontain'}=bucket.name
     %li{ :'data-role' => 'list-divider'} Size
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@bucket.size
+      %p{ :'data-role' => 'fieldcontain'}=bucket.size
     %li{ :'data-role' => 'list-divider'}
       Blobs
-    - @bucket.blob_list.each do |blob|
+    - bucket.blob_list.each do |blob|
       %li
-        %a{ :href => bucket_url(@bucket.name) + "/" + blob, :'data-ajax' => 'false'}
+        %a{ :href => bucket_url(bucket.name) + "/" + blob, :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/blob.png'}
           %h3=blob
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax' => 'false'} Create new blob...
-        =link_to_action 'Delete bucket', destroy_bucket_url(@bucket.name), :delete
+        %a{ :href => new_blob_form_url(bucket), :'data-role' => "button", :'data-ajax' => 'false'} Create new blob...
+        =link_to_action 'Delete bucket', destroy_bucket_url(bucket.name), :delete

data/views/buckets/show.xml.haml

@@ -1,10 +1,10 @@
 - unless defined?(partial)
   !!! XML
-%bucket{:href => bucket_url(@bucket.id), :id => @bucket.id}
-  - @bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
+%bucket{:href => bucket_url(bucket.id), :id => bucket.id}
+  - bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - unless attribute == :blob_list
       -haml_tag(attribute, :<) do
-        - haml_concat @bucket.send(attribute)
-  - if @bucket.blob_list
-    - @bucket.blob_list.each do |blb|
-      %blob{:id => blb, :href => bucket_url(@bucket.id) +"/#{blb}"}
+        - haml_concat bucket.send(attribute)
+  - if bucket.blob_list
+    - bucket.blob_list.each do |blb|
+      %blob{:id => blb, :href => bucket_url(bucket.id) +"/#{blb}"}

data/views/drivers/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'}
-    - @drivers.each do |id, details|
+    - drivers.each do |id, details|
       %li
         %a{ :href => driver_url(id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/cloud.png'}