Merge branch '1.3.6'

portal/models/oedl.py

@@ -534,10 +534,11 @@ class OEDL:
 
         vlans = []
 
-        for component in active_lease['components']:
-            if component['resource_type'] == 'vlan':
-                vlans.append({'name' : component['name'] })
-                break
+        if active_lease is not None:
+            for component in active_lease['components']:
+                if component['resource_type'] == 'vlan':
+                    vlans.append({'name' : component['name'] })
+                    break
 
         for vm in slice_resource['vms']:
             # vm_group
@@ -587,10 +588,11 @@ class OEDL:
 
         vlans = []
 
-        for component in active_lease['components']:
-            if component['resource_type'] == 'vlan':
-                vlans.append({'name' : component['name'] })
-                break
+        if active_lease is not None:
+            for component in active_lease['components']:
+                if component['resource_type'] == 'vlan':
+                    vlans.append({'name' : component['name'] })
+                    break
 
         for vm in slice_resource['vms']:
             # vm_group