From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Tue, 29 Aug 2017 03:10:47 +0000 (+0800)
Subject: Add parser convert vnfd vcenter
X-Git-Tag: v1.0.0~129
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c644bd4beb5f4d18e4268efc5e8105cf5a2e88f6;p=vfc%2Fnfvo%2Flcm.git

Add parser convert vnfd vcenter

After parse the vnfd package, add
_get_all_vcenter function to convert
the vcenter info.

Change-Id: I4533a97c3a81385ddc1c03bd184f5a41685fbbae
Issue-ID: VFC-177
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/lcm/pub/utils/toscaparser/vnfdmodel.py b/lcm/pub/utils/toscaparser/vnfdmodel.py
index cf29ea68..7ac44d1d 100644
--- a/lcm/pub/utils/toscaparser/vnfdmodel.py
+++ b/lcm/pub/utils/toscaparser/vnfdmodel.py
@@ -18,6 +18,7 @@ class EtsiVnfdInfoModel(EtsiNsdInfoModel):
 
         self.services = self._get_all_services(nodeTemplates)
         self.vcloud = self._get_all_vcloud(nodeTemplates)
+        self.vcenter = self._get_all_vcenter(nodeTemplates)
 
 
     def _get_all_services(self, nodeTemplates):
@@ -54,4 +55,29 @@ class EtsiVnfdInfoModel(EtsiNsdInfoModel):
         return rets
 
     def _isVcloud(self, node):
-        return node['nodeType'].upper().find('.VCLOUD.') >= 0 or node['nodeType'].upper().endswith('.VCLOUD')
\ No newline at end of file
+        return node['nodeType'].upper().find('.VCLOUD.') >= 0 or node['nodeType'].upper().endswith('.VCLOUD')
+
+    def _get_all_vcenter(self, nodeTemplates):
+        rets = []
+        for node in nodeTemplates:
+            if self._isVcenter(node):
+                ret = {}
+                if 'compute_clusters' in node['properties']:
+                    ret['compute_clusters'] = node['properties']['compute_clusters']
+                else:
+                    ret['compute_clusters'] = []
+                if 'storage_clusters' in node['properties']:
+                    ret['storage_clusters'] = node['properties']['storage_clusters']
+                else:
+                    ret['storage_clusters'] = []
+                if 'network_clusters' in node['properties']:
+                    ret['network_clusters'] = node['properties']['network_clusters']
+                else:
+                    ret['network_clusters'] = []
+
+                rets.append(ret)
+        return rets
+
+    def _isVcenter(self, node):
+        return node['nodeType'].upper().find('.VCENTER.') >= 0 or node['nodeType'].upper().endswith('.VCENTER')
+    
\ No newline at end of file