Include zone in GCE instance base name

appengine/gce-backend/instance_group_managers_test.py

Index: appengine/gce-backend/instance_group_managers_test.py
diff --git a/appengine/gce-backend/instance_group_managers_test.py b/appengine/gce-backend/instance_group_managers_test.py
index 925e6fe16c6b09ba7f9aedcfc93fd685e68f6db3..e4f6388fa704e1ef3f6654723ca886999b030345 100755
--- a/appengine/gce-backend/instance_group_managers_test.py
+++ b/appengine/gce-backend/instance_group_managers_test.py
@@ -449,6 +449,32 @@ class GetDrainedInstanceGroupManagersTest(test_case.TestCase):
     )
 
 
+class GetBaseNameTest(test_case.TestCase):
+  """Tests for instance_group_managers.get_base_name."""
+
+  def test_get_base_name(self):
+    """Ensures base instance name is generated correctly."""
+    key = models.InstanceGroupManager(
+        key=instance_group_managers.get_instance_group_manager_key(
+            'base-name',
+            'revision-extra-long',
+            'zone',
+        ),
+        minimum_size=10,
+        maximum_size=10,
+        url='https://example.com',
+    ).put()
+    models.InstanceTemplateRevision(
+        key=key.parent(),
+    ).put()
+    models.InstanceTemplate(key=key.parent().parent()).put()
+
+    self.assertEqual(
+        instance_group_managers.get_base_name(key.get()),
+        'base-name-revision-zone',
+    )
+
+
 class GetInstanceGroupManagerToDeleteTest(test_case.TestCase):
   """Tests for instance_group_managers.get_instance_group_manager_to_delete."""