kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[Vcloud] remove an erroneous line in mock_data and start adding support for Internet Service Node mocking

Browse source
This commit is contained in:
freeformz 2010-06-30 02:49:38 +08:00 committed by Wesley Beary
parent 721319e07b
commit 9b426d7183
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/fog/vcloud/terremark/ecloud.rb
View file

@ -74,7 +74,6 @@ module Fog
def self.data( base_url = self.base_url ) def self.data( base_url = self.base_url )
@mock_data ||= begin @mock_data ||= begin
extension_href =
vcloud_data = Fog::Vcloud::Mock.data(base_url) vcloud_data = Fog::Vcloud::Mock.data(base_url)
vcloud_data.delete( :versions ) vcloud_data.delete( :versions )
vcloud_data.merge!( :versions => [ { :version => "v0.8b-ext2.3", :login_url => "#{base_url}/login", :supported => true } ] ) vcloud_data.merge!( :versions => [ { :version => "v0.8b-ext2.3", :login_url => "#{base_url}/login", :supported => true } ] )
@ -85,20 +84,26 @@ module Fog
:href => extension_url + "/publicIp/51", :href => extension_url + "/publicIp/51",
:name => "99.1.2.3", :name => "99.1.2.3",
:services => [ :services => [
{ :id => "71", :port => "80", :protocol => 'HTTP', :enabled => "true", :timeout => "2", :name => 'Web Site', { :id => "71", :href => extension_url + "/internetService/71", :port => "80", :protocol => 'HTTP', :enabled => "true",
:description => 'Web Servers', :redirect_url => 'http://fakey.com' }, :timeout => "2", :name => 'Web Site', :description => 'Web Servers', :redirect_url => 'http://fakey.com',
{ :id => "72", :port => "7000", :protocol => 'HTTP', :enabled => "true", :timeout => "2", :name => 'An SSH Map', :nodes => [ {:ip => "1.2.3.5", :name => "Test Node 1", :port => "80", :enabled => "true", :description => "web 1" }
:description => 'SSH 1', :redirect_url => '' } ] },
{ :id => "72", :href => extension_url + "/internetService/72", :port => "7000", :protocol => 'HTTP', :enabled => "true",
:timeout => "2", :name => 'An SSH Map', :description => 'SSH 1', :redirect_url => '',
:nodes => [ {:ip => "1.2.3.5", :name => "SSH", :port => "22", :enabled => "true", :description => "web ssh" }
] }
] ]
}, },
{ :id => "52", { :id => "52",
:href => extension_url + "/publicIp/52", :href => extension_url + "/publicIp/52",
:name => "99.1.2.4", :name => "99.1.2.4",
:services => [ :services => [
{ :id => "73", :port => "80", :protocol => 'HTTP', :enabled => "true", :timeout => "2", :name => 'Web Site', { :id => "73", :href => extension_url + "/internetService/73", :port => "80", :protocol => 'HTTP', :enabled => "true",
:description => 'Web Servers', :redirect_url => 'http://fakey.com' }, :timeout => "2", :name => 'Web Site', :description => 'Web Servers', :redirect_url => 'http://fakey.com',
{ :id => "74", :port => "7000", :protocol => 'HTTP', :enabled => "true", :timeout => "2", :name => 'An SSH Map', :nodes => [] },
:description => 'SSH 2', :redirect_url => '' } { :id => "74", :href => extension_url + "/internetService/74", :port => "7000", :protocol => 'HTTP', :enabled => "true",
:timeout => "2", :name => 'An SSH Map', :description => 'SSH 2', :redirect_url => '',
:nodes => [] }
] ]
}, },
{ :id => "53", { :id => "53",