diff options
| -rw-r--r-- | opnfv/deployment/manager.py | 14 | ||||
| -rw-r--r-- | opnfv/utils/ovs_logger.py | 16 |
2 files changed, 13 insertions, 17 deletions
diff --git a/opnfv/deployment/manager.py b/opnfv/deployment/manager.py index 3175cba..1dfbb09 100644 --- a/opnfv/deployment/manager.py +++ b/opnfv/deployment/manager.py @@ -214,17 +214,19 @@ class Node(object): ''' Returns if the node is a controller ''' - if 'controller' in self.roles: - return True - return False + return Role.CONTROLLER in self.roles def is_compute(self): ''' Returns if the node is a compute ''' - if 'compute' in self.roles: - return True - return False + return Role.COMPUTE in self.roles + + def is_odl(self): + ''' + Returns if the node is an opendaylight + ''' + return Role.ODL in self.roles def get_ovs_info(self): ''' diff --git a/opnfv/utils/ovs_logger.py b/opnfv/utils/ovs_logger.py index d650eb9..7777a9a 100644 --- a/opnfv/utils/ovs_logger.py +++ b/opnfv/utils/ovs_logger.py @@ -101,19 +101,13 @@ class OVSLogger(object): if timestamp is None: timestamp = time.strftime("%Y%m%d-%H%M%S") - for controller_client in controller_clients: - self.ofctl_dump_flows(controller_client, - timestamp=timestamp) - self.vsctl_show(controller_client, - timestamp=timestamp) - - for compute_client in compute_clients: - self.ofctl_dump_flows(compute_client, - timestamp=timestamp) - self.vsctl_show(compute_client, - timestamp=timestamp) + clients = controller_clients + compute_clients + for client in clients: + self.ofctl_dump_flows(client, timestamp=timestamp) + self.vsctl_show(client, timestamp=timestamp) if related_error is not None: dumpdir = os.path.join(self.ovs_dir, timestamp) + self.__mkdir_p(dumpdir) with open(os.path.join(dumpdir, 'error'), 'w') as f: f.write(related_error) |