From: tomsou <soth@intracom-telecom.com>
Date: Mon, 20 Feb 2017 16:02:02 +0000 (+0000)
Subject: [deployment_handler] Opendaylight node check
X-Git-Tag: danube.1.0~237^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F29081%2F3;p=releng.git

[deployment_handler] Opendaylight node check

- Enhance functionality of manager.py to check if a node is opendaylight
- Update is_compute and is_controller methods, using the Role Class attributes

Change-Id: Icf1d83b289bf6e87f83b0e1b5bdd2f9da436cde5
Signed-off-by: tomsou <soth@intracom-telecom.com>
---

diff --git a/modules/opnfv/deployment/manager.py b/modules/opnfv/deployment/manager.py
index e1fd9497f..efa28cea8 100644
--- a/modules/opnfv/deployment/manager.py
+++ b/modules/opnfv/deployment/manager.py
@@ -204,17 +204,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):
         '''