From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/lib/deltacloud/models/instance.rb | 2 -- server/lib/deltacloud/models/key.rb | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/lib/deltacloud/models/instance.rb b/server/lib/deltacloud/models/instance.rb index c6835a9..c2cc0e3 100644 --- a/server/lib/deltacloud/models/instance.rb +++ b/server/lib/deltacloud/models/instance.rb @@ -16,8 +16,6 @@ class Instance < BaseModel - include ApplicationHelper - attr_accessor :owner_id attr_accessor :image_id attr_accessor :name diff --git a/server/lib/deltacloud/models/key.rb b/server/lib/deltacloud/models/key.rb index 86a6283..64c4cc7 100644 --- a/server/lib/deltacloud/models/key.rb +++ b/server/lib/deltacloud/models/key.rb @@ -23,6 +23,10 @@ class Key < BaseModel attr_accessor :pem_rsa_key attr_accessor :state + def name + @name || @id + end + def is_password? true if @credential_type.eql?(:password) end -- 1.7.10
