commit 190df2ba68a0c06421254adcfdc9943b28b92b19
author Scott Baker <smbaker@gmail.com> Mon Oct 08 10:54:56 2018 -0700
committer Scott Baker <smbaker@gmail.com> Mon Oct 08 12:29:24 2018 -0700
tree 13b62bf88efd21bb968f3a65ec7013a45f508c57
parent 30c3d75dbb9023a5eeeeca204420b1b45669874c

SEBA-282 Update xos-tosca to use latest xosgenx

Change-Id: I73e628e331a69ba71014360162b18541f46f826e

src/tosca/generator.py

diff --git a/src/tosca/generator.py b/src/tosca/generator.py
index 0e36952..1c2dccb 100644
--- a/src/tosca/generator.py
+++ b/src/tosca/generator.py
@@ -19,12 +19,9 @@
 
 import os
 from default import TOSCA_DEFS_DIR, TOSCA_KEYS_DIR
-from xosgenx.generator import XOSProcessor
+from xosgenx.generator import XOSProcessor, XOSProcessorArgs
 from xosapi.xos_grpc_client import Empty
 
-class Args:
-    verbosity = 0
-
 current_dir = os.path.dirname(os.path.realpath(__file__))
 
 class TOSCA_Generator:
@@ -45,11 +42,10 @@
 
         try:
             xproto = client.utility.GetXproto(Empty())
-            args = Args()
-            args.output = TOSCA_DEFS_DIR
-            args.inputs = str(xproto.xproto)
-            args.target = os.path.join(current_dir, 'xtarget/tosca.xtarget')
-            args.write_to_file = 'target'
+            args = XOSProcessorArgs(output = TOSCA_DEFS_DIR,
+                                    inputs = str(xproto.xproto),
+                                    target = os.path.join(current_dir, 'xtarget/tosca.xtarget'),
+                                    write_to_file = 'target')
             XOSProcessor.process(args)
             log.info("[XOS-TOSCA] Recipes generated in %s" % args.output)
         except Exception as e:
@@ -57,14 +53,12 @@
 
         try:
             xproto = client.utility.GetXproto(Empty())
-            args = Args()
-            args.output = TOSCA_KEYS_DIR
-            args.inputs = str(xproto.xproto)
-            args.target = os.path.join(current_dir, 'xtarget/tosca_keys.xtarget')
-            args.write_to_file = 'single'
-            args.dest_file = 'KEYS.py'
+            args = XOSProcessorArgs(output = TOSCA_KEYS_DIR,
+                                    inputs = str(xproto.xproto),
+                                    target = os.path.join(current_dir, 'xtarget/tosca_keys.xtarget'),
+                                    write_to_file = 'single',
+                                    dest_file = 'KEYS.py')
             XOSProcessor.process(args)
             log.info("[XOS-TOSCA] TOSCA Keys generated in %s" % args.output)
         except Exception as e:
             log.exception("[XOS-TOSCA] Failed to generate TOSCA Keys")
-