Update configuration for fuel 9 virtual deployment in Huawei-China.

[fuel.git] / deploy / dea.py

diff --git a/deploy/dea.py b/deploy/dea.py
index 2d2b28a..1ac048e 100644 (file)
--- a/deploy/dea.py
+++ b/deploy/dea.py
@@ -34,9 +34,6 @@ class DeploymentEnvironmentAdapter(object):
     def get_env_name(self):
         return self.get_property('environment')['name']
 
-    def get_env_mode(self):
-        return self.get_property('environment')['mode']
-
     def get_env_net_segment_type(self):
         return self.get_property('environment')['net_segment_type']
 
@@ -68,9 +65,15 @@ class DeploymentEnvironmentAdapter(object):
             if node['id'] == node_id and property_name in node:
                 return node[property_name]
 
-    def get_node_role(self, node_id):
+    def get_node_roles(self, node_id):
         return self.get_node_property(node_id, 'role')
 
+    def get_node_main_role(self, node_id, fuel_node_id):
+        if node_id == fuel_node_id:
+            return 'fuel'
+        roles = self.get_node_roles(node_id)
+        return 'controller' if 'controller' in roles else 'compute'
+
     def get_node_ids(self):
         node_ids = []
         for node in self.dea_struct['nodes']: