Merge ~jocave/plainbox-provider-resource:remove-guacamole into plainbox-provider-resource:master

[Jonathan Cave]

Switch from guacamole to argparse in the snapd_resource script. This is the only place where this modules is used in this provider.

Tested the resource jobs still work on a bionic server install.

[Sylvain Pineau (sylvain-pineau)]

+1 (and thx for the .py extension)

review: Approve

diff --git a/bin/snapd_resource b/bin/snapd_resource.py
similarity index 72%
rename from bin/snapd_resource
rename to bin/snapd_resource.py
index 7f15906..5ce87c1 100755
--- a/bin/snapd_resource
+++ b/bin/snapd_resource.py
@@ -5,11 +5,12 @@
 # Written by:
 #    Authors: Jonathan Cave <[e-mail]>
 
+import argparse
 import io
 import os
 import string
+import sys
 
-from guacamole import Command
 from checkbox_support.snap_utils.snapd import Snapd
 from checkbox_support.snap_utils.system import get_kernel_snap
 
@@ -47,9 +48,9 @@ def http_to_resource(assertion_stream):
     return count
 
 
-class ModelAssertion(Command):
+class ModelAssertion():
 
-    def invoked(self, ctx):
+    def invoked(self):
         count = http_to_resource(Snapd().get_assertions('model'))
         if count == 0:
             # Print a dummy assertion - not nice but really trick to use
@@ -60,9 +61,9 @@ class ModelAssertion(Command):
             print()
 
 
-class SerialAssertion(Command):
+class SerialAssertion():
 
-    def invoked(self, ctx):
+    def invoked(self):
         count = http_to_resource(Snapd().get_assertions('serial'))
         if count == 0:
             # Print a dummy assertion - not nice but really trick to use
@@ -73,17 +74,23 @@ class SerialAssertion(Command):
             print()
 
 
-class Assertions(Command):
+class Assertions():
 
-    sub_commands = (
-        ('model', ModelAssertion),
-        ('serial', SerialAssertion),
-    )
+    def invoked(self):
+        actions = {
+            'model': ModelAssertion,
+            'serial': SerialAssertion,
+        }
+        parser = argparse.ArgumentParser()
+        parser.add_argument('action', type=str, help="The action to test",
+                            choices=actions)
+        args = parser.parse_args(sys.argv[2:3])
+        actions[args.action]().invoked()
 
 
-class Snaps(Command):
+class Snaps():
 
-    def invoked(self, ctx):
+    def invoked(self):
         data = Snapd().list()
         for snap in data:
             def print_field(key):
@@ -102,9 +109,9 @@ class Snaps(Command):
             print()
 
 
-class Endpoints(Command):
+class Endpoints():
 
-    def invoked(self, ctx):
+    def invoked(self):
         data = Snapd().interfaces()
 
         if 'plugs' in data:
@@ -158,26 +165,32 @@ def get_connections():
     return connections
 
 
-class Connections(Command):
+class Connections():
 
-    def invoked(self, ctx):
+    def invoked(self):
         for conn in get_connections():
             print('slot: {}:{}'.format(conn.target_snap, conn.target_slot))
             print('plug: {}:{}'.format(conn.plug_snap, conn.plug_plug))
             print()
 
 
-class Interfaces(Command):
+class Interfaces():
 
-    sub_commands = (
-        ('endpoints', Endpoints),
-        ('connections', Connections),
-    )
+    def invoked(self):
+        actions = {
+            'endpoints': Endpoints,
+            'connections': Connections
+        }
+        parser = argparse.ArgumentParser()
+        parser.add_argument('action', type=str, help="The action to test",
+                            choices=actions)
+        args = parser.parse_args(sys.argv[2:3])
+        actions[args.action]().invoked()
 
 
-class Features(Command):
+class Features():
 
-    def invoked(self, ctx):
+    def invoked(self):
         self._detect_kernel_extraction()
         print()
 
@@ -193,17 +206,24 @@ class Features(Command):
         if snap is not None:
             feature_f = '/snap/{}/current/meta/force-kernel-extraction'.format(
                 snap)
-            print('force_kernel_extraction: {}'.format(os.path.exists(feature_f)))
-
-
-class SnapdResource(Command):
-
-    sub_commands = (
-        ('assertions', Assertions),
-        ('snaps', Snaps),
-        ('interfaces', Interfaces),
-        ('features', Features)
-    )
+            print('force_kernel_extraction: {}'.format(
+                os.path.exists(feature_f)))
+
+
+class SnapdResource():
+
+    def main(self):
+        actions = {
+            'assertions': Assertions,
+            'snaps': Snaps,
+            'interfaces': Interfaces,
+            'features': Features
+        }
+        parser = argparse.ArgumentParser()
+        parser.add_argument('action', type=str, help="The action to test",
+                            choices=actions)
+        args = parser.parse_args(sys.argv[1:2])
+        actions[args.action]().invoked()
 
 
 if __name__ == '__main__':
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index 5d59466..ffac737 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -53,7 +53,7 @@ unit: packaging meta-data
 os-id: debian
 Depends: usbutils
 
-# This is for snapd_resource
+# This is for snapd_resource.py
 unit: packaging meta-data
 os-id: debian
 Depends: python3-requests-unixsocket
@@ -374,7 +374,7 @@ estimated_duration: 1.1
 plugin: resource
 command:
     unset PYTHONUSERBASE
-    snapd_resource snaps
+    snapd_resource.py snaps
 _description: Generates a list of snap packages
 _summary: Collect information about installed snap packages
 
@@ -383,7 +383,7 @@ estimated_duration: 1.1
 plugin: resource
 command:
     unset PYTHONUSERBASE
-    snapd_resource interfaces endpoints
+    snapd_resource.py interfaces endpoints
 _description: Generates a list of interface declarations on the device
 _summary: Collect information about interfaces
 
@@ -392,7 +392,7 @@ estimated_duration: 1.1
 plugin: resource
 command:
     unset PYTHONUSERBASE
-    snapd_resource interfaces connections
+    snapd_resource.py interfaces connections
 _description: Generates a list of plug and slot connections on the device
 _summary: Collect information about connections
 
@@ -403,7 +403,7 @@ _description:
 plugin: resource
 estimated_duration: 2.0
 command:
-  snapd_resource assertions model
+  snapd_resource.py assertions model
 
 id: serial_assertion
 _summary: Collect serial assertions on the device
@@ -412,7 +412,7 @@ _description:
 plugin: resource
 estimated_duration: 2.0
 command:
-  snapd_resource assertions serial
+  snapd_resource.py assertions serial
 
 id: serial_ports_static
 _summary: Generates a serial port resource based on user supplied configuration
@@ -437,7 +437,7 @@ _description:
 plugin: resource
 estimated_duration: 1.0
 command:
-  snapd_resource features
+  snapd_resource.py features
 
 id: net_if_management
 _summary: Identify what service is managing each physical network interface