---
client/specs/instances_spec.rb | 26 ++++++++++++--------------
client/specs/realms_spec.rb | 2 --
client/specs/storage_volume_spec.rb | 8 ++++----
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/client/specs/instances_spec.rb b/client/specs/instances_spec.rb
index 2e90e99..2f5032a 100644
--- a/client/specs/instances_spec.rb
+++ b/client/specs/instances_spec.rb
@@ -32,9 +32,7 @@ describe "instances" do
instance.owner_id.should_not be_nil
instance.owner_id.should be_a( String )
instance.image.should_not be_nil
- instance.image.should be_a( DCloud::Image )
- instance.instance_profile.should_not be_nil
- instance.instance_profile.should be_a( DCloud::InstanceProfile )
+ instance.hardware_profile.should_not be_nil
instance.state.should_not be_nil
instance.state.should be_a( String )
instance.public_addresses.should_not be_nil
@@ -70,11 +68,11 @@ describe "instances" do
instance.public_addresses.first.should eql( "img1.inst0.public.com" )
instance.image.should_not be_nil
instance.image.uri.should eql( API_URL + "/images/img1" )
- instance.instance_profile.should_not be_nil
- instance.instance_profile.hardware_profile.should_not be_nil
- instance.instance_profile.hardware_profile.uri.should eql( API_URL +
"/hardware_profiles/m1-large" )
- instance.instance_profile[:memory].should eql( "12288" )
- instance.instance_profile[:storage].should be_nil
+ instance.hardware_profile.should_not be_nil
+ instance.hardware_profile.should_not be_nil
+ instance.hardware_profile.uri.should eql( API_URL +
"/hardware_profiles/m1-large" )
+ instance.hardware_profile.memory.value.should eql(10240.0)
+ instance.hardware_profile.storage.value.should eql(850.0)
instance.state.should eql( "RUNNING" )
instance.actions.should_not be_nil
end
@@ -88,7 +86,7 @@ describe "instances" do
instance.id.should match( /inst[0-9]+/ )
instance.name.should eql( 'TestInstance' )
instance.image.id.should eql( 'img1' )
- instance.instance_profile.id.should eql( 'm1-large' )
+ instance.hardware_profile.id.should eql( 'm1-large' )
instance.realm.id.should eql( 'us' )
end
end
@@ -100,7 +98,7 @@ describe "instances" do
instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
instance.id.should match( /inst[0-9]+/ )
instance.image.id.should eql( 'img1' )
- instance.instance_profile.id.should eql( 'm1-large' )
+ instance.hardware_profile.id.should eql( 'm1-large' )
instance.realm.id.should eql( 'eu' )
end
end
@@ -113,7 +111,7 @@ describe "instances" do
instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
instance.id.should match( /inst[0-9]+/ )
instance.image.id.should eql( 'img1' )
- instance.instance_profile.id.should eql( 'm1-xlarge' )
+ instance.hardware_profile.id.should eql( 'm1-xlarge' )
instance.realm.id.should eql( 'us' )
end
end
@@ -126,8 +124,8 @@ describe "instances" do
instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
instance.id.should match( /inst[0-9]+/ )
instance.image.id.should eql( 'img1' )
- instance.instance_profile.id.should eql( 'm1-xlarge' )
- instance.instance_profile[:memory].should eql( "32768" )
+ instance.hardware_profile.id.should eql( 'm1-xlarge' )
+ instance.hardware_profile.memory.value.should eql(12288.0)
instance.realm.id.should eql( 'us' )
end
end
@@ -140,7 +138,7 @@ describe "instances" do
instance.uri.should match( %r{#{API_URL}/instances/inst[0-9]+} )
instance.id.should match( /inst[0-9]+/ )
instance.image.id.should eql( 'img1' )
- instance.instance_profile.id.should eql( 'm1-xlarge' )
+ instance.hardware_profile.id.should eql( 'm1-xlarge' )
instance.realm.id.should eql( 'eu' )
end
end
diff --git a/client/specs/realms_spec.rb b/client/specs/realms_spec.rb
index 6f5199f..bd3ec24 100644
--- a/client/specs/realms_spec.rb
+++ b/client/specs/realms_spec.rb
@@ -44,13 +44,11 @@ describe "realms" do
realm.id.should eql( 'us' )
realm.name.should eql( 'United States' )
realm.state.should eql( 'AVAILABLE' )
- realm.limit.should eql( :unlimited )
realm = client.realm( 'eu' )
realm.should_not be_nil
realm.id.should eql( 'eu' )
realm.name.should eql( 'Europe' )
realm.state.should eql( 'AVAILABLE' )
- realm.limit.should eql( :unlimited )
end
end
diff --git a/client/specs/storage_volume_spec.rb
b/client/specs/storage_volume_spec.rb
index ff461d7..fe66f8e 100644
--- a/client/specs/storage_volume_spec.rb
+++ b/client/specs/storage_volume_spec.rb
@@ -46,8 +46,8 @@ describe "storage volumes" do
storage_volume.device.should eql( '/dev/sda1' )
storage_volume.instance.should_not be_nil
storage_volume.instance.id.should eql( 'inst1' )
- ip = storage_volume.instance.instance_profile
- ip.hardware_profile.architecture.value.should eql( 'i386' )
+ ip = storage_volume.instance.hardware_profile
+ ip.architecture.value.should eql( 'i386' )
end
end
@@ -63,8 +63,8 @@ describe "storage volumes" do
storage_volume.device.should eql( '/dev/sda1' )
storage_volume.instance.should_not be_nil
storage_volume.instance.id.should eql( 'inst1' )
- ip = storage_volume.instance.instance_profile
- ip.hardware_profile.architecture.value.should eql( 'i386' )
+ ip = storage_volume.instance.hardware_profile
+ ip.architecture.value.should eql( 'i386' )
end
end
--
1.7.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
