Skip to content

Commit 471ee7f

Browse files
authored
Adjust Logic for verify_orchestration_scaled_down_instances (infrawatch#311)
Adjust the logic for scaling down test
1 parent eedffea commit 471ee7f

File tree

1 file changed

+58
-43
lines changed

1 file changed

+58
-43
lines changed

roles/telemetry_autoscaling/tasks/test_autoscaling.yml

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -83,55 +83,70 @@
8383
ansible.builtin.debug:
8484
var: result
8585

86-
- name: |
87-
TEST Verify cpu high alarm has been triggered
88-
ansible.builtin.shell: |
89-
# source ~/overcloudrc;
90-
{{ openstack_cmd }} alarm list -c state -c name -f value| \
91-
grep -i "cpu_alarm_high" | \
92-
grep -i "{{ stack_name }}" | \
93-
awk '{print $2}'
94-
retries: 100
95-
delay: 5
96-
register: result
97-
until: result.stdout == "alarm"
9886

99-
- name: |
100-
TEST Verify orchestration scaled up instances
101-
ansible.builtin.shell: |
102-
# source ~/overcloudrc;
103-
{{ openstack_cmd }} server list --long | grep -i metering.server_group
104-
retries: 100
105-
delay: 5
106-
register: instance_count2
107-
until: instance_count2.stdout_lines | length == 3
87+
- name: TEST Scaling Up instance
88+
block:
89+
- name: |
90+
TEST Verify cpu high alarm has been triggered
91+
ansible.builtin.shell: |
92+
# source ~/overcloudrc;
93+
{{ openstack_cmd }} alarm list -c state -c name -f value| \
94+
grep -i "cpu_alarm_high" | \
95+
grep -i "{{ stack_name }}" | \
96+
awk '{print $2}'
97+
retries: 100
98+
delay: 5
99+
register: result
100+
until: result.stdout == "alarm"
101+
102+
- name: |
103+
TEST Verify orchestration scaled up instances
104+
ansible.builtin.shell: |
105+
# source ~/overcloudrc;
106+
{{ openstack_cmd }} server list --long | grep -i metering.server_group
107+
retries: 100
108+
delay: 5
109+
register: instance_count2
110+
until: instance_count2.stdout_lines | length == 3
111+
112+
- name: Ensure Scaling Up instance result is set
113+
ansible.builtin.set_fact:
114+
scaling_up_success: "{{ instance_count2.stdout_lines | length == 3 }}"
115+
116+
- name: Debug scaling_up_success
117+
ansible.builtin.debug:
118+
var: scaling_up_success
119+
108120

109121
- name: Stop the busy process
110122
ansible.builtin.shell: |
111123
sshpass -p gocubsgo ssh cirros@{{ item | trim }} "sudo killall yes"
112124
register: kill_busy_process
113125
with_items: "{{ vnf_instance_ip.stdout_lines }}"
114126

115-
- name: |
116-
TEST Verify cpu low alarm has been triggered
117-
ansible.builtin.shell: |
118-
# source ~/overcloudrc;
119-
{{ openstack_cmd }} alarm list -c state -c name -f value| \
120-
grep -i "cpu_alarm_low" | \
121-
grep -i "{{ stack_name }}" | \
122-
awk '{print $2}'
123-
retries: 160
124-
delay: 5
125-
register: result
126-
until: result.stdout == "alarm"
127+
- name: TEST Scaling down instance
128+
when: scaling_up_success | bool
129+
block:
130+
- name: |
131+
TEST Verify cpu low alarm has been triggered
132+
ansible.builtin.shell: |
133+
# source ~/overcloudrc;
134+
{{ openstack_cmd }} alarm list -c state -c name -f value| \
135+
grep -i "cpu_alarm_low" | \
136+
grep -i "{{ stack_name }}" | \
137+
awk '{print $2}'
138+
retries: 160
139+
delay: 5
140+
register: result
141+
until: result.stdout == "alarm"
127142
128-
- name: |
129-
TEST Verify Orchestration scaled down instances
130-
ansible.builtin.shell: |
131-
# source ~/overcloudrc;
132-
export STACK_ID=$({{ openstack_cmd }} stack show {{ stack_name }} -c id -f value)
133-
{{ openstack_cmd }} server list --long|grep -i metering.server_group=\'$STACK_ID\'
134-
retries: 100
135-
delay: 5
136-
register: instance_count3
137-
until: instance_count3.stdout_lines | length == 1
143+
- name: |
144+
TEST Verify Orchestration scaled down instances
145+
ansible.builtin.shell: |
146+
# source ~/overcloudrc;
147+
export STACK_ID=$({{ openstack_cmd }} stack show {{ stack_name }} -c id -f value)
148+
{{ openstack_cmd }} server list --long|grep -i metering.server_group=\'$STACK_ID\'
149+
retries: 100
150+
delay: 5
151+
register: instance_count3
152+
until: instance_count3.stdout_lines | length == 1

0 commit comments

Comments
 (0)