Merge pull request #2 from Azure/master

Get latest changes

Author: selldinesh

.azure-pipelines/run-test-template.yml

@@ -23,7 +23,7 @@ steps:
     source: specific
     project: build
     pipeline: 1
-    artifact: sonic-buildimage.kvm
+    artifact: sonic-buildimage.vs
     runVersion: 'latestFromBranch'
     runBranch: 'refs/heads/master'
   displayName: "Download sonic kvm image"

ansible/config_sonic_basedon_testbed.yml

@@ -48,6 +48,11 @@
     - fail: msg="The DUT you are trying to run test does not belongs to this testbed"
       when: inventory_hostname not in testbed_facts['duts']
 
+    - name: Set default num_asic
+      set_fact:
+        num_asics: 1
+      when: num_asics is not defined
+
     - name: Set default dut index
       set_fact:
         dut_index: "{{ testbed_facts['duts_map'][inventory_hostname]|int }}"
@@ -62,15 +67,15 @@
       when: "testbed_facts['vm_base'] != ''"
     when: testbed_name is defined
 
-  - topo_facts: topo={{ topo }}
+  - topo_facts: topo={{ topo }} hwsku={{ hwsku }}
     delegate_to: localhost
 
   - name: find interface name mapping and individual interface speed if defined from dut
-    port_alias: hwsku="{{ hwsku }}"
+    port_alias: hwsku="{{ hwsku }}" num_asic="{{ num_asics }}"
     when: deploy is defined and deploy|bool == true
 
   - name: find interface name mapping and individual interface speed if defined with local data
-    port_alias: hwsku="{{ hwsku }}"
+    port_alias: hwsku="{{ hwsku }}" num_asic="{{ num_asics }}"
     delegate_to: localhost
     when: deploy is not defined or deploy|bool == false
 
@@ -100,10 +105,6 @@
     delegate_to: localhost
     when: "'dualtor' in topo"
 
-  - name: generate y_cable simulator driver
-    include_tasks: dualtor/config_y_cable_simulator.yml
-    when: "'dualtor' in topo"
-
   - name: set default vm file path
     set_fact:
       vm_file: veos
@@ -126,6 +127,12 @@
     delegate_to: localhost
     when: "('host_interfaces_by_dut' in vm_topo_config) and ('tor' in vm_topo_config['dut_type'] | lower)"
 
+  - name: find downlink portchannel configuration for T0 topology
+    set_fact:
+      portchannel_config: "{{ vm_topo_config['DUT']['portchannel_config'] | default({})}}"
+    delegate_to: localhost
+    when: "('host_interfaces_by_dut' in vm_topo_config) and ('tor' in vm_topo_config['dut_type'] | lower)"
+
   - name: find any tunnel configurations
     tunnel_config:
       vm_topo_config: "{{ vm_topo_config }}"
@@ -149,6 +156,15 @@
       - "{{ interface_to_vms }}"
       - "ports"
 
+  # create map of VM to asic interface names
+  - name: find all interface asic names
+    set_fact:
+      vm_asic_ifnames: "{{ vm_asic_ifnames | default({}) | combine({item.0.name: vm_asic_ifnames[item.0.name]|default([]) + [ front_panel_asic_ifnames[item.1]] }) }}"
+    with_subelements:
+      - "{{ interface_to_vms }}"
+      - "ports"
+    when: front_panel_asic_ifnames != [] 
+
   - name: create minigraph file in ansible minigraph folder
     template: src=templates/minigraph_template.j2
               dest=minigraph/{{ inventory_hostname}}.{{ topo }}.xml
@@ -352,6 +368,11 @@
 
       - debug: msg={{ docker_status.stdout_lines }}
 
+      - name: start topology service for multi-asic platform
+        become: true
+        shell: systemctl start topology.service
+        when: start_topo_service is defined and start_topo_service|bool == true
+
       - name: execute cli "config load_minigraph -y" to apply new minigraph
         become: true
         shell: config load_minigraph -y

ansible/devutil/conn_graph_helper.py

@@ -0,0 +1,28 @@
+import os
+import inspect
+import sys
+import imp
+
+CONN_GRAPH_LOG = "/tmp/conn_graph_debug.txt"
+
+def get_conn_graph_facts(hostnames):
+    """
+    @summary: Load conn_graph_facts from conn_graph_facts.xml
+    @param hostnames: A list of hostname
+    @return: A dict, conn_graph_facts
+    """
+    filename = inspect.getframeinfo(inspect.currentframe()).filename
+    ansible_path = os.path.join(os.path.dirname(os.path.abspath(filename)), '../')
+    if ansible_path not in sys.path:
+        sys.path.append(ansible_path)
+
+    utils = imp.load_source('conn_graph_utils', os.path.join(ansible_path, 'library/conn_graph_facts.py'))
+    utils.LAB_GRAPHFILE_PATH = os.path.join(ansible_path, utils.LAB_GRAPHFILE_PATH)
+    utils.debug_fname = CONN_GRAPH_LOG
+
+    lab_graph = utils.find_graph(hostnames=hostnames, part=True)
+    succeed, results = utils.build_results(lab_graph=lab_graph, hostnames=hostnames, ignore_error=True)
+    if not succeed:
+        print("Parse conn graph failes msg = {}".format(results))
+        return {'device_pdu_info': {}, 'device_pdu_links': {}}
+    return results