commit 1ad59ca20b63ed1fe4a2fe28248cfe0e2a079759
author Ivan Udovichenko <iudovichenko@mirantis.com> Fri Nov 30 17:01:12 2018 +0300
committer Ivan Udovichenko <iudovichenko@mirantis.com> Tue Dec 04 10:20:38 2018 +0000
tree 0a128a8e58571d61d2e8f3f0e5e6d47d13610154
parent 3a91ddd4587a2c969d7658fb767d0cb9a1546127

Add possibility to set cpe to 'oscap xccdf eval' command calls

PROD-25312 (PROD:25312)

Change-Id: I2b8a555b549b99ecf3240433d1ba1febd223e9dc

_modules/oscap/commands.py

diff --git a/_modules/oscap/commands.py b/_modules/oscap/commands.py
index 69e7fbc..a9b342d 100644
--- a/_modules/oscap/commands.py
+++ b/_modules/oscap/commands.py
@@ -9,7 +9,8 @@
           pillar_data=None,
           xccdf_version='1.2',
           profile='default',
-          tailoring_id=None):
+          tailoring_id=None,
+          cpe=None):
 
     tailoring_file = None
     profile = normalize_id(profile, xccdf_version=xccdf_version)
@@ -24,12 +25,15 @@
 
     cmd = 'oscap xccdf eval --profile {profile} ' +\
           '--results results.xml --report report.html'
+    if cpe:
+        cmd += ' --cpe {cpe}'
     if tailoring_file:
         cmd += ' --tailoring-file {tailoring_file}'
     cmd += ' {benchmark}'
     cmd = cmd.format(profile=profile,
                      tailoring_file=tailoring_file,
-                     benchmark=benchmark)
+                     benchmark=benchmark,
+                     cpe=cpe)
 
     if tailoring_file:
         with open(tailoring_file, 'w') as f: