From ee1b41babea3224de31100965c86fdf5f6db9fba Mon Sep 17 00:00:00 2001 From: KongWei Date: Mon, 10 Oct 2016 06:08:25 +0000 Subject: [PATCH] =?UTF-8?q?db/sqlalchemy/api.py=20=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E8=B6=85=E8=BF=8779=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iee81b48d790a7d5443ac2e984e3459ca073bb15d --- code/daisy/daisy/db/sqlalchemy/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/daisy/daisy/db/sqlalchemy/api.py b/code/daisy/daisy/db/sqlalchemy/api.py index 90690e2f..8c56100d 100755 --- a/code/daisy/daisy/db/sqlalchemy/api.py +++ b/code/daisy/daisy/db/sqlalchemy/api.py @@ -236,7 +236,8 @@ def get_ip_with_equal_cidr(cluster_id,network_plane_name,session, exclude_ips=[] # merged_by_cidr_vlan['(10,23)'] = [management_network_plane] # merged_by_cidr_vlan['(9,24)'] = [ # deployment_network_plane,storage_network_plane] -# merged_networks=[{'name':'MAGEMENT','ip':"10.43.177.2"},{'name':'DEPLOYMENT,STORAGE','ip':""}] +# merged_networks=[{'name':'MAGEMENT','ip':"10.43.177.2"}, +# {'name':'DEPLOYMENT,STORAGE','ip':""}] def merge_networks_for_unifiers(cluster_id, assigned_networks): merged_by_cidr_vlan = {} session = get_session()