1.0.0-beta.8

accelpy/__init__.py

@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-__version__ = '1.0.0-beta.7'
+__version__ = '1.0.0-beta.8'
 __copyright__ = "Copyright 2018 Accelize"
 __licence__ = "Apache 2.0"
 

accelpy/_ansible/__init__.py

@@ -161,7 +161,8 @@ def galaxy_install(self, roles):
             roles (iterable of str): Roles to install.
         """
         if roles:
-            self._ansible('install', *roles, utility='galaxy')
+            self._ansible('install', '--force-with-deps',
+                          *roles, utility='galaxy')
 
     @classmethod
     def playbook_exec(cls):

accelpy/_ansible/roles/common.reboot_system/tasks/main.yml

@@ -1,3 +1,6 @@
 ---
 - name: Ensure system is rebooted
   reboot:
+
+- name: Ensure Ansible facts are up to date
+  setup:

accelpy/_ansible/roles/container_service/molecule/default/app.Dockerfile

@@ -1,10 +1,7 @@
 FROM accelize/base:centos_7-aws_f1
 
-RUN yum install -y \
-    yum-utils \
-    epel-release && \
-yum-config-manager --add-repo https://accelize.s3.amazonaws.com/rpm/accelize_stable.repo && \
-yum install -y python36-accelize-drm && \
+RUN yum install -y epel-release && \
+yum install -y python36 && \
 rm -rf /var/cache/yum/*
 
 EXPOSE 8080

accelpy/_ansible/roles/container_service/molecule/default/app_server.py

@@ -1,32 +1,20 @@
 #! /usr/bin/env python3
 # coding=utf-8
 """Fake application web server"""
-from os import getuid, getgid, environ
-from json import dumps
 from http.server import HTTPServer, BaseHTTPRequestHandler
-from accelize_drm.fpga_drivers import get_driver
-from traceback import format_exc
+from subprocess import run, PIPE, STDOUT
 
 
 class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
-    """Server that return FPGA response"""
+    """Server that test FPGA presence"""
 
     def do_GET(self):
         """GET"""
-        try:
-            driver = get_driver(name='aws_f1')(
-                fpga_slot_id=int(environ['FPGA_SLOTS'].split(',', 1)[0]))
-            code = 200
-            msg = dumps(dict(
-                response=driver.read_register(0),
-                uid=getuid(), gid=getgid(),
-            ))
-        except Exception:
-            code = 500
-            msg = format_exc()
-        self.send_response(code)
+        process = run(['/opt/xilinx/xrt/bin/awssak', 'list'],
+                      stderr=STDOUT, stdout=PIPE)
+        self.send_response(500 if process.returncode else 200)
         self.end_headers()
-        self.wfile.write(msg.encode() + b'\n')
+        self.wfile.write(process.stdout)
 
 
 HTTPServer(('0.0.0.0', 8080), SimpleHTTPRequestHandler).serve_forever()

accelpy/_ansible/roles/container_service/molecule/default/molecule.yml

@@ -15,14 +15,14 @@ platforms:
     environment:
       container: docker
 
-  #- name: podman
-  #  image: ubuntu:bionic
-  #  privileged: true
-  #  volume_mounts:
-  #    - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-  #  command: "/lib/systemd/systemd"
-  #  environment:
-  #    container: docker
+#  - name: podman
+#    image: ubuntu:bionic
+#    privileged: true
+#    volume_mounts:
+#      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+#    command: "/lib/systemd/systemd"
+#    environment:
+#      container: docker
 
 provisioner:
   name: ansible

tests/test_app_container_service.yml

@@ -12,7 +12,7 @@ firewall_rules:
 
 fpga:
   aws,eu-west-1:
-    image: agfi-04d518960fd114e28
+    image: agfi-071909cc191313a51
   count: 1
 
 package:
@@ -23,11 +23,11 @@ package:
 accelize_drm:
   conf:
     design:
-      boardType: DRM_125
+      boardType: DRM_100
     licensing:
       url: https://master.metering.accelize.com
     drm:
-      frequency_mhz: 125
+      frequency_mhz: 100
 
 test:
   shell: curl -sS $(accelpy public_ip):8080

tests/test_app_kubernetes_node.yml

@@ -12,7 +12,7 @@ firewall_rules:
 
 fpga:
   aws,eu-west-1:
-    image: agfi-04d518960fd114e28
+    image: agfi-071909cc191313a51
   count: 1
 
 package:
@@ -23,8 +23,8 @@ package:
 accelize_drm:
   conf:
     design:
-      boardType: DRM_125
+      boardType: DRM_100
     licensing:
       url: https://master.metering.accelize.com
     drm:
-      frequency_mhz: 125
+      frequency_mhz: 100