Sync with current private repo (c7c414a)

ansible/group_vars/sonic/vars

@@ -50,4 +50,3 @@ dns_servers: ['10.0.0.5', '10.0.0.6']
 # snmp variables
 snmp_rocommunity: public
 snmp_location: testlab
-

ansible/group_vars/sonic_latest/package_versions.yml

@@ -1,7 +1,6 @@
-linux_image: { name: linux-image-3.16.0-4-amd64 , version: 3.16.7-ckt11-2+acs8u2 }
 platform_modules_s6000: { name: platform-modules-s6000 , version: "*" }
 opennsl: { name: opennsl-modules-3.16.0-4-amd64 , version: "6.4.5.B*" }
-opennslv2: { name: opennsl-modules-3.16.0-4-amd64 , version: "6.4.10*" }
+opennslv2: { name: opennsl-modules-3.16.0-4-amd64 , version: "6.5.5*" }
 version_sx_kernel: "*"
 version_mlnxsdk: "*"
 version_iproute2_mlnx: "1.mlnx*"
@@ -10,7 +9,7 @@ version_sonic_cli: "*"
 
 image_id_database: docker-database:latest
 image_id_snmp: docker-snmp:latest
-image_id_lldp: docker-lldp-sv2:latest
+image_id_lldp: docker-lldp:latest
 image_id_platform_monitor: docker-platform-monitor:latest
 
 image_id_syncd: docker-syncd:latest
@@ -21,3 +20,5 @@ image_id_orchagent: docker-orchagent:latest
 image_id_orchagent_mlnx: docker-orchagent-mlnx:latest
 image_id_orchagent_cavm: docker-orchagent-cavm:latest
 image_id_fpm: docker-fpm:latest
+image_id_snmp_sv2: docker-snmp-sv2:latest
+image_id_lldp_sv2: docker-lldp-sv2:latest

ansible/roles/sonic-common/tasks/lldp.yml

@@ -1,3 +1,16 @@
+- name: Clean up old container
+  include: sonicdocker.yml
+  vars:
+    docker_container: docker-lldp
+    docker_image: "{{ image_id_lldp }}"
+    docker_privileged: yes
+    docker_state: absent
+
+- name: switch LLDP image based on SONiC version
+  set_fact:
+    image_id_lldp: "{{ image_id_lldp_sv2 }}"
+  when: sonic_version == "v2"
+
 - name: Ensure LLDP container started
   include: sonicdocker.yml
   vars:
@@ -13,6 +26,20 @@
               dest=/etc/default/lldpd
     notify:
       - Restart LLDP Daemon
+      - Restart SNMP Daemon
+
+  - name: Setup LLDPD Daemon Config File
+    become: true
+    copy: src="ssw/{{sonic_hwsku}}/etc/lldpd.conf"
+          dest=/etc/lldpd.conf
+    notify:
+      - Restart LLDP Daemon
+      - Restart SNMP Daemon
+    # for production hwsku, we need to add lldpd.conf to generate ngs 
+    # interface name in the lldp message we sent
+    when: sonic_hwsku != 'ACS-S6000' and sonic_hwsku != 'ACS-MSN2700'
+  # Force handler flush to trigger daemon restarts
+  - meta: flush_handlers
 
   vars:
     ansible_shell_type: docker

ansible/roles/sonic-common/tasks/sonicdocker.yml

@@ -12,8 +12,9 @@
 ## | present     |      |              | present  |                     | y              |             |
 ## | started     |      |              | present  | started             | y              |             |
 ## | reloaded    | y    | pulled?      | reloaded | restarted if pulled | y              | if pulled   |
+## |             |      |              |          | started if not      |                |             |
 ## | restarted   |      |              | present  | restarted           | y              |             |
-## | stopped     |      | y            | stopped  |                     | n              |             |
+## | stopped     |      | y            | stopped  | stopped             | n              |             |
 ## | killed      |      | y            | killed   |                     | n              |             |
 ## | absent      |      | y            | absent   |                     | n              | y           |
 ## +-------------+------+--------------+----------+---------------------+----------------+-------------+
@@ -149,17 +150,26 @@
     log_opt: "{{docker_log_opt}}"
 
 ## Container service operation
-- name: "{{docker_container}} - Post docker - start container service"
-  become: true
-  service: name="{{docker_container}}"
-           state=started
-  when: docker_state == 'started'
 - name: "{{docker_container}} - Post docker - restart container service"
   become: true
   service: name="{{docker_container}}"
            state=restarted
   when: "docker_state == 'restarted' or      \
         docker_state == 'reloaded' and 'Status: Downloaded newer image' in pull_result.stdout"
+
+- name: "{{docker_container}} - Post docker - start container service"
+  become: true
+  service: name="{{docker_container}}"
+           state=started
+  when: "docker_state == 'started' or docker_state == 'reloaded'"
+
+- name: "{{docker_container}} - Post docker - stop and disable container service"
+  become: true
+  service: name="{{docker_container}}"
+           state=stopped
+           enabled=no
+  when: docker_state == 'stopped'
+
 - name: "{{docker_container}} - Post docker - enable container service"
   become: true
   service: name="{{docker_container}}"

ansible/roles/sonicv2/files/bin/vtysh

@@ -0,0 +1 @@
+../../../sonic-common/files/bin/vtysh

ansible/roles/sonicv2/files/docker_clean.sh

@@ -0,0 +1 @@
+../../sonic-common/files/docker_clean.sh

ansible/roles/sonicv2/files/ssw/ACS-MSN2700/alias_map.json

@@ -0,0 +1,34 @@
+{
+  "Ethernet8": "Ethernet8",
+  "Ethernet0": "Ethernet0",
+  "Ethernet4": "Ethernet4",
+  "Ethernet108": "Ethernet108",
+  "Ethernet100": "Ethernet100",
+  "Ethernet104": "Ethernet104",
+  "Ethernet96": "Ethernet96",
+  "Ethernet124": "Ethernet124",
+  "Ethernet120": "Ethernet120",
+  "Ethernet92": "Ethernet92",
+  "Ethernet28": "Ethernet28",
+  "Ethernet52": "Ethernet52",
+  "Ethernet56": "Ethernet56",
+  "Ethernet76": "Ethernet76",
+  "Ethernet72": "Ethernet72",
+  "Ethernet32": "Ethernet32",
+  "Ethernet16": "Ethernet16",
+  "Ethernet36": "Ethernet36",
+  "Ethernet12": "Ethernet12",
+  "Ethernet88": "Ethernet88",
+  "Ethernet24": "Ethernet24",
+  "Ethernet116": "Ethernet116",
+  "Ethernet80": "Ethernet80",
+  "Ethernet112": "Ethernet112",
+  "Ethernet84": "Ethernet84",
+  "Ethernet48": "Ethernet48",
+  "Ethernet44": "Ethernet44",
+  "Ethernet40": "Ethernet40",
+  "Ethernet64": "Ethernet64",
+  "Ethernet60": "Ethernet60",
+  "Ethernet20": "Ethernet20",
+  "Ethernet68": "Ethernet68"
+}