Use Dynamips, IOU and VPCS identifiers to correctly load a topology.

This commit is contained in:
grossmj
2014-06-15 05:18:33 -06:00
parent f9ee38dd55
commit cb763e0926
18 changed files with 115 additions and 55 deletions

View File

@ -132,9 +132,8 @@ class VM(object):
image = request["image"]
ram = request["ram"]
hypervisor = None
chassis = None
if "chassis" in request:
chassis = request["chassis"]
chassis = request.get("chassis")
router_id = request.get("router_id")
try:
@ -147,9 +146,9 @@ class VM(object):
hypervisor = self._hypervisor_manager.allocate_hypervisor_for_router(image, ram)
if chassis:
router = PLATFORMS[platform](hypervisor, name, chassis=chassis)
router = PLATFORMS[platform](hypervisor, name, router_id, chassis=chassis)
else:
router = PLATFORMS[platform](hypervisor, name)
router = PLATFORMS[platform](hypervisor, name, router_id)
router.ram = ram
router.image = image
router.sparsemem = self._hypervisor_manager.sparse_memory_support