From 1c7417cba7e89f3c474517d1312c54f27b8909e5 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Mon, 7 May 2018 10:41:48 -0700
Subject: [PATCH] Restore nuage_vspk integration tests.

---
 test/integration/targets/nuage_vspk/aliases   |  1 -
 .../targets/nuage_vspk/tasks/main.yml         | 27 ++++++++++---------
 .../prepare_nuage_tests/tasks/main.yml        | 16 ++++++-----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/test/integration/targets/nuage_vspk/aliases b/test/integration/targets/nuage_vspk/aliases
index 8d53722029..b7aa777f1f 100644
--- a/test/integration/targets/nuage_vspk/aliases
+++ b/test/integration/targets/nuage_vspk/aliases
@@ -1,3 +1,2 @@
 posix/ci/group1
 skip/python3
-disabled
diff --git a/test/integration/targets/nuage_vspk/tasks/main.yml b/test/integration/targets/nuage_vspk/tasks/main.yml
index 7c112af5e8..f3f7e046b3 100644
--- a/test/integration/targets/nuage_vspk/tasks/main.yml
+++ b/test/integration/targets/nuage_vspk/tasks/main.yml
@@ -1,18 +1,19 @@
 ---
 
-- name: collect all test cases
-  find:
-    paths: "{{ role_path }}/tests"
-    patterns: "{{ testcase }}.yaml"
-  delegate_to: localhost
-  register: test_cases
+- block:
+    - name: collect all test cases
+      find:
+        paths: "{{ role_path }}/tests"
+        patterns: "{{ testcase }}.yaml"
+      delegate_to: localhost
+      register: test_cases
 
-- name: set test_items
-  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+    - name: set test_items
+      set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
-- name: run test case
-  include: "{{ test_case_to_run }}"
-  with_items: "{{ test_items }}"
-  loop_control:
-    loop_var: test_case_to_run
+    - name: run test case
+      include: "{{ test_case_to_run }}"
+      with_items: "{{ test_items }}"
+      loop_control:
+        loop_var: test_case_to_run
   when: "ansible_python_version is version('2.7', '>=')"
diff --git a/test/integration/targets/prepare_nuage_tests/tasks/main.yml b/test/integration/targets/prepare_nuage_tests/tasks/main.yml
index bfeab9bf72..2c7214d293 100644
--- a/test/integration/targets/prepare_nuage_tests/tasks/main.yml
+++ b/test/integration/targets/prepare_nuage_tests/tasks/main.yml
@@ -1,9 +1,11 @@
 ---
-- name: Install Nuage VSD API Simulator
-  pip:
-    name: nuage-vsd-sim
+- block:
+    - name: Install Nuage VSD API Simulator
+      pip:
+        name: nuage-vsd-sim
 
-- name: Start Nuage VSD API Simulator
-  shell: "(cd /; nuage-vsd-sim >/dev/null 2>&1 &)"
-  async: 10
-  poll: 0
+    - name: Start Nuage VSD API Simulator
+      shell: "(cd /; nuage-vsd-sim >/dev/null 2>&1 &)"
+      async: 10
+      poll: 0
+  when: "ansible_python_version is version('2.7', '>=')"