x/daisycloud-core
Code Issues Proposed changes

Merge "db/sqlalchemy/api.py 注释超过79列"

Browse Source
This commit is contained in:
Jenkins 2016-10-10 06:42:47 +00:00 committed by Gerrit Code Review
commit ea53b04861
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/daisy/daisy/db/sqlalchemy/api.py
View File

@ -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()