Skip to content

Commit 67b8cb1

Browse files
sivakasi-ciscosivakasi-cisco
committed
Revert "dcnm_policy and dcnm_vrf changes in integ tests"
This reverts commit a2c4322.
1 parent a2c4322 commit 67b8cb1

File tree

12 files changed

+25
-25
lines changed

12 files changed

+25
-25
lines changed

‎tests/integration/targets/dcnm_policy/tests/dcnm/dcnm_policy_with_vars_merge.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
# Assert for Create responses
4646
- assert:
4747
that:
48-
- 'result.failed == true'
49-
- '"OSPF_TAG" in result["msg"] or (result["msg"]["DATA"] is defined and "OSPF_TAG" in result["msg"]["DATA"]["failureList"][0]["message"])'
50-
- '"LOOPBACK_IP" in result["msg"] or (result["msg"]["DATA"] is defined and "LOOPBACK_IP" in result["msg"]["DATA"]["failureList"][0]["message"])'
48+
- 'result["msg"]["RETURN_CODE"] != 200'
49+
- '"OSPF_TAG" in result["msg"]["DATA"]["failureList"][0]["message"]'
50+
- '"LOOPBACK_IP" in result["msg"]["DATA"]["failureList"][0]["message"]'
5151

5252
- name: Create multiple policies including required variables with the same template
5353
cisco.dcnm.dcnm_policy:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/deleted.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
- set_fact:
2929
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
30-
when: controller_version == 11
30+
when: controller_version == "11"
3131

3232
- set_fact:
3333
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
34-
when: controller_version >= 12
34+
when: controller_version >= "12"
3535

3636
- name: SETUP.0 - DELETED - print vars
3737
ansible.builtin.debug:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/merged.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636

3737
- set_fact:
3838
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
39-
when: controller_version == 11
39+
when: controller_version == "11"
4040

4141
- set_fact:
4242
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
43-
when: controller_version >= 12
43+
when: controller_version >= "12"
4444

4545
- name: SETUP.0 - MERGED - [with_items] print vars
4646
ansible.builtin.debug:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/overridden.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
- set_fact:
4040
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
41-
when: controller_version == 11
41+
when: controller_version == "11"
4242

4343
- set_fact:
4444
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
45-
when: controller_version >= 12
45+
when: controller_version >= "12"
4646

4747
- name: SETUP.0 - OVERRIDDEN - print vars
4848
ansible.builtin.debug:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/query.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
- set_fact:
2727
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
28-
when: controller_version == 11
28+
when: controller_version == "11"
2929

3030
- set_fact:
3131
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
32-
when: controller_version >= 12
32+
when: controller_version >= "12"
3333

3434
- name: SETUP.0 - QUERY - [with_items] print vars
3535
ansible.builtin.debug:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/replaced.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
- set_fact:
2929
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
30-
when: controller_version == 11
30+
when: controller_version == "11"
3131

3232
- set_fact:
3333
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
34-
when: controller_version >= 12
34+
when: controller_version >= "12"
3535

3636
- name: SETUP.0 - REPLACED - [with_items] print vars
3737
ansible.builtin.debug:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/sanity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
- set_fact:
2525
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
26-
when: controller_version == 11
26+
when: controller_version == "11"
2727
tags:
2828
- sanity
2929

3030
- set_fact:
3131
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
32-
when: controller_version >= 12
32+
when: controller_version >= "12"
3333
tags:
3434
- sanity
3535

‎tests/integration/targets/dcnm_vrf/tests/dcnm/self-contained-tests/deleted_vrf_all.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
- set_fact:
2525
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
26-
when: controller_version == 11
26+
when: controller_version == "11"
2727

2828
- set_fact:
2929
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
30-
when: controller_version >= 12
30+
when: controller_version >= "12"
3131

3232
- name: DELETE_ALL - Verify if fabric is deployed.
3333
cisco.dcnm.dcnm_rest:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/self-contained-tests/merged_vrf_all.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
- set_fact:
2525
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
26-
when: controller_version == 11
26+
when: controller_version == "11"
2727

2828
- set_fact:
2929
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
30-
when: controller_version >= 12
30+
when: controller_version >= "12"
3131

3232
- name: MERGED_ALL - Verify if fabric is deployed.
3333
cisco.dcnm.dcnm_rest:

‎tests/integration/targets/dcnm_vrf/tests/dcnm/self-contained-tests/overridden_vrf_all.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323

2424
- set_fact:
2525
rest_path: "/rest/control/fabrics/{{ fabric_1 }}"
26-
when: controller_version == 11
26+
when: controller_version == "11"
2727

2828
- set_fact:
2929
rest_path: "/appcenter/cisco/ndfc/api/v1/lan-fabric/rest/control/fabrics/{{ fabric_1 }}"
30-
when: controller_version >= 12
30+
when: controller_version >= "12"
3131

3232
- name: OVERRIDDEN_ALL - Verify if fabric is deployed.
3333
cisco.dcnm.dcnm_rest:

0 commit comments

Comments
 (0)