Fix docker shell 2

ansible/roles/fanout/tasks/fanout_sonic.yml

@@ -17,7 +17,7 @@
   become: yes
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i swss python
+    container_name: swss
 
 - name: generate config_db.json
   shell: sonic-cfggen -H -j /etc/sonic/vlan.json -j /etc/sonic/init_cfg.json --print-data > /etc/sonic/config_db.json

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

@@ -45,7 +45,7 @@
 
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: Copy lldpctl helper script
   become: true

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

@@ -6,16 +6,11 @@
   shell: show platform summary | grep Platform | awk '{print $2}'
   register: platform
 
-- set_fact: 
-    ansible_python_interpreter: "docker exec -i {{ pmon_ps.stdout }} python"
-
 - name: Gather sensors
   sensors_facts: checks={{ sensors_checks[platform.stdout] }}
   vars:
     ansible_shell_type: docker
-
-- set_fact: 
-    ansible_python_interpreter: "/usr/bin/python"
+    container_name: "{{ pmon_ps.stdout }}"
 
 - name: Output of sensors information
   debug: var=vars['sensors']

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

@@ -110,4 +110,4 @@
 
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i snmp python
+    container_name: snmp

ansible/roles/sonicv2/tasks/quagga.yml

@@ -80,7 +80,7 @@
 
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i bgp python
+    container_name: bgp
 
 - name: Copy vtysh helper script
   become: true

ansible/roles/sonicv2/tasks/teamd_interface.yml

@@ -16,4 +16,4 @@
 
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i teamd python
+    container_name: teamd

ansible/roles/test/tasks/acltb_ranges_test.yml

@@ -79,7 +79,7 @@
 
     vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i swss python
+      container_name: swss
 
   always:
     - include_tasks: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml

ansible/roles/test/tasks/bgp_entry_flap.yml

@@ -15,11 +15,11 @@
   become: yes
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i sswsyncd python
+    container_name: sswsyncd
 
 - block:
   - name: Assert the particular entry is in nexthopgroup table
-    assert: 
+    assert:
       that: nexthop[addr] in nexthopgroup[item]
     with_items: "{{ nexthopgroup }}"
 
@@ -46,8 +46,8 @@
     become: yes
     vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i sswsyncd python
-  
+      container_name: sswsyncd
+
   - name: Poll for updated tables until peer is not in nexthop groups
     switch_tables: asic="{{asic}}" nexthop=yes nexthopgroup=yes
     become: yes
@@ -58,7 +58,7 @@
     with_items: "{{ nexthopgroup }}"
     vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i sswsyncd python
+      container_name: sswsyncd
 
   - name: Restart BGP session from neighbor
     action: cisco template=bgp_neighbor_noshut.j2
@@ -75,7 +75,7 @@
     become: yes
     vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i sswsyncd python
+      container_name: sswsyncd
 
   - name: Poll for updated tables until peer is in nexthop groups
     switch_tables: asic="{{asic}}" nexthop=yes nexthopgroup=yes
@@ -87,6 +87,6 @@
     with_items: "{{ nexthopgroup }}"
     vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i sswsyncd python
+      container_name: sswsyncd
 
   when: "'T2' in name"

ansible/roles/test/tasks/bgp_gr_helper/get_vm_info.yml

@@ -34,7 +34,7 @@
   lldp:
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: Get VM IP address.
   set_fact:

ansible/roles/test/tasks/copp.yml

@@ -7,7 +7,7 @@
       supervisorctl: state=stopped name={{ item }}
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i lldp python
+        container_name: lldp
       with_items:
         - lldp-syncd
         - lldpd
@@ -40,13 +40,13 @@
       template: src=ptf_nn_agent.conf.dut.j2 dest=/etc/supervisor/conf.d/ptf_nn_agent.conf
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
 
     - name: Restart ptf_nn_agent inside dut
       supervisorctl: state=restarted name=ptf_nn_agent
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
 
     - name: copy the test to ptf container
       copy: src=roles/test/files/ptftests dest=/root
@@ -98,20 +98,20 @@
       template: src=ptf_nn_agent.conf.dut.j2 dest=/etc/supervisor/conf.d/ptf_nn_agent.conf
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
 
     - name: Restart ptf_nn_agent inside dut
       supervisorctl: state=restarted name=ptf_nn_agent
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
 
     - name: Restore LLDP Daemon
       become: yes
       supervisorctl: state=started name={{ item }}
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i lldp python
+        container_name: lldp
       with_items:
         - lldpd
         - lldp-syncd

ansible/roles/test/tasks/dip_sip.yml

@@ -24,7 +24,7 @@
   lldp:
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: "Copy tests to PTF"
   copy: src=roles/test/files/ptftests dest=/root

ansible/roles/test/tasks/ecn_wred.yml

@@ -27,7 +27,7 @@
          - "{{ test_files_dir }}/*"
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i database python
+    container_name: database
 
 - block:
     # Test case #3(MA): Check configuration applied

ansible/roles/test/tasks/interface_up_down.yml

@@ -10,13 +10,13 @@
            enabled=yes
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: Gather information from lldp
   lldp:
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: If underlay exists, use underlay to replace it.
   set_fact:
@@ -49,7 +49,7 @@
   lldp:
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: rearrange lldp received data structure for interface up down test
   interface_up_down_data_struct_facts: data="{{ lldp }}"

ansible/roles/test/tasks/lag_2.yml

@@ -27,7 +27,7 @@
   lldp:
   vars:
     ansible_shell_type: docker
-    ansible_python_interpreter: docker exec -i lldp python
+    container_name: lldp
 
 - name: gathering minigraph of the device configuration
   minigraph_facts: host={{ inventory_hostname }}

ansible/roles/test/tasks/lagall.yml

@@ -46,7 +46,7 @@
   lldp:
   vars:
       ansible_shell_type: docker
-      ansible_python_interpreter: docker exec -i lldp python
+      container_name: lldp
 
 - debug:
     msg: "{{ dut_lag_members }}"

ansible/roles/test/tasks/qos_sai.yml

@@ -23,7 +23,7 @@
       supervisorctl: state=stopped name={{item}}
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i lldp python
+        container_name: lldp
       with_items:
         - lldpd
         - lldp-syncd
@@ -37,7 +37,7 @@
         - Restart Quagga Daemon
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i bgp python
+        container_name: bgp
 
     - meta: flush_handlers
 
@@ -49,7 +49,7 @@
           shell: python /root/packets_aging.py disable
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
       when: minigraph_hwsku is defined and minigraph_hwsku in mellanox_hwskus
 
     - name: copy ptf tests
@@ -566,7 +566,7 @@
       supervisorctl: state=started name={{item}}
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i lldp python
+        container_name: lldp
       with_items:
         - lldpd
         - lldp-syncd
@@ -580,7 +580,7 @@
         - Restart Quagga Daemon
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i bgp python
+        container_name: bgp python
 
     - name: Restore original watermark polling status
       shell: counterpoll watermark {{watermark_status.stdout}}
@@ -596,7 +596,7 @@
       shell: python /root/packets_aging.py enable
       vars:
         ansible_shell_type: docker
-        ansible_python_interpreter: docker exec -i syncd python
+        container_name: syncd
       when: minigraph_hwsku is defined and minigraph_hwsku in mellanox_hwskus
 
     - meta: flush_handlers

ansible/shell_plugins/docker.py

@@ -8,6 +8,13 @@
 version_added: historical
 description:
   - This module allows you to execute commands directly in docker on the remote host
+options:
+  container_name:
+    description:
+    - Container name
+    required: yes
+    vars:
+      - name: container_name
 extends_documentation_fragment:
   - shell_common
 '''
@@ -41,12 +48,7 @@ def join_path(self, *args):
         return super(ShellModule, self).join_path(*args)
 
     def remove(self, path, recurse=False):
-        argv = self.get_option('ansible_python_interpreter').split()
-        assert(argv[0] == 'docker')
-        assert(argv[1] == 'exec')
-        opts, args = getopt.getopt(argv[2:], 'i')
-        self.container_name = args[0]
-
+        self.container_name = self.get_option('container_name')
         remove_files_on_host_cmd = super(ShellModule, self).remove(path, recurse)
 
         cmd = remove_files_on_host_cmd + "; docker exec -i "
@@ -58,18 +60,7 @@ def remove(self, path, recurse=False):
         return cmd
 
     def build_module_command(self, env_string, shebang, cmd, arg_path=None):
-        # assert(self.container_name)
-        argv = shlex.split(shebang.replace("#!", ""))
-        assert(argv[0] == 'docker')
-        assert(argv[1] == 'exec')
-        opts, args = getopt.getopt(argv[2:], 'i')
-        self.container_name = args[0]
-
-        # Inject environment variable before python in the shebang string
-        assert(args[1].endswith('python'))
-        args[1] = 'env {0} {1}'.format(env_string, args[1])
-        argv_env = argv[0:2] + [o for opt in opts for o in opt] + args
-        shebang_env = ' '.join(argv_env)
+        self.container_name = self.get_option('container_name')
 
         ## Note: Docker cp behavior
         ##   DEST_PATH exists and is a directory
@@ -79,7 +70,9 @@ def build_module_command(self, env_string, shebang, cmd, arg_path=None):
         pre = ''.join('docker exec {1} mkdir -p {0}; docker cp {0}/. {1}:{0}; '
             .format(dtemp, self.container_name) for dtemp in self.dtemps)
 
-        return pre + super(ShellModule, self).build_module_command('', shebang_env, cmd, arg_path)
+        pre += "docker exec -i {} ".format(self.container_name)
+
+        return pre + super(ShellModule, self).build_module_command('', shebang, cmd, arg_path)
 
     def checksum(self, path, python_interp):
         """