diff options
| author |   Parker Berberian <pberberian@iol.unh.edu> | 2019-05-08 16:33:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-08 16:33:04 +0000 |
| commit | 19350b192914a2bfadac81f9885d6be236d58346 (patch) | |
| tree | c60a6ed3cc70237dfab0d7282b569bc89ce656d1 /src | |
| parent | dc690ef43cc7af006c0900e8eaf1635141f0a2a1 (diff) | |
| parent | c808a76d52ba7de96f6fcd6eaad35c1dc2f41e53 (diff) | |
Merge "Fix vlan leak"
Diffstat (limited to 'src')
| -rw-r--r-- | src/resource_inventory/resource_manager.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/resource_inventory/resource_manager.py b/src/resource_inventory/resource_manager.py index d3d3ed4..652e4e3 100644 --- a/src/resource_inventory/resource_manager.py +++ b/src/resource_inventory/resource_manager.py @@ -104,7 +104,7 @@ class ResourceManager: try: physical_host = self.acquireHost(generic_host, genericResourceBundle.lab.name) except ResourceAvailabilityException: - self.fail_acquire(physical_hosts, vlan_map) + self.fail_acquire(physical_hosts, vlan_map, genericResourceBundle) raise ResourceAvailabilityException("Could not provision hosts, not enough available") try: physical_host.bundle = resource_bundle @@ -114,12 +114,12 @@ class ResourceManager: self.configureNetworking(physical_host, vlan_map) except Exception: - self.fail_acquire(physical_hosts, vlan_map) + self.fail_acquire(physical_hosts, vlan_map, genericResourceBundle) raise ResourceProvisioningException("Network configuration failed.") try: physical_host.save() except Exception: - self.fail_acquire(physical_hosts) + self.fail_acquire(physical_hosts, vlan_map, genericResourceBundle) raise ModelValidationException("Saving hosts failed") return resource_bundle @@ -167,9 +167,8 @@ class ResourceManager: else: vlan_manager.release_vlans(vlan_id) - def fail_acquire(self, hosts, vlans): - grb = hosts[0].template.resource.bundle - vlan_manager = hosts[0].lab.vlan_manager + def fail_acquire(self, hosts, vlans, grb): + vlan_manager = grb.lab.vlan_manager self.releaseNetworks(grb, vlan_manager, vlans) for host in hosts: self.releaseHost(host) |