refactor fanout_connect to use host_vars already defined

ansible/fanout_connect.yml

@@ -1,18 +1,24 @@
 #Example:
-# ansible-playbook fanout_connect.yml -i str --limit str-7260-01 -b --vault-password-file password.txt -e "server=str-acs-serv-02 server_port=p6p2"
-- hosts:  all
+# ansible-playbook fanout_connect.yml -i veos --limit server_1 --vault-password-file password.txt -e "dut=str-msn2700-01"
+- hosts: servers:&vm_host
   gather_facts: no
   tasks:
       - fail: msg="Please provide VM server name and server port name, see comment line in playbook"
         when: 
-            - server is not defined
-            - server_port is not defined
-
+            - dut is not defined
+
+      - set_fact:
+          server: "{{ inventory_hostname|lower }}"
+          server_port: "{{ external_iface }}"
+
+      - debug: msg="Connect {{ server }}:{{ server_port }} to {{ dut }}"
+
       - name: get the username running the deploy
         command: whoami
         connection: local
         become: no
         register: calling_username
+        changed_when: false
 
       - set_fact: userid={{ calling_username.stdout }}
 

ansible/roles/fanout/tasks/rootfanout_connect.yml

@@ -2,10 +2,10 @@
 # This playbook is called from fanout_connect.yml 
 # Gather graph facts
 - name: Gathering connection facts about the DUT device
-  conn_graph_facts: host={{ inventory_hostname }}
+  conn_graph_facts: host={{ dut }}
   connection: local
   tags: always
-  register: dut
+  register: dutinfo
 
 - name: Gathering connection facts about the lab 
   conn_graph_facts: 
@@ -14,10 +14,11 @@
   register: lab
 
 - set_fact:
-    dut_vlans: "{{ dut.ansible_facts.device_vlan_range }}"
+    dut_vlans: "{{ dutinfo.ansible_facts.device_vlan_range }}"
     lab_devices: "{{ lab.ansible_facts.device_info }}"
 
-- set_fact: 
+- name: Find the root fanout switch
+  set_fact:
     ansible_host: "{{ lab_devices[item]['mgmtip'] }}"
     root_dev: "{{ item }}" 
   with_items: "{{ lab_devices }}"
@@ -26,10 +27,8 @@
 - set_fact: 
     root_conn: "{{ lab.ansible_facts['device_conn'][root_dev] }}"
 
-- name: change root fanout port vlan 
+- name: Change root fanout port vlan
   action: apswitch template=roles/fanout/templates/arista_7260_connect.j2
   connection: switch
   args:
       login: "{{ switch_login['Arista'] }}"
-
-

ansible/testbed-cli.sh

@@ -75,13 +75,7 @@ function add_topo
 
   ANSIBLE_SCP_IF_SSH=y ansible-playbook -i veos testbed_add_vm_topology.yml --vault-password-file="$2" -l "$server" -e topo_name="$topo_name" -e dut_name="$dut" -e VM_base="$vm_base" -e ptf_ip="$ptf_ip" -e topo="$topo" -e vm_set_name="$testbed_name" -e ptf_imagename="$ptf_imagename"
 
-  case "$server" in
-    server_1) server_port=p4p1 ;;
-    server_2) server_port=p4p1 ;;
-    server_3) server_port=p5p1 ;;
-  esac
-
-  ansible-playbook fanout_connect.yml -i str --limit "$dut" -b --vault-password-file="$2" -e "server=${server/server_/str-acs-serv-0} server_port=$server_port"
+  ansible-playbook fanout_connect.yml -i veos --limit "$server" --vault-password-file="$2" -e "dut=$dut"
 
   echo Done
 }
@@ -105,13 +99,7 @@ function renumber_topo
 
   ANSIBLE_SCP_IF_SSH=y ansible-playbook -i veos testbed_renumber_vm_topology.yml --vault-password-file="$2" -l "$server" -e topo_name="$topo_name" -e dut_name="$dut" -e VM_base="$vm_base" -e ptf_ip="$ptf_ip" -e topo="$topo" -e vm_set_name="$testbed_name" -e ptf_imagename="$ptf_imagename"
 
-  case "$server" in
-    server_1) server_port=p4p1 ;;
-    server_2) server_port=p4p1 ;;
-    server_3) server_port=p5p1 ;;
-  esac
-
-  ansible-playbook fanout_connect.yml -i str --limit "$dut" -b --vault-password-file="$2" -e "server=${server/server_/str-acs-serv-0} server_port=$server_port"
+  ansible-playbook fanout_connect.yml -i veos --limit "$server" --vault-password-file="$2" -e "dut=$dut"
 
   echo Done
 }