diff options
| author |   Sawyer Bergeron <sbergeron@iol.unh.edu> | 2021-09-25 16:18:12 -0400 |
|---|---|---|
| committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2021-09-25 16:29:13 -0400 |
| commit | 95d39c60f7e8062cabc8c1665080a2d2c8904234 (patch) | |
| tree | 786fbe0ba896b28135706c417ebfac176ea67a45 /src/resource_inventory/resource_manager.py | |
| parent | 2ebb82b5f344de1e17abd70c51c4cce765761dd1 (diff) | |
Allow for "pod specific" vlan allocation for LFEDGE allocation case
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: I8b75410145027f43eaf6de7bd5f1813af38d3e7f
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'src/resource_inventory/resource_manager.py')
| -rw-r--r-- | src/resource_inventory/resource_manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resource_inventory/resource_manager.py b/src/resource_inventory/resource_manager.py index 9406977..14a118c 100644 --- a/src/resource_inventory/resource_manager.py +++ b/src/resource_inventory/resource_manager.py @@ -74,12 +74,13 @@ class ResourceManager: vlan_manager = resourceTemplate.lab.vlan_manager for network in resourceTemplate.networks.all(): if network.is_public: - public_net = vlan_manager.get_public_vlan() + # already throws if can't get requested count, so can always expect public_net to be Some + public_net = vlan_manager.get_public_vlan(within=resourceTemplate.public_vlan_pool_set()) vlan_manager.reserve_public_vlan(public_net.vlan) networks[network.name] = public_net.vlan else: # already throws if can't get requested count, so can always index in @ 0 - vlans = vlan_manager.get_vlans(count=1) + vlans = vlan_manager.get_vlans(count=1, within=resourceTemplate.private_vlan_pool_set()) vlan_manager.reserve_vlans(vlans[0]) networks[network.name] = vlans[0] return networks |