From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 24 Mar 2017 06:51:32 +0000 (+0800)
Subject: unify the way of obtaining network configuration
X-Git-Tag: 1.0.0~6^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F31661%2F1;p=daisy.git

unify the way of obtaining network configuration

Change-Id: Idd960d7faf0f24ae8caac13562858ccaa1c67f7b
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---

diff --git a/deploy/config/network.py b/deploy/config/network.py
index 9f03bc15..cd38e94d 100644
--- a/deploy/config/network.py
+++ b/deploy/config/network.py
@@ -64,11 +64,3 @@ class NetworkConfig(object):
         prefix = self.type2name[network_type]
         name = '{}_{}'.format(prefix, field) if field else prefix
         setattr(self, name, value)
-
-    @property
-    def external_network(self):
-        return self._get_network('EXTERNAL')
-
-    @property
-    def external_name(self):
-        return self.external_network['network_name']
diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py
index 30319b2e..1e88755c 100644
--- a/deploy/prepare/execute.py
+++ b/deploy/prepare/execute.py
@@ -40,9 +40,9 @@ def _config_service(service, subs):
 
 @_config_service('nova', ['api'])
 def _set_default_floating_pool(network_file):
-    xnet = NetworkConfig(network_file=network_file).external_network
+    xnet = NetworkConfig(network_file=network_file).ext_network_name
     return '[DEFAULT]\n' \
-           'default_floating_pool = {}\n'.format(xnet['network_name'])
+           'default_floating_pool = {}\n'.format(xnet)
 
 
 @_config_service('heat', ['api', 'engine'])