Merge pull request #1291 from sabaini/fix-ceph-rbd-mirror

Fix: ceph-rbd-mirror testing action handling

zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py

@@ -503,11 +503,11 @@ def execute_failover_juju_actions(self,
                 'pools': ','.join(primary_site_pools)
             })
         logging.info(result)
-        self.assertEqual(int(result.get('Code')), 0)
+        self.assertEqual(int(result.results["return-code"]), 0)
 
         # Validate that the demoted pools count matches the total primary site
         # pools count.
-        n_pools_demoted = len(result.get('Stdout').split('\n'))
+        n_pools_demoted = len(result.results["output"].split('\n'))
         self.assertEqual(len(primary_site_pools), n_pools_demoted)
 
         # At this point, both primary and secondary sites are demoted. Validate
@@ -537,11 +537,11 @@ def execute_failover_juju_actions(self,
                 'pools': ','.join(secondary_site_pools)
             })
         logging.info(result)
-        self.assertEqual(int(result.get('Code')), 0)
+        self.assertEqual(int(result.results["return-code"]), 0)
 
         # Validate that the promoted pools count matches the total secondary
         # site pools count.
-        n_pools_promoted = len(result.get('Stdout').split('\n'))
+        n_pools_promoted = len(result.results["output"].split('\n'))
         self.assertEqual(len(secondary_site_pools), n_pools_promoted)
 
         # Validate that the Ceph images from the newly promoted site
@@ -711,7 +711,7 @@ def test_203_juju_resync(self):
                 'i-really-mean-it': True,
             })
         logging.info(result)
-        self.assertEqual(int(result.get('Code')), 0)
+        self.assertEqual(int(result.results["return-code"]), 0)
 
         # Validate that the Ceph images from site-b report 'up+replaying'
         # (which is reported by secondary Ceph images). And check that images