[core] bring t0/1 with Accton-as7712-32x

ansible/fanout_connect.yml

@@ -12,7 +12,7 @@
             server: "{{ inventory_hostname|lower }}"
             server_port: "{{ external_port }}"
 
-        - set_fact: root_fanout_connect=true
+        - set_fact: root_fanout_connect=false
           when: root_fanout_connect is not defined
 
         - debug: msg="Connect {{ server }}:{{ server_port }} to {{ dut }}"

ansible/files/sonic_lab_devices.csv

@@ -1,8 +1,15 @@
 Hostname,ManagementIp,HwSku,Type,Protocol
-dev-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic,
-dev-7260-10,10.251.0.13/23,Arista-7260QX-64,FanoutLeaf,
-dev-7260-11,10.251.0.234/23,Arista-7260QX-64,FanoutRoot,
-dev-acs-serv-01,10.251.0.245/23,TestServ,Server,
-pdu-1,192.168.9.2,Apc,Pdu,snmp
-pdu-2,192.168.9.3,Sentry,Pdu,snmp
-console-1,192.168.10.1,Cisco,ConsoleServer,ssh
+str-acs-serv-01,10.250.0.1/16,TestServ,Server,
+# dev-sn2700,<ip / mask>,Mellanox-SN2700,FanoutRoot,
+dev-sn2700-01,192.168.88.246/24,Mellanox-SN2700,FanoutLeaf,
+dev-as7712-32x-01,192.168.88.105/24,Accton-AS7712-32X,DevSonic,
+
+
+# dev-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic,
+# dev-7260-10,10.251.0.13/23,Arista-7260QX-64,FanoutLeaf,
+# dev-7260-11,10.251.0.234/23,Arista-7260QX-64,FanoutRoot,
+# dev-acs-serv-01,10.251.0.245/23,TestServ,Server,
+# pdu-1,192.168.9.2,Apc,Pdu,snmp
+# pdu-2,192.168.9.3,Sentry,Pdu,snmp
+# console-1,192.168.10.1,Cisco,ConsoleServer,ssh
+# portname="Eth1/

ansible/files/sonic_lab_links.csv

@@ -1,35 +1,34 @@
 StartDevice,StartPort,EndDevice,EndPort,BandWidth,VlanID,VlanMode
-dev-msn2700-01,Ethernet0,dev-7260-10,Ethernet1,40000,1681,Access
-dev-msn2700-01,Ethernet4,dev-7260-10,Ethernet2,40000,1682,Access
-dev-msn2700-01,Ethernet8,dev-7260-10,Ethernet3,40000,1683,Access
-dev-msn2700-01,Ethernet12,dev-7260-10,Ethernet4,40000,1684,Access
-dev-msn2700-01,Ethernet16,dev-7260-10,Ethernet5,40000,1685,Access
-dev-msn2700-01,Ethernet20,dev-7260-10,Ethernet6,40000,1686,Access
-dev-msn2700-01,Ethernet24,dev-7260-10,Ethernet7,40000,1687,Access
-dev-msn2700-01,Ethernet28,dev-7260-10,Ethernet8,40000,1688,Access
-dev-msn2700-01,Ethernet32,dev-7260-10,Ethernet9,40000,1689,Access
-dev-msn2700-01,Ethernet36,dev-7260-10,Ethernet10,40000,1690,Access
-dev-msn2700-01,Ethernet40,dev-7260-10,Ethernet11,40000,1691,Access
-dev-msn2700-01,Ethernet44,dev-7260-10,Ethernet12,40000,1692,Access
-dev-msn2700-01,Ethernet48,dev-7260-10,Ethernet13,40000,1693,Access
-dev-msn2700-01,Ethernet52,dev-7260-10,Ethernet14,40000,1694,Access
-dev-msn2700-01,Ethernet56,dev-7260-10,Ethernet15,40000,1695,Access
-dev-msn2700-01,Ethernet60,dev-7260-10,Ethernet16,40000,1696,Access
-dev-msn2700-01,Ethernet64,dev-7260-10,Ethernet17,40000,1697,Access
-dev-msn2700-01,Ethernet68,dev-7260-10,Ethernet18,40000,1698,Access
-dev-msn2700-01,Ethernet72,dev-7260-10,Ethernet19,40000,1699,Access
-dev-msn2700-01,Ethernet76,dev-7260-10,Ethernet20,40000,1700,Access
-dev-msn2700-01,Ethernet80,dev-7260-10,Ethernet21,40000,1701,Access
-dev-msn2700-01,Ethernet84,dev-7260-10,Ethernet22,40000,1702,Access
-dev-msn2700-01,Ethernet88,dev-7260-10,Ethernet23,40000,1703,Access
-dev-msn2700-01,Ethernet92,dev-7260-10,Ethernet24,40000,1704,Access
-dev-msn2700-01,Ethernet96,dev-7260-10,Ethernet25,40000,1705,Access
-dev-msn2700-01,Ethernet100,dev-7260-10,Ethernet26,40000,1706,Access
-dev-msn2700-01,Ethernet104,dev-7260-10,Ethernet27,40000,1707,Access
-dev-msn2700-01,Ethernet108,dev-7260-10,Ethernet28,40000,1708,Access
-dev-msn2700-01,Ethernet112,dev-7260-10,Ethernet29,40000,1709,Access
-dev-msn2700-01,Ethernet116,dev-7260-10,Ethernet30,40000,1710,Access
-dev-msn2700-01,Ethernet120,dev-7260-10,Ethernet31,40000,1711,Access
-dev-msn2700-01,Ethernet124,dev-7260-10,Ethernet32,40000,1712,Access
-dev-7260-11,Ethernet19,dev-acs-serv-01,p4p1,40000,,Trunk
-dev-7260-11,Ethernet30,dev-7260-10,Ethernet64,40000,1681-1712,Trunk
+dev-as7712-32x-01,Ethernet0,dev-sn2700-01,Eth1/1,100000,1681,Access
+dev-as7712-32x-01,Ethernet4,dev-sn2700-01,Eth1/2,100000,1682,Access
+dev-as7712-32x-01,Ethernet8,dev-sn2700-01,Eth1/3,100000,1683,Access
+dev-as7712-32x-01,Ethernet12,dev-sn2700-01,Eth1/4,100000,1684,Access
+dev-as7712-32x-01,Ethernet16,dev-sn2700-01,Eth1/5,100000,1685,Access
+dev-as7712-32x-01,Ethernet20,dev-sn2700-01,Eth1/6,100000,1686,Access
+dev-as7712-32x-01,Ethernet24,dev-sn2700-01,Eth1/7,100000,1687,Access
+dev-as7712-32x-01,Ethernet28,dev-sn2700-01,Eth1/8,100000,1688,Access
+dev-as7712-32x-01,Ethernet32,dev-sn2700-01,Eth1/9,100000,1689,Access
+dev-as7712-32x-01,Ethernet36,dev-sn2700-01,Eth1/10,100000,1690,Access
+dev-as7712-32x-01,Ethernet40,dev-sn2700-01,Eth1/11,100000,1691,Access
+dev-as7712-32x-01,Ethernet44,dev-sn2700-01,Eth1/12,100000,1692,Access
+dev-as7712-32x-01,Ethernet48,dev-sn2700-01,Eth1/13,100000,1693,Access
+dev-as7712-32x-01,Ethernet52,dev-sn2700-01,Eth1/14,100000,1694,Access
+dev-as7712-32x-01,Ethernet56,dev-sn2700-01,Eth1/15,100000,1695,Access
+dev-as7712-32x-01,Ethernet60,dev-sn2700-01,Eth1/16,100000,1696,Access
+dev-as7712-32x-01,Ethernet64,dev-sn2700-01,Eth1/17,100000,1697,Access
+dev-as7712-32x-01,Ethernet68,dev-sn2700-01,Eth1/18,100000,1698,Access
+dev-as7712-32x-01,Ethernet72,dev-sn2700-01,Eth1/19,100000,1699,Access
+dev-as7712-32x-01,Ethernet76,dev-sn2700-01,Eth1/20,100000,1700,Access
+dev-as7712-32x-01,Ethernet80,dev-sn2700-01,Eth1/21,100000,1701,Access
+dev-as7712-32x-01,Ethernet84,dev-sn2700-01,Eth1/22,100000,1702,Access
+dev-as7712-32x-01,Ethernet88,dev-sn2700-01,Eth1/23,100000,1703,Access
+dev-as7712-32x-01,Ethernet92,dev-sn2700-01,Eth1/24,100000,1704,Access
+dev-as7712-32x-01,Ethernet96,dev-sn2700-01,Eth1/25,100000,1705,Access
+dev-as7712-32x-01,Ethernet100,dev-sn2700-01,Eth1/26,100000,1706,Access
+dev-as7712-32x-01,Ethernet104,dev-sn2700-01,Eth1/27,100000,1707,Access
+dev-as7712-32x-01,Ethernet108,dev-sn2700-01,Eth1/28,100000,1708,Access
+dev-as7712-32x-01,Ethernet112,dev-sn2700-01,Eth1/29,100000,1709,Access
+dev-as7712-32x-01,Ethernet116,dev-sn2700-01,Eth1/30,100000,1710,Access
+dev-as7712-32x-01,Ethernet120,dev-sn2700-01,Eth1/31,100000,1711,Access
+dev-as7712-32x-01,Ethernet124,dev-sn2700-01,Eth1/32/2,100000,1712,Access
+dev-sn2700-01,Eth1/32/1,str-acs-serv-01,ens3f1,25000,1681-1712,Trunk

ansible/group_vars/eos/creds.yml

@@ -0,0 +1,4 @@
+---
+ansible_password: 123456
+ansible_user: root
+

ansible/group_vars/fanout/secrets.yml

@@ -1,5 +1,9 @@
 # Please update the actual username and password according to your lab configuration
 
+# do not need to set creds, se use static fanout config for sn2700.
+# if we want to use dynamic, then update ansible/roles/fanout/tasks/fanout_eos.yml,
+# and update corresponding fanout template
+# and update creds in ansible/testbed-new.yaml
 ansible_ssh_user: user
 ansible_ssh_pass: password
 fanout_mlnx_user: admin

ansible/group_vars/lab/lab.yml

@@ -42,7 +42,7 @@ snmp_rocommunity: public
 snmp_location: testlab
 
 # bgp slb passive range
-bgp_slb_passive_range: 10.255.0.0/25
+bgp_slb_passive_range: 10.250.0.0/25
 
 #For Arista fanout switch deployment only
 fanout_admin_user: "fanoutadminuser"

ansible/group_vars/lab/secrets.yml

@@ -1,8 +1,8 @@
-ansible_ssh_pass: password
-ansible_become_pass: password
+ansible_ssh_pass: YourPaSsWoRd
+ansible_become_pass: YourPaSsWoRd
 sonicadmin_user: admin
-sonicadmin_password: password
-sonicadmin_initial_password: password
+sonicadmin_password: YourPaSsWoRd
+sonicadmin_initial_password: YourPaSsWoRd
 
 console_login:
   console_telnet: 

ansible/group_vars/vm_host/creds.yml

@@ -1,10 +1,10 @@
 ---
-ansible_user: use_own_value
-ansible_password: use_own_value
-ansible_become_password: use_own_value
+ansible_user: hhtestbed
+ansible_password: HH.Labs
+ansible_become_password: HH.Labs
 
 # Use the following username/password variables to login to vm hosts
 # instead of the default variables (defined above).
-vm_host_user: hedgehog
-vm_host_password: githedgehog
-vm_host_become_password: githedgehog
+vm_host_user: hhtestbed
+vm_host_password: HH.Labs
+vm_host_become_password: HH.Labs

ansible/host_vars/STR-ACS-SERV-01.yml

@@ -1,7 +1,6 @@
 mgmt_bridge: br1
-mgmt_prefixlen: 23
-mgmt_gw: 10.255.0.1
+mgmt_prefixlen: 16
+mgmt_gw: 10.250.0.1
 mgmt_gw_v6: fec0::1
-vm_mgmt_gw: 10.254.0.1
-external_port: p4p1
-
+#vm_mgmt_gw: 10.254.0.1
+external_port: ens3f1

ansible/lab

@@ -6,193 +6,40 @@ all:
       children:
         sonic:
           children:
-            sonic_sn2700_40:
-            sonic_s6000:
-            sonic_s6100:
-            sonic_a7260:
-            sonic_multi_asic:
-            sonic_multi_asic_2:
-            sonic_msft_sup:
-            sonic_msft_lc_100G:
+            sonic_as7712:
         fanout:
           hosts:
-            str-7260-10:
-              ansible_host: 10.251.0.13
-            str-7260-11:
-              ansible_host: 10.251.0.234
-            str-msn2700-02:
-              ansible_host: 10.251.0.235
-              os: sonic
+            dev-sn2700-01:
+              ansible_host: 192.168.88.246
     ptf:
       hosts:
-        ptf_ptf1:
-          ansible_host: 10.255.0.188
-          ansible_ssh_user: root
-          ansible_ssh_pass: root
         ptf_vms1-1:
-          ansible_host: 10.255.0.178
-          ansible_ssh_user: root
-          ansible_ssh_pass: root
-        ptf_vms6-1:
-          ansible_host: 10.250.0.100
+          ansible_host: 10.250.128.196
           ansible_ssh_user: root
           ansible_ssh_pass: root
 
-sonic_sn2700_40:
-  vars:
-    hwsku: ACS-MSN2700
-    iface_speed: 40000
-  hosts:
-    str-msn2700-01:
-      ansible_host: 10.251.0.188
-      model: MSN2700-CS2FO
-      serial: MT1234X56789
-      base_mac: 24:8a:07:12:34:56
-      syseeprom_info:
-        "0x21": "MSN2700"
-        "0x22": "MSN2700-CS2FO"
-        "0x23": "MT1234X56789"
-        "0x24": "24:8a:07:12:34:56"
-        "0x25": "12/07/2016"
-        "0x26": "0"
-        "0x28": "x86_64-mlnx_x86-r0"
-        "0x29": "2016.11-5.1.0008-9600"
-        "0x2A": "128"
-        "0x2B": "Mellanox"
-        "0xFE": "0xFBA1E964"
-
-sonic_s6000:
-  vars:
-    hwsku: Force10-S6000
-    iface_speed: 40000
-  hosts:
-    lab-s6000-01:
-      ansible_host: 10.251.0.189
-      ansible_hostv6: fec0::ffff:afa:9
-    vlab-01:
-      ansible_host: 10.250.0.101
-      ansible_hostv6: fec0::ffff:afa:1
-    vlab-03:
-      ansible_host: 10.250.0.105
-      ansible_hostv6: fec0::ffff:afa:5
-    vlab-04:
-      ansible_host: 10.250.0.107
-      ansible_hostv6: fec0::ffff:afa:7
-    vlab-05:
-      ansible_host: 10.250.0.110
-      ansible_hostv6: fec0::ffff:afa:a
-    vlab-06:
-      ansible_host: 10.250.0.111
-      ansible_hostv6: fec0::ffff:afa:b
-    vlab-09:
-      ansible_host: 10.250.0.115
-      ansible_hostv6: fec0::ffff:afb:1
-    vlab-10:
-      ansible_host: 10.250.0.117
-      ansible_hostv6: fec0::ffff:afb:3
-    vlab-t2-01:
-      ansible_host: 10.250.0.120
-      ansible_hostv6: fec0::ffff:afa:10
-    vlab-t2-02:
-      ansible_host: 10.250.0.121
-      ansible_hostv6: fec0::ffff:afa:11
-    vlab-t2-sup:
-      ansible_host: 10.250.0.122
-      ansible_hostv6: fec0::ffff:afa:12
-      card_type: supervisor
-
-sonic_s6100:
+sonic_as7712:
   vars:
-    hwsku: Force10-S6100
+    hwsku: Accton-AS7712-32X
     iface_speed: 40000
-  hosts:
-    lab-s6100-01:
-      ansible_host: 10.251.0.190
-    vlab-02:
-      ansible_host: 10.250.0.114
-
-sonic_a7260:
-  vars:
-    hwsku: Arista-7260CX3-C64
     iface_speed: 100000
-  hosts:
-    lab-a7260-01:
-      ansible_host: 10.251.0.191
-      model: DCS-7260CX3-64
-      serial: SSJ12345678
-      base_mac: 76:34:ab:08:cd:a0
+    ansible_user: admin
+    ansible_password: YourPaSsWoRd
+  hosts:
+    dev-as7712-32x-01:
+      ansible_host: 192.168.88.105
+      model: AS7712-32X
+      serial: 771232X2226050
+      base_mac: E0:01:A6:07:1A:E9
       syseeprom_info:
-        "0x21": "DCS-7260CX3-64"
-        "0x22": "ASY0250504B0"
-        "0x23": "SSJ12345678"
-        "0x24": "7634ab08cda0"
-        "0x25": "2017/06/07 12:36:05"
-        "0x26": "01"
-        "0x27": "03.00"
-        "0x28": "x86_64-arista_7260cx3_64"
-        "0x2d": "Arista Networks"
-        "0x2e": "Aboot-norcal7-7.2.3-pcie2x4-12345678"
-
-sonic_multi_asic:
-  vars:
-    hwsku: msft_multi_asic_vs
-    iface_speed: 40000
-    num_asics: 6
-    start_topo_service: True
-    frontend_asics: [0,1,2,3]
-    loopback4096_ip: [8.0.0.0/32, 8.0.0.1/32, 8.0.0.2/32, 8.0.0.3/32, 8.0.0.4/32, 8.0.0.5/32]
-    loopback4096_ipv6: [2603:10e2:400::/128, 2603:10e2:400::1/128, 2603:10e2:400::2/128, 2603:10e2:400::3/128, 2603:10e2:400::4/128, 2603:10e2:400::5/128]
-  hosts:
-    vlab-07:
-      ansible_host: 10.250.0.109
-      ansible_hostv6: fec0::ffff:afa:9
-
-sonic_multi_asic_2:
-  vars:
-    hwsku: msft_four_asic_vs
-    iface_speed: 40000
-    num_asics: 4
-    start_topo_service: True
-    frontend_asics: [0,1]
-    loopback4096_ip: [8.0.0.0/32, 8.0.0.1/32, 8.0.0.2/32, 8.0.0.3/32]
-    loopback4096_ipv6: [2603:10e2:400::/128, 2603:10e2:400::1/128, 2603:10e2:400::2/128, 2603:10e2:400::3/128]
-  hosts:
-    vlab-08:
-      ansible_host: 10.250.0.112
-      ansible_hostv6: fec0::ffff:afa:c
-
-sonic_msft_sup:
-  vars:
-    HwSku:  msft-RP-O
-    slot_num: slot0
-    card_type: supervisor
-  hosts:
-    lab-msft-sup-1:
-      ansible_host: 2.2.2.2
-      hwsku: msft-RP-O
-      num_asics: 2
-
-sonic_msft_lc_100G:
-  vars:
-    switch_type: chassis-packet
-    num_asics: 2
-    frontend_asics: [0,1]
-  hosts:
-    lab-msft-lc0-1:
-      hwsku: msft-LC-48H-O
-      slot_num: slot1
-      loopback4096_ip: [3.3.3.3/32,3.3.3.4/32]
-      loopback4096_ipv6: [2603:10e2:400::3/128,2603:10e2:400::4/128]
-      ansible_host: 2.2.2.3
-    lab-msft-lc1-1:
-      hwsku: msft-LC-48H-O
-      slot_num: slot2
-      loopback4096_ip: [3.3.3.5/32,3.3.3.6/32]
-      loopback4096_ipv6: [2603:10e2:400::5/128,2603:10e2:400::6/128]
-      ansible_host: 2.2.2.4
-    lab-msft-lc2-1:
-      hwsku: msft-LC-48H-O
-      slot_num: slot3
-      loopback4096_ip: [3.3.3.7/32,3.3.3.8/32]
-      loopback4096_ipv6: [2603:10e2:400::7/128,2603:10e2:400::8/128]
-      ansible_host: 2.2.2.5
+        "0x21": "7712-32X-O-AC-F"
+        "0x22": "FP3ZZ7632014A"
+        "0x23": "771232X2226050"
+        "0x24": "E0:01:A6:07:1A:E9"
+        "0x25": "06/25/2022 14:22:59"
+        "0x26": ""
+        "0x28": "x86_64-accton_as7712_32x-r0"
+        "0x29": "2020.08.00.02"
+        "0x2A": "256"
+        "0x2B": "Accton"
+        "0xFE": "0xE0EA6BA7"

ansible/roles/vm_set/tasks/main.yml

@@ -116,8 +116,8 @@
   environment: "{{ proxy_env | default({}) }}"
   ignore_errors: yes
 
-- include_tasks: docker.yml
-  when: package_installation|bool
+# - include_tasks: docker.yml
+#   when: package_installation|bool
 
 - name: Ensure {{ ansible_user }} in docker,sudo group
   user: