init commit, bring up t0

githedgehog · Feb 24, 2023 · 187076d · 187076d
1 parent c3b74ae
commit 187076d
Show file tree

Hide file tree

Showing 14 changed files with 428 additions and 323 deletions.
diff --git a/ansible/TestbedProcessing.py b/ansible/TestbedProcessing.py
@@ -137,6 +137,7 @@ def makeMain(data, outfile):
         toWrite.write( "supported_vm_types: [ 'veos', 'ceos', 'vsonic' ]\n" ),
         yaml.dump(dictData, stream=toWrite, default_flow_style=False)
         toWrite.write("# proxy\n")
+        # todo(adovhan) potential code for removing, we don't use proxy
         yaml.dump(proxy, stream=toWrite, default_flow_style=False)
 
 

diff --git a/ansible/fanout_connect.yml b/ansible/fanout_connect.yml
@@ -27,7 +27,7 @@
         - set_fact: userid={{ calling_username.stdout }}
 
         - set_fact: connect_leaf=false
-
+#        todo(adovhan) potential code to remove, use static config for fanout
         - include_tasks: roles/fanout/tasks/rootfanout_connect.yml
           when: root_fanout_connect|bool == true
 

diff --git a/ansible/files/lab_connection_graph.xml b/ansible/files/lab_connection_graph.xml
diff --git a/ansible/files/sonic_lab_devices.csv b/ansible/files/sonic_lab_devices.csv
@@ -1,8 +1,17 @@
 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
+dut_cls_dx010-01,10.10.1.65/22,Seastone-DX010,DevSonic,
+fnt_csc_c3132q-01,10.10.0.21/22,cisco-Nexus3000-C3132Q,FanoutLeaf,
+str-acs-serv-01,10.10.1.??/22,TestServ,Server,
+# todo(adovhan) set correct ip for server
+# 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
+
+# todo(adovhan) remove
+# hostname_dut -> dut_cls_dx010-01
+# C3132Q-1 -> fnt_csc_c3132q-01
+# hostname_testbed -> srv-dll-<model>-01 -> str-acs-serv-01
diff --git a/ansible/files/sonic_lab_links.csv b/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
+dut_cls_dx010-01,Ethernet0,fnt_csc_c3132q-01,Ethernet1/2/1,10000,1681,Access
+dut_cls_dx010-01,Ethernet4,fnt_csc_c3132q-01,Ethernet1/2/2,10000,1682,Access
+dut_cls_dx010-01,Ethernet8,fnt_csc_c3132q-01,Ethernet1/2/3,10000,1683,Access
+dut_cls_dx010-01,Ethernet12,fnt_csc_c3132q-01,Ethernet1/2/4,10000,1684,Access
+dut_cls_dx010-01,Ethernet16,fnt_csc_c3132q-01,Ethernet1/3/1,10000,1685,Access
+dut_cls_dx010-01,Ethernet20,fnt_csc_c3132q-01,Ethernet1/3/2,10000,1686,Access
+dut_cls_dx010-01,Ethernet24,fnt_csc_c3132q-01,Ethernet1/3/3,10000,1687,Access
+dut_cls_dx010-01,Ethernet28,fnt_csc_c3132q-01,Ethernet1/3/4,10000,1688,Access
+dut_cls_dx010-01,Ethernet32,fnt_csc_c3132q-01,Ethernet1/4/1,10000,1689,Access
+dut_cls_dx010-01,Ethernet36,fnt_csc_c3132q-01,Ethernet1/4/2,10000,1690,Access
+dut_cls_dx010-01,Ethernet40,fnt_csc_c3132q-01,Ethernet1/4/3,10000,1691,Access
+dut_cls_dx010-01,Ethernet44,fnt_csc_c3132q-01,Ethernet1/4/4,10000,1692,Access
+dut_cls_dx010-01,Ethernet48,fnt_csc_c3132q-01,Ethernet1/5,40000,1693,Access
+dut_cls_dx010-01,Ethernet52,fnt_csc_c3132q-01,Ethernet1/6,40000,1694,Access
+dut_cls_dx010-01,Ethernet56,fnt_csc_c3132q-01,Ethernet1/7,40000,1695,Access
+dut_cls_dx010-01,Ethernet60,fnt_csc_c3132q-01,Ethernet1/8,40000,1696,Access
+dut_cls_dx010-01,Ethernet64,fnt_csc_c3132q-01,Ethernet1/9,40000,1697,Access
+dut_cls_dx010-01,Ethernet68,fnt_csc_c3132q-01,Ethernet1/10,40000,1698,Access
+dut_cls_dx010-01,Ethernet72,fnt_csc_c3132q-01,Ethernet1/11,40000,1699,Access
+dut_cls_dx010-01,Ethernet76,fnt_csc_c3132q-01,Ethernet1/12,40000,1700,Access
+dut_cls_dx010-01,Ethernet80,fnt_csc_c3132q-01,Ethernet1/13,40000,1701,Access
+dut_cls_dx010-01,Ethernet84,fnt_csc_c3132q-01,Ethernet1/14,40000,1702,Access
+dut_cls_dx010-01,Ethernet88,fnt_csc_c3132q-01,Ethernet1/15,40000,1703,Access
+dut_cls_dx010-01,Ethernet92,fnt_csc_c3132q-01,Ethernet1/16,40000,1704,Access
+dut_cls_dx010-01,Ethernet96,fnt_csc_c3132q-01,Ethernet1/17,40000,1705,Access
+dut_cls_dx010-01,Ethernet100,fnt_csc_c3132q-01,Ethernet1/18,40000,1706,Access
+dut_cls_dx010-01,Ethernet104,fnt_csc_c3132q-01,Ethernet1/19,40000,1707,Access
+dut_cls_dx010-01,Ethernet108,fnt_csc_c3132q-01,Ethernet1/20,40000,1708,Access
+dut_cls_dx010-01,Ethernet112,fnt_csc_c3132q-01,Ethernet1/21,40000,1709,Access
+dut_cls_dx010-01,Ethernet116,fnt_csc_c3132q-01,Ethernet1/22,40000,1710,Access
+dut_cls_dx010-01,Ethernet120,fnt_csc_c3132q-01,Ethernet1/23,40000,1711,Access
+dut_cls_dx010-01,Ethernet124,fnt_csc_c3132q-01,Ethernet1/24,40000,1712,Access
+fnt_csc_c3132q-01,Ethernet1/1,str-acs-serv-01,esnp???,40000,1681-1712,Trunk    # Ethernet1/1?
diff --git a/ansible/group_vars/all/creds.yml b/ansible/group_vars/all/creds.yml
@@ -17,6 +17,7 @@ cisco_password: ""
 
 
 sonic_login: "admin"
+# todo(adovhan) update creds sonic default
 sonic_default_passwords:
  - "YourPaSsWoRd"
  - "password"

diff --git a/ansible/group_vars/fanout/secrets.yml b/ansible/group_vars/fanout/secrets.yml
@@ -1,5 +1,5 @@
 # Please update the actual username and password according to your lab configuration
-
+# todo(adovhan) update creds fanout
 ansible_ssh_user: user
 ansible_ssh_pass: password
 fanout_mlnx_user: admin

diff --git a/ansible/group_vars/lab/secrets.yml b/ansible/group_vars/lab/secrets.yml
@@ -1,5 +1,6 @@
 ansible_ssh_pass: password
 ansible_become_pass: password
+# todo(adovhan) update creds sonic user
 sonicadmin_user: admin
 sonicadmin_password: password
 sonicadmin_initial_password: password

diff --git a/ansible/group_vars/vm_host/creds.yml b/ansible/group_vars/vm_host/creds.yml
@@ -5,6 +5,7 @@ ansible_become_password: use_own_value
 
 # Use the following username/password variables to login to vm hosts
 # instead of the default variables (defined above).
+# todo(adovhan) check this password to VMs
 vm_host_user: hedgehog
 vm_host_password: githedgehog
 vm_host_become_password: githedgehog
diff --git a/ansible/host_vars/HOSTAME_SERV-01.yml b/ansible/host_vars/HOSTAME_SERV-01.yml
@@ -0,0 +1,9 @@
+# todo(adovhan) rename once hostame is set on  testbed
+#probably it should be str-acs-serv-01
+mgmt_bridge: br1
+mgmt_prefixlen: 23
+mgmt_gw: 10.255.0.1
+mgmt_gw_v6: fec0::1
+vm_mgmt_gw: 10.254.0.1
+external_port: p4p1
+
diff --git a/ansible/lab b/ansible/lab
@@ -7,192 +7,44 @@ all:
         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_dx010:
         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
+            fnt_csc_c3132q-01:
+              ansible_host: 10.10.0.21/22
+
     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.255.0.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
+sonic_dx010:
+  vars:
+    hwsku: Seastone-DX010
+    iface_speed: 10000
+    iface_speed2: 100000
+    ansible_password: YourPaSsWoRd
+    ansible_user: admin
+hosts:
+    dut_cls_dx010-01:
+      ansible_host: 10.10.1.65
+      ansible_ssh_user: admin
+      ansible_ssh_pass: YourPaSsWoRd
+      ptf_host: ptf_vms1-1
+      model: DX010
+      serial: DX010B2F108423LK100020
+      base_mac: 00:E0:EC:8A:0D:F0
       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:
-  vars:
-    hwsku: Force10-S6100
-    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
-      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": "DX010"
+        "0x22": "R0872-F0010-01"
+        "0x23": "DX010B2F108423LK100020"
+        "0x24": "00:E0:EC:8A:0D:F0"
+        "0x25": "05/03/2018 14:37:08"
+        "0x26": "10"
+        "0x28": "RANGELEY"
+        "0x29": "2014.08"
+        "0x2A": "131"
+        "0x2B": "CELESTICA"
+        "0xFE": "0xEE0BE68D"