Add marvin test for ASG

Author: vishesh92

test/integration/smoke/test_vm_autoscaling.py

@@ -38,6 +38,7 @@
                              DiskOffering,
                              Domain,
                              Project,
+                             ResourceSchedule,
                              ServiceOffering,
                              Template,
                              VirtualMachine,
@@ -65,6 +66,7 @@
 DEFAULT_INTERVAL = 30
 DEFAULT_QUIETTIME = 60
 NAME_PREFIX = "AS-VmGroup-"
+SCHEDULED_RESOURCE_TYPE_ASG = "AutoScaleVmGroup"
 
 CONFIG_NAME_DISK_CONTROLLER = "vmware.root.disk.controller"
 OS_DEFAULT = "osdefault"
@@ -860,13 +862,81 @@ def test_04_stop_remove_vm_in_vmgroup(self):
 
         VirtualMachine.delete(vm, self.apiclient, expunge=True)
 
-    @attr(tags=["advanced"], required_hardware="false")
-    def test_05_remove_vmgroup(self):
-        """ Verify removal of AutoScaling VM Group"""
-        self.message("Running test_05_remove_vmgroup")
+    @attr(tags=["advanced", "vj", "smoke"], required_hardware="false")
+    def test_05_autoscaling_vmgroup_schedule_update(self):
+        """Verify resource scheduling updates AutoScale VM Group min/max members"""
+        self.message("Running test_05_autoscaling_vmgroup_schedule_update")
 
-        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=False, expected=False)
-        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=True, expected=True)
+        vmgroups = AutoScaleVmGroup.list(
+            self.regular_user_apiclient,
+            id=self.autoscaling_vmgroup.id
+        )
+        self.assertEqual(
+            isinstance(vmgroups, list),
+            True,
+            "List autoscale vm groups should return a valid list"
+        )
+        self.assertEqual(
+            len(vmgroups) > 0,
+            True,
+            "Expected autoscale vm group to exist"
+        )
+        vmgroup = vmgroups[0]
+
+        current_min_members = int(vmgroup.minmembers)
+        current_max_members = int(vmgroup.maxmembers)
+        new_min_members = current_min_members + 1
+        new_max_members = current_max_members + 1
+
+        schedule = ResourceSchedule.create(
+            self.regular_user_apiclient,
+            SCHEDULED_RESOURCE_TYPE_ASG,
+            self.autoscaling_vmgroup.id,
+            "update",
+            "* * * * *",
+            datetime.datetime.now().astimezone().tzinfo,
+            (datetime.datetime.now() + datetime.timedelta(seconds=5)).strftime(
+                "%Y-%m-%d %H:%M:%S"
+            ),
+            enabled=True,
+            details=[{
+                "minmembers": str(new_min_members)},
+                {
+                "maxmembers": str(new_max_members)
+            }]
+        )
+        self.cleanup.append(schedule)
+        self.message("Created AutoScale VM Group schedule with ID: %s" % schedule.id)
+
+        schedules = ResourceSchedule.list(
+            self.regular_user_apiclient,
+            SCHEDULED_RESOURCE_TYPE_ASG,
+            self.autoscaling_vmgroup.id,
+            id=schedule.id
+        )
+        self.assertEqual(
+            isinstance(schedules, list),
+            True,
+            "Check list response returns a valid list for ASG schedules",
+        )
+        self.assertNotEqual(len(schedules), 0, "Check ASG schedule list")
+
+        # Poll for up to 4 minutes to allow the scheduler worker to run and apply update
+        schedule_worked = False
+        for _ in range(0, 24):
+            time.sleep(10)
+            updated_group = AutoScaleVmGroup.list(
+                self.regular_user_apiclient,
+                id=self.autoscaling_vmgroup.id
+            )[0]
+            if int(updated_group.minmembers) == new_min_members and int(updated_group.maxmembers) == new_max_members:
+                schedule_worked = True
+                break
+
+        self.assertTrue(
+            schedule_worked,
+            "Expected scheduled action to update AutoScale VM Group min/max members"
+        )
 
     @attr(tags=["advanced"], required_hardware="false")
     def test_06_autoscaling_vmgroup_on_project_network(self):
@@ -1211,3 +1281,11 @@ def test_07_autoscaling_vmgroup_on_vpc_network(self):
 
         self.delete_vmgroup(autoscaling_vmgroup_vpc, self.regular_user_apiclient, cleanup=False, expected=False)
         self.delete_vmgroup(autoscaling_vmgroup_vpc, self.regular_user_apiclient, cleanup=True, expected=True)
+
+    @attr(tags=["advanced", "vj"], required_hardware="false")
+    def test_05_remove_vmgroup(self):
+        """ Verify removal of AutoScaling VM Group"""
+        self.message("Running test_05_remove_vmgroup")
+
+        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=False, expected=False)
+        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=True, expected=True)

ui/src/views/compute/ResourceSchedules.vue

@@ -106,6 +106,7 @@
         />
       </a-form-item>
       <a-form-item
+        v-if="actions.length > 1"
         name="action"
         ref="action"
         :wrapperCol="{ span: 24 }"
@@ -140,7 +141,7 @@
             ref="minMembers"
           >
             <template #label>
-              <tooltip-label :title="$t('label.minimum.members')" />
+              <tooltip-label :title="$t('label.minmembers')" />
             </template>
             <a-input-number
               v-model:value="form.minMembers"
@@ -155,7 +156,7 @@
             ref="maxMembers"
           >
             <template #label>
-              <tooltip-label :title="$t('label.maximum.members')" />
+              <tooltip-label :title="$t('label.maxmembers')" />
             </template>
             <a-input-number
               v-model:value="form.maxMembers"
@@ -483,11 +484,12 @@ export default {
       this.formRef.value.validate().then(() => {
         const formRaw = toRaw(this.form)
         const values = this.handleRemoveFields(formRaw)
+        const selectedAction = values.action || (this.actions.length === 1 ? this.actions[0].value : null)
         var params = {
           description: values.description,
           schedule: values.schedule,
           timezone: values.timezone,
-          action: values.action,
+          action: selectedAction,
           resourceid: this.resource.id,
           resourcetype: this.resourceType,
           enabled: values.enabled,