[PATCH aggregator] Fixed fetching of instance state

[Jan Provazník]

From: Jan Provaznik <jprovazn(a)redhat.com&gt;

When a provider is down and instance state is fetched (for example
on instances index page), then there is a nil object and exception
is thrown.
---
 src/app/models/instance_task.rb |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb
index 9da110b..6c78c0f 100644
--- a/src/app/models/instance_task.rb
+++ b/src/app/models/instance_task.rb
@@ -46,22 +46,21 @@ class InstanceTask < Task
     actions = []
     # FIXME: cloud_account won't always be set here, but we're requiring
     #        front end realm for now.
-    cloud_account = instance.cloud_account
-    c_state = cloud_account.connect.instance_state(state) unless cloud_account.nil?
-    if !cloud_account.nil? and c_state
-      transitions = c_state.transitions
-      transitions.each do |transition|
-        # FIXME if we allow actions based on the expected state after
-        # automatic transitions, we need to call this method again with
-        # the state from transition.to passed in.
-        unless transition.action.nil?
-          add_action = true
-          if (instance and user)
-            # FIXME: check permissions here if we filter actions by permission
+    if cloud_account = instance.cloud_account and
+      conn = cloud_account.connect and c_state = conn.instance_state(state)
+        transitions = c_state.transitions
+        transitions.each do |transition|
+          # FIXME if we allow actions based on the expected state after
+          # automatic transitions, we need to call this method again with
+          # the state from transition.to passed in.
+          unless transition.action.nil?
+            add_action = true
+            if (instance and user)
+              # FIXME: check permissions here if we filter actions by permission
+            end
+            actions << transition.action if add_action
           end
-          actions << transition.action if add_action
         end
-      end
     end
     actions
   end
-- 
1.7.0.1

[PATCH aggregator] rspec test: Fixed fetching of instance state

[Jan Provazník]

From: Jan Provaznik <jprovazn(a)redhat.com&gt;

---
 src/spec/models/instance_spec.rb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 78a0158..16e8eb9 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -133,4 +133,14 @@ describe Instance do
     end
   end
 
+  it "should return empty list of instance actions when connect to provider
fails" do
+    provider = Factory.build(:mock_provider2)
+    cloud_account = Factory.build(:cloud_account, :provider => provider,
+                                                  :username => 'john doe',
+                                                  :password => 'asdf')
+    cloud_account.stub!(:connect).and_return(nil)
+    instance = Factory.create(:instance, :cloud_account => cloud_account)
+    instance.get_action_list.should be_empty
+  end
+
 end
-- 
1.7.0.1

[PATCH aggregator] rspec test: Fixed fetching of instance state

[Tomas Sedovic]

----- Original Message -----
From: jprovazn(a)redhat.com
To: deltacloud-devel(a)lists.fedorahosted.org
Sent: Tuesday, August 17, 2010 2:03:02 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome /
Stockholm / Vienna
Subject: [deltacloud-devel] [PATCH aggregator] rspec test: Fixed fetching of instance
state

From: Jan Provaznik <jprovazn(a)redhat.com&gt;

---
 src/spec/models/instance_spec.rb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 78a0158..16e8eb9 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -133,4 +133,14 @@ describe Instance do
     end
   end
 
+  it "should return empty list of instance actions when connect to provider
fails" do
+    provider = Factory.build(:mock_provider2)
+    cloud_account = Factory.build(:cloud_account, :provider => provider,
+                                                  :username => 'john doe',
+                                                  :password => 'asdf')
+    cloud_account.stub!(:connect).and_return(nil)
+    instance = Factory.create(:instance, :cloud_account => cloud_account)
+    instance.get_action_list.should be_empty
+  end
+
 end
-- 
1.7.0.1

_______________________________________________
deltacloud-devel mailing list
deltacloud-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

[PATCH aggregator] rspec test: Fixed fetching of instance state

[Tomas Sedovic]

Sorry, forgot to type "ACK" in the previous reply.

Thomas


----- Original Message -----
From: "Tomas Sedovic" <tsedovic(a)redhat.com&gt;
To: jprovazn(a)redhat.com
Cc: deltacloud-devel(a)lists.fedorahosted.org
Sent: Wednesday, September 1, 2010 3:03:35 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome
/ Stockholm / Vienna
Subject: Re: [deltacloud-devel] [PATCH aggregator] rspec test: Fixed fetching of instance
state


----- Original Message -----
From: jprovazn(a)redhat.com
To: deltacloud-devel(a)lists.fedorahosted.org
Sent: Tuesday, August 17, 2010 2:03:02 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome /
Stockholm / Vienna
Subject: [deltacloud-devel] [PATCH aggregator] rspec test: Fixed fetching of instance
state

From: Jan Provaznik <jprovazn(a)redhat.com&gt;

---
 src/spec/models/instance_spec.rb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 78a0158..16e8eb9 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -133,4 +133,14 @@ describe Instance do
     end
   end
 
+  it "should return empty list of instance actions when connect to provider
fails" do
+    provider = Factory.build(:mock_provider2)
+    cloud_account = Factory.build(:cloud_account, :provider => provider,
+                                                  :username => 'john doe',
+                                                  :password => 'asdf')
+    cloud_account.stub!(:connect).and_return(nil)
+    instance = Factory.create(:instance, :cloud_account => cloud_account)
+    instance.get_action_list.should be_empty
+  end
+
 end
-- 
1.7.0.1

_______________________________________________
deltacloud-devel mailing list
deltacloud-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

[Tomas Sedovic]

ACK


----- Original Message -----
From: jprovazn(a)redhat.com
To: deltacloud-devel(a)lists.fedorahosted.org
Sent: Wednesday, August 4, 2010 4:08:18 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome /
Stockholm / Vienna
Subject: [deltacloud-devel] [PATCH aggregator] Fixed fetching of instance state

From: Jan Provaznik <jprovazn(a)redhat.com&gt;

When a provider is down and instance state is fetched (for example
on instances index page), then there is a nil object and exception
is thrown.
---
 src/app/models/instance_task.rb |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb
index 9da110b..6c78c0f 100644
--- a/src/app/models/instance_task.rb
+++ b/src/app/models/instance_task.rb
@@ -46,22 +46,21 @@ class InstanceTask < Task
     actions = []
     # FIXME: cloud_account won't always be set here, but we're requiring
     #        front end realm for now.
-    cloud_account = instance.cloud_account
-    c_state = cloud_account.connect.instance_state(state) unless cloud_account.nil?
-    if !cloud_account.nil? and c_state
-      transitions = c_state.transitions
-      transitions.each do |transition|
-        # FIXME if we allow actions based on the expected state after
-        # automatic transitions, we need to call this method again with
-        # the state from transition.to passed in.
-        unless transition.action.nil?
-          add_action = true
-          if (instance and user)
-            # FIXME: check permissions here if we filter actions by permission
+    if cloud_account = instance.cloud_account and
+      conn = cloud_account.connect and c_state = conn.instance_state(state)
+        transitions = c_state.transitions
+        transitions.each do |transition|
+          # FIXME if we allow actions based on the expected state after
+          # automatic transitions, we need to call this method again with
+          # the state from transition.to passed in.
+          unless transition.action.nil?
+            add_action = true
+            if (instance and user)
+              # FIXME: check permissions here if we filter actions by permission
+            end
+            actions << transition.action if add_action
           end
-          actions << transition.action if add_action
         end
-      end
     end
     actions
   end
-- 
1.7.0.1

_______________________________________________
deltacloud-devel mailing list
deltacloud-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel