[deployment handler] Add support for Clusters in Fuel

Fix minor apex issues.

Output of example.py
http://pastebin.com/raw/x70Uj85V

Change-Id: I6013f5c4d916126f79afd40a6d6a35278c8ed26f
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/modules/opnfv/deployment/manager.py b/modules/opnfv/deployment/manager.py
index 9f77ff0a7..8c9599b6e 100644
--- a/modules/opnfv/deployment/manager.py
+++ b/modules/opnfv/deployment/manager.py
@@ -243,7 +243,7 @@ class DeploymentHandler(object):
             raise Exception(
                 'Cannot establish connection to the installer node!')
 
-        self.nodes = self.nodes()
+        self.nodes = self.get_nodes()
 
     @abstractmethod
     def get_openstack_version(self):
@@ -267,18 +267,12 @@ class DeploymentHandler(object):
         raise Exception(DeploymentHandler.FUNCTION_NOT_IMPLEMENTED)
 
     @abstractmethod
-    def nodes(self, options=None):
+    def get_nodes(self, options=None):
         '''
             Generates a list of all the nodes in the deployment
         '''
         raise Exception(DeploymentHandler.FUNCTION_NOT_IMPLEMENTED)
 
-    def get_nodes(self, options=None):
-        '''
-            Returns the list of Node objects
-        '''
-        return self.nodes
-
     def get_installer_node(self):
         '''
             Returns the installer node object
@@ -296,4 +290,4 @@ class DeploymentHandler(object):
                           pod=os.getenv('NODE_NAME', 'Unknown'),
                           openstack_version=self.get_openstack_version(),
                           sdn_controller=self.get_sdn_version(),
-                          nodes=self.nodes)
+                          nodes=self.get_nodes())