Merge pull request #986 from deNBI/staging

Staging
deNBI · Jan 26, 2022 · fa78f29 · fa78f29
2 parents 69dbe4f + a0fc15a
commit fa78f29
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py
@@ -1955,7 +1955,7 @@ def add_udp_security_group(self, server_id):
             .split(".")[-1]
         )
         x = int(ip_base)
-        udp_port_start = eval(self.UDP_PORT_CALCULATION)
+        udp_port_start = eval(self.UDP_FORMULAR)
 
         security_group = self.create_security_group(
             name=server.name + "_udp",
@@ -2081,7 +2081,12 @@ def get_active_image_by_os_version(self, os_version, os_distro):
             metadata = image["metadata"]
             image_os_version = metadata.get("os_version", None)
             image_os_distro = metadata.get("os_distro", None)
-            if os_version == image_os_version and image.status == "active":
+            base_image_ref = metadata.get("base_image_ref", None)
+            if (
+                os_version == image_os_version
+                and image.status == "active"
+                and base_image_ref is None
+            ):
                 if os_distro and os_distro == image_os_distro:
                     return image
                 elif os_distro is None: