[testbed] fanout add rootfanout connect when deploying fanout switch (#368)

Author: maggiemsft

ansible/fanout_connect.yml

@@ -22,6 +22,6 @@
 
       - set_fact: userid={{ calling_username.stdout }}
 
-      - include: roles/fanout/tasks/rootfanout_connect.yml
-
+      - set_fact: connect_leaf=false
 
+      - include: roles/fanout/tasks/rootfanout_connect.yml

ansible/roles/fanout/tasks/main.yml

@@ -1,41 +1,54 @@
 ##############################################################################################
 ### playbook to deploy the fanout swtich 
-### Use this playbook to deploy the VLAN configurations of fanout leaf switch in SONiC testbed
+### Use this playbook to deploy the VLAN configurations of fanout switch in SONiC testbed
 ### This playbook will run based on hardware flatform. Each fanout switch hardware type has its
 ### own unique feature and configuration command or format. Unless you use the hardware swtich
 ### specified in this playbook, you would need to come up with your own fanout switch deployment 
 ### playbook
 ################################################################################################
-  # Gather minigraph facts
+# Deploy fanout switch
 - name: Gathering lab graph facts about the device
   conn_graph_facts: host={{ inventory_hostname }}
   connection: local
-  tags: always
+
+- set_fact: sw_type="{{ device_info['Type'] }}"
 
 - name: prepare fanout switch admin login info
   set_fact: ansible_ssh_user={{ fanout_admin_user }} ansible_ssh_pass={{ fanout_admin_password }}
 
-- block:
-  - name: build fanout startup config for Arista Fanout leaf
-    template: src=arista_7260_deploy.j2
-              dest=/mnt/flash/startup-config
-    notify:
-      - Restart the box
+- name: create persistent shell login
+  file: path=/mnt/flash/rc.eos state=touch
+  become: yes
+
+- name: save persistent shell login
+  template: src=rc.eos.j2
+            dest=/mnt/flash/rc.eos
+  become: yes
+
+- name: build fanout startup config for Arista fanout leaf
+  template: src=arista_7260_deploy.j2
+            dest=/mnt/flash/startup-config
   when: device_info.HwSku == "Arista-7260QX-64" 
+  become: yes
 
+- name: build fanout startup config for 7060
+  template: src=arista_7060_deploy.j2
+            dest=/mnt/flash/startup-config
+  when: device_info.HwSku == "Arista-7060CX-32S"
+  become: yes
 
-- name: build fanout startup config
-  action: apswitch template=force10_s6100_deploy.j2
-  connection: switch
-  args:
-    login: "{{ switch_login['Force10'] }}"
-  when: device_info.HwSku == "Force10-S6100"
+- name: reboot
+  shell: sleep 2 && shutdown -r now "Reboot"
+  async: 1
+  poll: 0
+  ignore_errors: true
+  become: yes
 
 - block:
-  - name: build fanout startup config
-    template: src=arista_7060_deploy.j2
-              dest=/mnt/flash/startup-config
-    notify:
-       - Restart the box
-  when: device_info.HwSku == "Arista-7060CX-32S"
+  - set_fact:
+      leaf_name: "{{ inventory_hostname }}"
+      leaf: "{{ ansible_host }}"
 
+  - include: rootfanout_connect.yml
+      deploy_leaf=true
+  when: sw_type == 'FanoutLeaf'

ansible/roles/fanout/tasks/rootfanout_connect.yml

@@ -1,11 +1,17 @@
-# This playbook is trying to change root fanout switch one port to the DUT vlan range based on which server which port and DUT name
-# This playbook is called from fanout_connect.yml 
-# Gather graph facts
-- name: Gathering connection facts about the DUT device
+# This playbook is trying to change root fanout switch port vlans when deploy leaf fanout or connect server to SONiC DUT
+# This playbook is called from fanout_connect.yml or fanout.yml
+
+- set_fact: deploy_leaf=false
+  when: deploy_leaf is not defined
+
+- set_fact: dut="{{ leaf_name }}"
+  when: deploy_leaf
+
+- name: Gathering connection facts about the DUT or leaffanout device
   conn_graph_facts: host={{ dut }}
   connection: local
   tags: always
-  register: dutinfo
+  register: devinfo
 
 - name: Gathering connection facts about the lab 
   conn_graph_facts: 
@@ -14,7 +20,7 @@
   register: lab
 
 - set_fact:
-    dut_vlans: "{{ dutinfo.ansible_facts.device_vlan_range }}"
+    dev_vlans: "{{ devinfo.ansible_facts.device_vlan_range }}"
     lab_devices: "{{ lab.ansible_facts.device_info }}"
 
 - name: Find the root fanout switch
@@ -31,4 +37,4 @@
   action: apswitch template=roles/fanout/templates/arista_7260_connect.j2
   connection: switch
   args:
-      login: "{{ switch_login['Arista'] }}"
+    login: "{{ switch_login['Arista'] }}"

ansible/roles/fanout/templates/arista_7060_deploy.j2

@@ -29,7 +29,7 @@ vlan {{ device_vlan_range | list | join(',') }}
 vrf definition management
    rd 1:1
 !
-{% for i in range(1,32) %}
+{% for i in range(1,33) %}
 {% set intf =  'Ethernet' + i|string + '/1'  %}
 interface {{ intf }}
 {% if intf in device_port_vlans and device_port_vlans[intf]['mode'] != "Trunk" %}

ansible/roles/fanout/templates/arista_7260_connect.j2

@@ -5,18 +5,27 @@ config
 {% if intf in root_conn %}
 {% set peer_dev = root_conn[intf]['peerdevice'] %}
 {% set peer_port = root_conn[intf]['peerport'] %}
-{% if 'Fanout' not in lab_devices[peer_dev]['Type']  %}
- interface {{ intf }} 
+{% if 'Fanout' not in lab_devices[peer_dev]['Type'] and not deploy_leaf %}
+ interface {{ intf }}
+  switchport trunk allowed vlan remove {{ dev_vlans | list | join(',') }}
+{% if peer_dev == server and peer_port == server_port %}
   switchport mode trunk
-  switchport trunk allowed vlan remove {{ dut_vlans | list | join(',') }}
+  switchport trunk allowed vlan add {{ dev_vlans | list | join(',') }}
+  no shutdown
+{% endif %}
+{% endif %}
+{% if 'Fanout' in lab_devices[peer_dev]['Type']  and deploy_leaf %}
+ interface {{ intf }}
+  switchport trunk allowed vlan remove {{ dev_vlans | list | join(',') }}
+{% if peer_dev == leaf_name %}
+  description {{ peer_dev }}-{{ peer_port }}
+  switchport mode trunk
+  switchport trunk allowed vlan add {{ dev_vlans | list | join(',') }}
   no shutdown
-{% if peer_dev == server and peer_port == server_port %}
-  switchport trunk allowed vlan add {{ dut_vlans | list | join(',') }}
 {% endif %}
 {% endif %}
 {% endif %}
 {% endfor %}
 !
 copy running-config startup-config
 end
-

ansible/roles/fanout/templates/rc.eos.j2

@@ -1,5 +1,5 @@
 #!/bin/sh
-useradd -d /persist/local/{{ sonicadmin_user }} -G eosadmin {{ sonicadmin_user }}
-echo {{ sonicadmin_password }} | sudo passwd --stdin {{ sonicadmin_user }}
+useradd -d /persist/local/{{ fanout_admin_user }} -G eosadmin {{ fanout_admin_user }}
+echo {{ fanout_admin_password }} | sudo passwd --stdin {{ fanout_admin_user }}