Merge pull request #1428 from coreos-inc/clair-setup-new

Implement setup tool support for Clair

test/test_api_usage.py

@@ -3546,7 +3546,7 @@ class TestRepositoryImageSecurity(ApiTestCase):
 
     # Mark the layer as indexed.
     layer.security_indexed = True
-    layer.security_indexed_engine = app.config['SECURITY_SCANNER']['ENGINE_VERSION_TARGET']
+    layer.security_indexed_engine = app.config['SECURITY_SCANNER_ENGINE_VERSION_TARGET']
     layer.save()
 
     # Grab the security info again.

test/test_secscan.py

@@ -122,7 +122,7 @@ class TestSecurityScanner(unittest.TestCase):
     self.ctx = app.test_request_context()
     self.ctx.__enter__()
 
-    self.api = SecurityScannerAPI(app.config, config_provider, storage)
+    self.api = SecurityScannerAPI(app.config, storage)
 
   def tearDown(self):
     storage.put_content(['local_us'], 'supports_direct_download', 'false')

test/testconfig.py

@@ -61,9 +61,7 @@ class TestConfig(DefaultConfig):
 
   FEATURE_SECURITY_SCANNER = True
   FEATURE_SECURITY_NOTIFICATIONS = True
-  SECURITY_SCANNER = {
-    'ENDPOINT': 'http://mockclairservice/',
-    'API_VERSION': 'v1',
-    'ENGINE_VERSION_TARGET': 1,
-    'API_TIMEOUT_SECONDS': 1
-  }
+  SECURITY_SCANNER_ENDPOINT = 'http://mockclairservice/'
+  SECURITY_SCANNER_API_VERSION = 'v1'
+  SECURITY_SCANNER_ENGINE_VERSION_TARGET = 1
+  SECURITY_SCANNER_API_TIMEOUT_SECONDS = 1