arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-17 22:08:35 +00:00
Code Issues Releases Wiki Activity

Round-robin nodes across all available compute resources. Fixes #1165.

Browse Source
This commit is contained in:
grossmj 2017-09-03 22:51:51 +07:00
parent c22229101f
commit 90e3a8d612
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/controller/import_project.py
View File

@ -23,6 +23,7 @@ import shutil
import asyncio import asyncio
import zipfile import zipfile
import aiohttp import aiohttp
import itertools
from .topology import load_topology from .topology import load_topology
@ -116,8 +117,10 @@ def import_project(controller, project_id, stream, location=None, name=None, kee
if node["node_type"] in ("docker", "qemu", "iou", "nat"): if node["node_type"] in ("docker", "qemu", "iou", "nat"):
node["compute_id"] = "vm" node["compute_id"] = "vm"
else: else:
# Round-robin through available compute resources.
compute_nodes = itertools.cycle(controller.computes)
for node in topology["topology"]["nodes"]: for node in topology["topology"]["nodes"]:
node["compute_id"] = "local" node["compute_id"] = next(compute_nodes)
compute_created = set() compute_created = set()
for node in topology["topology"]["nodes"]: for node in topology["topology"]["nodes"]: