From c8847fe0a7608b2a1685c6d0b7e248a0ed02db1b Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chmacnaughton@gmail.com>
Date: Thu, 14 Apr 2016 07:51:00 -0400
Subject: [PATCH] Update test to validate processes better

This test is being updated to use the new functionality
being made available in the charmhelpers sync

Also, update tests/charmhelpers

Change-Id: I3109be2ee6069101c72ca1cfd786bcfc66fa27e0
---
 tests/basic_deployment.py                     |  2 +-
 tests/charmhelpers/contrib/amulet/utils.py    | 26 ++++++++++++-------
 .../contrib/openstack/amulet/deployment.py    |  4 ++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 87e236cb..bd9eb80d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -183,7 +183,7 @@ class CephOsdBasicDeployment(OpenStackAmuletDeployment):
             self.ceph0_sentry: ceph_processes,
             self.ceph1_sentry: ceph_processes,
             self.ceph2_sentry: ceph_processes,
-            self.ceph_osd_sentry: {'ceph-osd': True}
+            self.ceph_osd_sentry: {'ceph-osd': [2, 3]}
         }
 
         actual_pids = u.get_unit_process_ids(expected_processes)
diff --git a/tests/charmhelpers/contrib/amulet/utils.py b/tests/charmhelpers/contrib/amulet/utils.py
index 3e159039..7e5c25a9 100644
--- a/tests/charmhelpers/contrib/amulet/utils.py
+++ b/tests/charmhelpers/contrib/amulet/utils.py
@@ -601,7 +601,7 @@ class AmuletUtils(object):
                 return ('Process name count mismatch.  expected, actual: {}, '
                         '{}'.format(len(expected), len(actual)))
 
-            for (e_proc_name, e_pids_length), (a_proc_name, a_pids) in \
+            for (e_proc_name, e_pids), (a_proc_name, a_pids) in \
                     zip(e_proc_names.items(), a_proc_names.items()):
                 if e_proc_name != a_proc_name:
                     return ('Process name mismatch.  expected, actual: {}, '
@@ -610,25 +610,31 @@ class AmuletUtils(object):
                 a_pids_length = len(a_pids)
                 fail_msg = ('PID count mismatch. {} ({}) expected, actual: '
                             '{}, {} ({})'.format(e_sentry_name, e_proc_name,
-                                                 e_pids_length, a_pids_length,
+                                                 e_pids, a_pids_length,
                                                  a_pids))
 
-                # If expected is not bool, ensure PID quantities match
-                if not isinstance(e_pids_length, bool) and \
-                        a_pids_length != e_pids_length:
+                # If expected is a list, ensure at least one PID quantity match
+                if isinstance(e_pids, list) and \
+                        a_pids_length not in e_pids:
+                    return fail_msg
+                # If expected is not bool and not list,
+                # ensure PID quantities match
+                elif not isinstance(e_pids, bool) and \
+                        not isinstance(e_pids, list) and \
+                        a_pids_length != e_pids:
                     return fail_msg
                 # If expected is bool True, ensure 1 or more PIDs exist
-                elif isinstance(e_pids_length, bool) and \
-                        e_pids_length is True and a_pids_length < 1:
+                elif isinstance(e_pids, bool) and \
+                        e_pids is True and a_pids_length < 1:
                     return fail_msg
                 # If expected is bool False, ensure 0 PIDs exist
-                elif isinstance(e_pids_length, bool) and \
-                        e_pids_length is False and a_pids_length != 0:
+                elif isinstance(e_pids, bool) and \
+                        e_pids is False and a_pids_length != 0:
                     return fail_msg
                 else:
                     self.log.debug('PID check OK: {} {} {}: '
                                    '{}'.format(e_sentry_name, e_proc_name,
-                                               e_pids_length, a_pids))
+                                               e_pids, a_pids))
         return None
 
     def validate_list_of_identical_dicts(self, list_of_dicts):
diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
index d2ede320..d21c9c78 100644
--- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
@@ -126,7 +126,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
         # Charms which can not use openstack-origin, ie. many subordinates
         no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
                      'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
-                     'cinder-backup']
+                     'cinder-backup', 'nexentaedge-data',
+                     'nexentaedge-iscsi-gw', 'nexentaedge-swift-gw',
+                     'cinder-nexentaedge', 'nexentaedge-mgmt']
 
         if self.openstack:
             for svc in services: