x/daisycloud-core
Code Issues Proposed changes

judge ip in host_template_interface

Browse Source 
Change-Id: Ia8b1ba2fa7dce794015a6a1b52fa9cc2ac360622
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
This commit is contained in:
Yao Lu
2017-01-18 17:41:30 +08:00
parent bf42feffbe
commit 7f32becc92
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/daisy/daisy/api/v1/host_template.py
View File

@@ -533,7 +533,7 @@ class Controller(controller.BaseController):
interface_match_flag += 1
host_template_interface['mac'] =\
orig_host_interface['mac']
if host_template_interface.get('ip', None) and\
if 'ip' in host_template_interface and\
ssh_host_flag:
host_template_interface['ip'] =\
orig_host_interface['ip']
@@ -556,8 +556,8 @@ class Controller(controller.BaseController):
interface_key, None) and ssh_host_flag:
host_template_interface[interface_key]\
= orig_host_interface[interface_key]
if host_template_interface.get(
'ip', None) and not ssh_host_flag:
if 'ip' in host_template_interface and\
not ssh_host_flag:
host_template_interface.pop('ip')
if orig_host_interface.get('assigned_networks',
None) and ssh_host_flag: