[ONOS-7221] Upgrade state tests
Change-Id: I0e9214ddcb272dc98bb8f54fa600704c38e3562d
diff --git a/tools/test/scenarios/upgrade-rollback.xml b/tools/test/scenarios/upgrade-rollback.xml
index 05841bb..13f4403 100644
--- a/tools/test/scenarios/upgrade-rollback.xml
+++ b/tools/test/scenarios/upgrade-rollback.xml
@@ -23,6 +23,10 @@
<step name="Initialize-ECM"
exec="onos ${OC1} ec-map-test foo put a b"/>
+ <step name="Initialize-CM"
+ exec="onos ${OC1} map-test foo put a b"
+ requires="Initialize-ECM"/>
+
<step name="Initialize-Upgrade"
exec="onos ${OC1} issu init"
requires="Initialize-ECM"/>
@@ -65,8 +69,12 @@
requires="Phase-One-Wait-for-Start-${#}"/>
<step name="Phase-One-Check-ECM-${#}"
- exec="onos-execute-expect ${OCMI#} ec-map-test foo get a --expect b"
+ exec="onos-execute-expect ${OCMI#} ec-map-test foo get a --retry 5 --expect b"
requires="Phase-One-Distributed-Primitives-Check-Apps-${#}"/>
+
+ <step name="Phase-One-Check-CM-${#}"
+ exec="onos-execute-expect ${OCMI#} map-test foo get a --retry 5 --expect b"
+ requires="Phase-One-Check-ECM-${#}"/>
</sequential>
</group>
@@ -74,19 +82,31 @@
<step name="Change-Majority-ECM"
exec="onos ${OCMA1} ec-map-test foo put a d"/>
+ <step name="Change-Majority-CM"
+ exec="onos ${OCMA1} map-test foo put a d"/>
+
<step name="Change-Minority-ECM"
exec="onos ${OCMI1} ec-map-test foo put a c"/>
+
+ <step name="Change-Minority-CM"
+ exec="onos ${OCMI1} map-test foo put a c"/>
</group>
<group name="Check-ECM-values" requires="Change-ECM-values">
<parallel var="${OCMI#}">
<step name="Parallel-Check-Minority-ECM-${#}"
- exec="onos-execute-expect ${OCMI#} ec-map-test foo get a --expect c"/>
+ exec="onos-execute-expect ${OCMI#} ec-map-test foo get a --retry 5 --expect c"/>
+
+ <step name="Parallel-Check-Minority-CM-${#}"
+ exec="onos-execute-expect ${OCMI#} map-test foo get a --retry 5 --expect c"/>
</parallel>
<parallel var="${OCMA#}">
<step name="Parallel-Check-Majority-ECM-${#}"
- exec="onos-execute-expect ${OCMA#} ec-map-test foo get a --expect d"/>
+ exec="onos-execute-expect ${OCMA#} ec-map-test foo get a --retry 5 --expect d"/>
+
+ <step name="Parallel-Check-Majority-CM-${#}"
+ exec="onos-execute-expect ${OCMA#} map-test foo get a --retry 5 --expect d"/>
</parallel>
</group>
@@ -136,8 +156,12 @@
requires="Phase-Two-Wait-for-Start-${#}"/>
<step name="Phase-Two-Check-ECM-${#}"
- exec="onos-execute-expect ${OC#} ec-map-test foo get a --expect d"
+ exec="onos-execute-expect ${OC#} ec-map-test foo get a --retry 5 --expect d"
requires="Phase-Two-Distributed-Primitives-Check-Apps-${#}"/>
+
+ <step name="Phase-Two-Check-CM-${#}"
+ exec="onos-execute-expect ${OC#} map-test foo get a --retry 5 --expect d"
+ requires="Phase-Two-Check-ECM-${#}"/>
</sequential>
</group>
@@ -149,8 +173,7 @@
<parallel var="${OC#}">
<step name="Check-Nodes-${#}"
exec="onos-check-nodes ${OC#}"
- delay="3"
- requires="Verify-EC-Map-${#}"/>
+ delay="3"/>
<step name="Check-Components-${#}"
exec="onos-check-components ${OC#}"