Ansible: Clean Python requirements

+ minor cleanup

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Iff9c643f6e9b52dc6a11b04624452f115f3a834e

2 files changed, 63 insertions, 5 deletions

diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index 6bb4d4614e..3e7e5a00fa 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -67,6 +67,36 @@
   include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
   tags: [ install-csit-dependencies, copy-apt-sources ]
 
+- name: Install CSIT PIP requirements
+  pip:
+    name:
+      - 'docopt==0.6.2'
+      - 'ecdsa==0.13'
+      - 'enum34==1.1.2'
+      - 'ipaddress==1.0.16'
+      - 'paramiko==1.16.0'
+      - 'pexpect==4.6.0'
+      - 'pycrypto==2.6.1'
+      - 'pykwalify==1.5.0'
+      - 'pypcap==1.1.5'
+      - 'python-dateutil==2.4.2'
+      - 'PyYAML==3.11'
+      - 'requests==2.9.1'
+      - 'robotframework==2.9.2'
+      - 'scapy==2.3.1'
+      - 'scp==0.10.2'
+      - 'six==1.12.0'
+      - 'dill==0.2.8.2'
+      - 'numpy==1.14.5'
+      - 'aenum==2.1.2'
+  tags: install-pip
+
+- name: Install CSIT PIP requirements - SciPy workaround
+  pip:
+    name:
+      - 'scipy==1.1.0'
+  tags: install-pip
+
 - name: Set sudoers admin
   lineinfile:
     path: '/etc/sudoers'
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
index 31872e035f..d5e8cb1d52 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
@@ -10,15 +10,43 @@
 - name: Install CSIT dependencies
   apt:
     name:
+      - 'autoconf'
+      - 'build-essential'
+      - 'cgroup-bin'
+      - 'dkms'
+      - 'python-all'
       - 'python-apt'
+      - 'python-cffi'
+      - 'python-cffi-backend'
+      - 'python-dev'
+      - 'python-pip'
       - 'python-setuptools'
-      - 'git'
-      - 'crudini'
-      - 'expect'
-      - 'socat'
+      - 'python3-all'
+      - 'python3-apt'
+      - 'python3-cffi'
+      - 'python3-cffi-backend'
+      - 'python3-dev'
+      - 'python3-pip'
+      - 'python3-setuptools'
       - 'qemu-system'
-      - 'build-essential'
+      - 'socat'
+      - 'virtualenv'
+      - 'unzip'
+      - 'zlib1g-dev'
+    state: 'present'
+    cache_valid_time: 3600
+    install_recommends: False
+  tags: install-csit-dependencies
+
+- name: Install CSIT dependencies - aarch64 SciPy
+  apt:
+    name:
+      - 'gfortran'
+      - 'libblas-dev'
+      - 'liblapack-dev'
     state: 'present'
     cache_valid_time: 3600
     install_recommends: False
+  when: >
+    ansible_machine == 'aarch64'
   tags: install-csit-dependencies