From 71b6ec3d5ae3025babe79fb106bd217dd0f9bbcf Mon Sep 17 00:00:00 2001
From: crodetsky <crodetsky@gmail.com>
Date: Mon, 9 Jan 2017 10:45:48 -0500
Subject: [PATCH] Genericize test cases and namespace create pod

This change modifies 020_check-create-pod and 030_check-network test cases to
target `kube-master[0]` instead of `node1` as these tests can be useful in
deployments that do not use the same naming convention as the basic tests.

This change also modifies 020_check-create-pod to namespace into a `test`
namespace allowing the `get pods` command to get its expected number of
running containers.

Closes #866 and #867.
---
 tests/testcases/020_check-create-pod.yml | 11 +++++++----
 tests/testcases/030_check-network.yml    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/testcases/020_check-create-pod.yml b/tests/testcases/020_check-create-pod.yml
index d2e3e4341..ba76067f7 100644
--- a/tests/testcases/020_check-create-pod.yml
+++ b/tests/testcases/020_check-create-pod.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: node1
+- hosts: kube-master[0]
 
   vars:
     test_image_repo: busybox
@@ -16,11 +16,14 @@
       bin_dir: "/usr/local/bin"
     when: not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
 
-  - name: Run a replica controller composed of 2 pods
-    shell: "{{bin_dir}}/kubectl run test --image={{test_image_repo}}:{{test_image_tag}} --replicas=2 --command -- tail -f /dev/null"
+  - name: Create test namespace
+    shell: "{{bin_dir}}/kubectl create namespace test"
+
+  - name: Run a replica controller composed of 2 pods in test ns
+    shell: "{{bin_dir}}/kubectl run test --image={{test_image_repo}}:{{test_image_tag}} --namespace test --replicas=2 --command -- tail -f /dev/null"
 
   - name: Pods are running
-    shell: "{{bin_dir}}/kubectl get pods --no-headers -o json"
+    shell: "{{bin_dir}}/kubectl get pods --namespace test --no-headers -o json"
     register: run_pods_log
     until: [ '(run_pods_log.stdout | from_json)["items"] | map(attribute = "status.phase") | join(",") == "Running,Running"' ]
     retries: 18
diff --git a/tests/testcases/030_check-network.yml b/tests/testcases/030_check-network.yml
index b92efa975..0932d63ff 100644
--- a/tests/testcases/030_check-network.yml
+++ b/tests/testcases/030_check-network.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: node1
+- hosts: kube-master[0]
 
   tasks: